don't depend from Qt5Declarative

That's the qt5 port of QGraphicsView-based QML
This commit is contained in:
Marco Martin 2014-03-31 18:37:28 +02:00
parent 7438ba4164
commit 82e9bd46d0
6 changed files with 3 additions and 7 deletions

View File

@ -39,7 +39,7 @@ endif()
set (QT_MIN_VERSION "5.2.0") set (QT_MIN_VERSION "5.2.0")
set(KF5_VERSION "4.98.0") set(KF5_VERSION "4.98.0")
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick Sql Qml Widgets Svg Declarative Script Test) find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick Sql Qml Widgets Svg Script Test)
find_package(KF5Activities ${KF5_VERSION} REQUIRED) find_package(KF5Activities ${KF5_VERSION} REQUIRED)
find_package(KF5Archive ${KF5_VERSION} REQUIRED) find_package(KF5Archive ${KF5_VERSION} REQUIRED)

View File

@ -9,7 +9,7 @@ find_package(KF5CoreAddons REQUIRED)
MACRO(PLASMA_UNIT_TESTS) MACRO(PLASMA_UNIT_TESTS)
FOREACH(_testname ${ARGN}) FOREACH(_testname ${ARGN})
add_executable(${_testname} ${_testname}.cpp) add_executable(${_testname} ${_testname}.cpp)
target_link_libraries(${_testname} Qt5::Test Qt5::Declarative target_link_libraries(${_testname} Qt5::Test
KF5::Plasma KF5::Archive KF5::CoreAddons KF5::Plasma KF5::Archive KF5::CoreAddons
KF5::ConfigGui KF5::ConfigGui
KF5::I18n KF5::I18n
@ -31,7 +31,7 @@ PLASMA_UNIT_TESTS(
) )
add_executable(storagetest storagetest.cpp ../src/plasma/private/storage.cpp ../src/plasma/private/storagethread.cpp) add_executable(storagetest storagetest.cpp ../src/plasma/private/storage.cpp ../src/plasma/private/storagethread.cpp)
target_link_libraries(storagetest Qt5::Test Qt5::Declarative Qt5::Sql KF5::KIOCore KF5::Plasma KF5::CoreAddons ) target_link_libraries(storagetest Qt5::Test Qt5::Sql KF5::KIOCore KF5::Plasma KF5::CoreAddons )
add_test(plasma-storagetest storagetest) add_test(plasma-storagetest storagetest)
ecm_mark_as_test(storagetest) ecm_mark_as_test(storagetest)

View File

@ -18,7 +18,6 @@ target_link_libraries(calendarplugin
Qt5::Quick Qt5::Quick
Qt5::Qml Qt5::Qml
Qt5::Gui Qt5::Gui
Qt5::Declarative
${KDEPIMLIBS_AKONADI_LIBS} ${KDEPIMLIBS_AKONADI_LIBS}
${KDEPIMLIBS_KCALCORE_LIBS} ${KDEPIMLIBS_KCALCORE_LIBS}
${KDEPIMLIBS_AKONADI_CALENDAR_LIBS} ${KDEPIMLIBS_AKONADI_CALENDAR_LIBS}

View File

@ -11,7 +11,6 @@ MACRO(PLASMA_UNIT_TESTS)
add_executable(${_testname} ${_testname}.cpp) add_executable(${_testname} ${_testname}.cpp)
target_link_libraries(${_testname} target_link_libraries(${_testname}
Qt5::Test Qt5::Test
Qt5::Declarative
Qt5::Qml Qt5::Qml
KF5::Plasma KF5::Plasma
KF5::Archive KF5::CoreAddons KF5::Archive KF5::CoreAddons

View File

@ -18,7 +18,6 @@ include(KF5PlasmaMacros.cmake)
target_link_libraries(Foo target_link_libraries(Foo
Qt5::Test Qt5::Test
Qt5::Declarative
KF5::Plasma KF5::Plasma
KF5::Archive KF5::CoreAddons KF5::Archive KF5::CoreAddons
KF5::ConfigGui KF5::ConfigGui

View File

@ -18,7 +18,6 @@ include(PlasmaMacros.cmake)
target_link_libraries(Foo target_link_libraries(Foo
Qt5::Test Qt5::Test
Qt5::Declarative
KF5::Plasma KF5::Plasma
KF5::KArchive KF5::KCoreAddons KF5::KArchive KF5::KCoreAddons
KF5::KConfigGui KF5::KConfigGui