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

List:       kde-commits
Subject:    [calligra/frameworks] /: Readd PART_QTQUICK to build
From:       Friedrich W. H. Kossebau <kossebau () kde ! org>
Date:       2015-03-31 22:08:22
Message-ID: E1Yd4Kc-0007FW-1n () scm ! kde ! org
[Download RAW message or body]

Git commit 2c9a5e423793f36b092a66e166a9accc4ce8b134 by Friedrich W. H. Koss=
ebau.
Committed on 31/03/2015 at 22:06.
Pushed by kossebau into branch 'frameworks'.

Readd PART_QTQUICK to build

M  +1    -0    CMakeLists.txt
M  +1    -1    CalligraProducts.cmake
M  +2    -2    qtquick/CMakeLists.txt

http://commits.kde.org/calligra/2c9a5e423793f36b092a66e166a9accc4ce8b134

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0ec6ea4..95467de 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -956,6 +956,7 @@ calligra_drop_product_on_bad_condition( PLUGIN_CALLIGRA=
GEMINI_GIT
 calligra_drop_product_on_bad_condition( PART_QTQUICK
     USEOPENGL "USEOPENGL set to FALSE"
     QT_QTOPENGL_FOUND "Qt OpenGL not found"
+    QT_QTDECLARATIVE_FOUND "QtDeclarative not found"
 )
 =

 calligra_drop_product_on_bad_condition( APP_GEMINI
diff --git a/CalligraProducts.cmake b/CalligraProducts.cmake
index e28a9c6..eab140c 100644
--- a/CalligraProducts.cmake
+++ b/CalligraProducts.cmake
@@ -84,7 +84,7 @@ calligra_define_product(PLUGIN_TEXTSHAPE "Text shape plug=
in"  REQUIRES LIB_CALLI
 calligra_define_product(PART_WORDS "Words engine"  REQUIRES LIB_CALLIGRA P=
LUGIN_TEXTSHAPE)
 calligra_define_product(PART_STAGE "Stage engine"  REQUIRES LIB_CALLIGRA L=
IB_KOPAGEAPP)
 calligra_define_product(PART_SHEETS "Sheets engine" UNPORTED  REQUIRES LIB=
_CALLIGRA)
-calligra_define_product(PART_QTQUICK "QtQuick Plugin that provides Calligr=
a components" UNPORTED  REQUIRES PART_WORDS PART_STAGE)# SHEETS_PART)
+calligra_define_product(PART_QTQUICK "QtQuick Plugin that provides Calligr=
a components"  REQUIRES PART_WORDS PART_STAGE)# SHEETS_PART)
 =

 # apps
 calligra_define_product(APP_WORDS "Words app (for Desktop)"  REQUIRES PART=
_WORDS)
diff --git a/qtquick/CMakeLists.txt b/qtquick/CMakeLists.txt
index d953532..71edb1e 100644
--- a/qtquick/CMakeLists.txt
+++ b/qtquick/CMakeLists.txt
@@ -74,12 +74,12 @@ include_directories(
     ${CMAKE_SOURCE_DIR}/libs/kopageapp
 )
 =

-automoc4_add_library(calligraqtquickcomponentsplugin MODULE ${calligraqtqu=
ickcomponents_SRCS})
+add_library(calligraqtquickcomponentsplugin MODULE ${calligraqtquickcompon=
ents_SRCS})
 =

 target_link_libraries(calligraqtquickcomponentsplugin
     Qt5::Declarative
     Qt5::OpenGL
-    ${QT_LIBRARIES}
+    Qt5::Svg
     komain
     kotextlayout
     wordsprivate
[prev in list] [next in list] [prev in thread] [next in thread]