[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd APP_CALLIGRA to build
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-03-31 20:00:30
Message-ID: E1Yd2Ks-0006T5-6z () scm ! kde ! org
[Download RAW message or body]

Git commit 271718c42586f382fd86fac9e01586a486bfc350 by Friedrich W. H. Koss=
ebau.
Committed on 31/03/2015 at 19:58.
Pushed by kossebau into branch 'frameworks'.

Readd APP_CALLIGRA to build

M  +1    -1    CalligraProducts.cmake
M  +5    -3    extras/calligra/main.cpp

http://commits.kde.org/calligra/271718c42586f382fd86fac9e01586a486bfc350

diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index c0b1633..d5a38d6 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -194,7 +194,7 @@ calligra_define_product(FILTER_KARBON1X_TO_KARBON "Karb=
on 1.x import filter" UNP
 =

 # meta apps
 calligra_define_product(APP_ACTIVE "Calligra Active app" UNPORTED  REQUIRE=
S PART_SHEETS PART_STAGE PART_WORDS)
-calligra_define_product(APP_CALLIGRA "General Calligra app starter" UNPORT=
ED  REQUIRES LIB_CALLIGRA)
+calligra_define_product(APP_CALLIGRA "General Calligra app starter"  REQUI=
RES LIB_CALLIGRA)
 =

 # more extras
 calligra_define_product(OKULAR_GENERATOR_PPT "Plugin for Okular extended w=
ith support for PPT" UNPORTED  REQUIRES OKULAR_GENERATOR_ODP FILTER_PPT_TO_=
ODP)
diff --git a/extras/calligra/main.cpp b/extras/calligra/main.cpp
index 16ff5ad..69d5b14 100644
--- a/extras/calligra/main.cpp
+++ b/extras/calligra/main.cpp
@@ -19,7 +19,7 @@
 =

 #include <QTextStream>
 =

-#include <kaboutdata.h>
+#include <k4aboutdata.h>
 #include <kcmdlineargs.h>
 #include <klocale.h>
 #include <kglobal.h>
@@ -32,6 +32,8 @@
 #include <ktoolinvocation.h>
 #include <kmessagebox.h>
 #include <kguiitem.h>
+#include <kdeversion.h>
+#include <kurl.h>
 =

 #include <calligraversion.h>
 =

@@ -173,9 +175,9 @@ static int handleUrls(const KCmdLineArgs *args)
 =

 int main( int argc, char **argv )
 {
-    KAboutData aboutData("calligra", 0, ki18n("Calligra Opener"), CALLIGRA=
_VERSION_STRING,
+    K4AboutData aboutData("calligra", 0, ki18n("Calligra Opener"), CALLIGR=
A_VERSION_STRING,
                          ki18n("Calligra Document Opener"),
-                         KAboutData::License_GPL,
+                         K4AboutData::License_GPL,
                          ki18n("(c) 2010-2011 Calligra developers"));
     aboutData.addAuthor(ki18n("Jaros=C5=82aw Staniek"),KLocalizedString(),=
 "staniek@kde.org");
     KCmdLineArgs::init(argc, argv, &aboutData);
[prev in list] [next in list] [prev in thread] [next in thread]