diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 15:49:28 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:30:00 +0000 |
| commit | 7c229d3cf80d66c0261f7e63ac9b918e2cea4e57 (patch) | |
| tree | 514e825d7b33de388ce1558efa9bc327141d363a /src/quick/CMakeLists.txt | |
| parent | 1d333d3375874efb8d37df37dc5ef561573794ad (diff) | |
Post merge fixes
Change-Id: Ie8aca222809f35174fb6c6488832ec3ff5432272
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/quick/CMakeLists.txt')
| -rw-r--r-- | src/quick/CMakeLists.txt | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index 772848eb11..eafd135207 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -124,7 +124,6 @@ qt_add_module(Quick scenegraph/util/qsgninepatchnode.cpp scenegraph/util/qsgninepatchnode.h scenegraph/util/qsgplaintexture.cpp scenegraph/util/qsgplaintexture_p.h scenegraph/util/qsgrectanglenode.cpp scenegraph/util/qsgrectanglenode.h - scenegraph/util/qsgrhinativetextureimporter.cpp scenegraph/util/qsgrhinativetextureimporter_p.h scenegraph/util/qsgsimplematerial.cpp scenegraph/util/qsgsimplematerial.h scenegraph/util/qsgsimplerectnode.cpp scenegraph/util/qsgsimplerectnode.h scenegraph/util/qsgsimpletexturenode.cpp scenegraph/util/qsgsimpletexturenode.h @@ -165,7 +164,6 @@ qt_add_module(Quick util/qquicktransition.cpp util/qquicktransition_p.h util/qquicktransitionmanager.cpp util/qquicktransitionmanager_p_p.h - util/qquickutilmodule.cpp util/qquickutilmodule_p.h util/qquickvalidator.cpp util/qquickvalidator_p.h util/qquickvaluetypes.cpp util/qquickvaluetypes_p.h DEFINES @@ -348,6 +346,12 @@ if(ANDROID) ) endif() +#### Keys ignored in scope 1:.:.:quick.pro:<TRUE>: +# IMPORT_VERSION = "2.15" +# QMLTYPES_FILENAME = "plugins.qmltypes" +# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtQuick.2" +# QML_IMPORT_NAME = "QtQuick" + ## Scopes: ##################################################################### @@ -581,6 +585,9 @@ qt_extend_target(Quick CONDITION QT_FEATURE_wheelevent handlers/qquickwheelhandler.cpp handlers/qquickwheelhandler_p.h handlers/qquickwheelhandler_p_p.h ) + + +qt_create_tracepoints(Quick qtquick.tracepoints) qt_add_docs(Quick doc/qtquick.qdocconf ) |