From kde-commits Tue Mar 31 22:50:10 2015 From: Friedrich W. H. Kossebau Date: Tue, 31 Mar 2015 22:50:10 +0000 To: kde-commits Subject: [calligra/frameworks] /: Readd APP_GEMINI to build Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=142784222132516 Git commit edc6a4f854025880e6d8c2257780c24cdf41de71 by Friedrich W. H. Koss= ebau. Committed on 31/03/2015 at 22:48. Pushed by kossebau into branch 'frameworks'. Readd APP_GEMINI to build M +1 -1 CalligraProducts.cmake M +2 -4 gemini/CMakeLists.txt M +1 -0 gemini/Settings.cpp M +1 -1 gemini/cloud/dropbox/CMakeLists.txt M +2 -2 gemini/cloud/dropbox/dropboxplugin.h M +3 -3 gemini/main.cpp M +3 -3 gemini/thumbnailhelper.cpp http://commits.kde.org/calligra/edc6a4f854025880e6d8c2257780c24cdf41de71 diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake index eab140c..8d1d24e 100644 --- a/CalligraProducts.cmake +++ b/CalligraProducts.cmake @@ -97,7 +97,7 @@ calligra_define_product(APP_KEXI "Kexi app (for Desktop)"= UNPORTED REQUIRES LIB calligra_define_product(APP_FLOW "Flow app (for Desktop)" UNPORTED REQUIR= ES LIB_CALLIGRA LIB_KOPAGEAPP) calligra_define_product(APP_PLAN "Plan app (for Desktop)" UNPORTED REQUIR= ES LIB_CALLIGRA) calligra_define_product(APP_BRAINDUMP "Braindump app (for Desktop)" UNPORT= ED REQUIRES LIB_CALLIGRA) -calligra_define_product(APP_GEMINI "The Calligra Gemini application" UNPOR= TED REQUIRES PART_QTQUICK) +calligra_define_product(APP_GEMINI "The Calligra Gemini application" REQU= IRES PART_QTQUICK) # TODO: this needs to be split up by app products calligra_define_product(DOC "Calligra Documentations" UNPORTED) = diff --git a/gemini/CMakeLists.txt b/gemini/CMakeLists.txt index 9d131cf..fae6ba7 100644 --- a/gemini/CMakeLists.txt +++ b/gemini/CMakeLists.txt @@ -56,7 +56,7 @@ set(thumbnailhelper_SRCS if (WIN32) set(calligragemini_SRCS ${calligragemini_SRCS} calligrageminiwin.rc) else () - file(GLOB ICONS_SRCS "${KDE4_ICON_DIR}/oxygen/*/apps/calligragemini.pn= g") + file(GLOB ICONS_SRCS "pics/*-apps-calligragemini.png") ecm_add_app_icon(calligragemini_SRCS ICONS ${ICONS_SRCS}) endif () = @@ -67,7 +67,6 @@ add_executable(calligrageminithumbnailhelper ${thumbnailh= elper_SRCS}) target_link_libraries(calligrageminithumbnailhelper Qt5::Gui Qt5::Core - ${QT_LIBRARIES} komain ) = @@ -78,10 +77,9 @@ add_executable(calligragemini ${calligragemini_SRCS}) = target_link_libraries(calligragemini Qt5::Declarative + Qt5::OpenGL Qt5::Gui Qt5::Core - ${QT_QTOPENGL_LIBRARIES} - ${QT_LIBRARIES} ${GLEW_LIBRARIES} komain wordsprivate diff --git a/gemini/Settings.cpp b/gemini/Settings.cpp index 9b98a46..0809556 100644 --- a/gemini/Settings.cpp +++ b/gemini/Settings.cpp @@ -26,6 +26,7 @@ #include #include #include +#include = #include "Theme.h" #include "PropertyContainer.h" diff --git a/gemini/cloud/dropbox/CMakeLists.txt b/gemini/cloud/dropbox/CMa= keLists.txt index 9028bf9f..abc320d 100755 --- a/gemini/cloud/dropbox/CMakeLists.txt +++ b/gemini/cloud/dropbox/CMakeLists.txt @@ -13,7 +13,7 @@ set(dropbox_plugin_SRCS controller.cc dropboxplugin.cpp) = -automoc4_add_library(calligrageminidropboxplugin MODULE ${dropbox_plugin_S= RCS} ${dropbox_lib_SRCS}) +add_library(calligrageminidropboxplugin MODULE ${dropbox_plugin_SRCS} ${dr= opbox_lib_SRCS}) = target_link_libraries(calligrageminidropboxplugin Qt5::Declarative diff --git a/gemini/cloud/dropbox/dropboxplugin.h b/gemini/cloud/dropbox/dr= opboxplugin.h index 3c862f8..d4e6a13 100644 --- a/gemini/cloud/dropbox/dropboxplugin.h +++ b/gemini/cloud/dropbox/dropboxplugin.h @@ -10,11 +10,11 @@ class DropboxPlugin : public QDeclarativeExtensionPlugin { Q_OBJECT + Q_PLUGIN_METADATA(IID "org.calligra.DropboxPlugin") + public: virtual void registerTypes(const char* uri); virtual void initializeEngine(QDeclarativeEngine* engine, const char* = uri); }; = -Q_EXPORT_PLUGIN2(calligrageminidropboxplugin, DropboxPlugin) - #endif // DROPBOXPLUGIN_H diff --git a/gemini/main.cpp b/gemini/main.cpp index 701ec21..9522d09 100644 --- a/gemini/main.cpp +++ b/gemini/main.cpp @@ -30,7 +30,7 @@ #include = #include -#include +#include #include #include #include @@ -57,12 +57,12 @@ int main( int argc, char** argv ) #endif = = - KAboutData aboutData("calligragemini", + K4AboutData aboutData("calligragemini", "calligrawords", ki18n("Calligra Gemini"), version.toLatin1(), ki18n("Calligra Gemini: Writing and Presenting at= Home and on the Go"), - KAboutData::License_GPL, + K4AboutData::License_GPL, ki18n("(c) 1999-%1 The Calligra team and KO GmbH.= \n").subs(CALLIGRA_YEAR), KLocalizedString(), "http://www.calligra.org", diff --git a/gemini/thumbnailhelper.cpp b/gemini/thumbnailhelper.cpp index 89e53f9..cf1dcf6 100644 --- a/gemini/thumbnailhelper.cpp +++ b/gemini/thumbnailhelper.cpp @@ -19,7 +19,7 @@ */ = #include -#include +#include #include = #include @@ -54,12 +54,12 @@ int main( int argc, char** argv ) #endif = = - KAboutData aboutData("calligrageminithumbnailer", + K4AboutData aboutData("calligrageminithumbnailer", "calligrawords", ki18n("Calligra Gemini Thumbnailer"), version.toLatin1(), ki18n("Calligra Gemini: Writing and Presenting at= Home and on the Go"), - KAboutData::License_GPL, + K4AboutData::License_GPL, ki18n("(c) 1999-%1 The Calligra team and KO GmbH.= \n").subs(CALLIGRA_YEAR), KLocalizedString(), "http://www.calligra.org",