diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-04 16:40:42 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-08 08:22:31 +0000 |
| commit | f6f5687032bd6451e52c9ef221fb6a8a5b194389 (patch) | |
| tree | dcd068f83a64bfe80c1b0bc6035068c7336fe71d /src/quick | |
| parent | 245f9534ea01a8f482444b581ff995721b865751 (diff) | |
More porting of declarative modules
Change-Id: Ibe6d87998af1209518af87117b79778136110786
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick')
| -rw-r--r-- | src/quick/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/quick/configure.cmake | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index f375b56657..fa9a08bbda 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -5,6 +5,7 @@ ##################################################################### add_qt_module(Quick + PLUGIN_TYPES scenegraph SOURCES handlers/qquickdragaxis.cpp handlers/qquickdragaxis_p.h handlers/qquickdraghandler.cpp handlers/qquickdraghandler_p.h @@ -498,3 +499,4 @@ extend_target(Quick CONDITION QT_FEATURE_wheelevent add_qt_docs( doc/qtquick.qdocconf ) + diff --git a/src/quick/configure.cmake b/src/quick/configure.cmake index 556bff62d0..24b8b9f39e 100644 --- a/src/quick/configure.cmake +++ b/src/quick/configure.cmake @@ -24,7 +24,7 @@ qt_feature("quick_animatedimage" PRIVATE SECTION "Qt Quick" LABEL "AnimatedImage item" PURPOSE "Provides the AnimatedImage item." - CONDITION module.gui AND QT_FEATURE_movie OR FIXME + CONDITION TARGET Qt::Gui AND QT_FEATURE_movie ) qt_feature("quick_canvas" PRIVATE SECTION "Qt Quick" @@ -72,7 +72,7 @@ qt_feature("quick_particles" PRIVATE SECTION "Qt Quick" LABEL "Particle support" PURPOSE "Provides a particle system." - CONDITION module.gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite AND QT_FEATURE_opengl OR FIXME + CONDITION TARGET Qt::Gui AND QT_FEATURE_quick_shadereffect AND QT_FEATURE_quick_sprite AND QT_FEATURE_opengl ) qt_feature("quick_path" PRIVATE SECTION "Qt Quick" |