diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-12-20 11:06:06 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-09 12:02:21 +0000 |
| commit | c290197f8229829aad9bb6fad53685a9c121df02 (patch) | |
| tree | da8a657c68d1d8a5a36bf57175f0e9011eaa0e82 | |
| parent | 8c33c7022cf427b64fbd2729d38d6abdbe33a6e1 (diff) | |
Add a feature for qmldevtools
Change-Id: I45cc33c7d5efec6604152a94f26ee83df940d9e7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| -rw-r--r-- | src/qml/configure.json | 6 | ||||
| -rw-r--r-- | src/src.pro | 7 | ||||
| -rw-r--r-- | tools/tools.pro | 21 |
3 files changed, 23 insertions, 11 deletions
diff --git a/src/qml/configure.json b/src/qml/configure.json index b744ea6948..3bb7b8ce54 100644 --- a/src/qml/configure.json +++ b/src/qml/configure.json @@ -39,6 +39,12 @@ "features.xmlstreamwriter" ], "output": [ "privateFeature" ] + }, + "qml-devtools": { + "label": "QML Development Tools", + "purpose": "Provides the QmlDevtools library and various utilities.", + "section": "QML", + "output": [ "privateFeature" ] } }, diff --git a/src/src.pro b/src/src.pro index 33c47048b5..ce4d69761a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -2,7 +2,7 @@ TEMPLATE = subdirs CONFIG += ordered include($$OUT_PWD/qml/qtqml-config.pri) include($$OUT_PWD/quick/qtquick-config.pri) -QT_FOR_CONFIG += qml quick-private +QT_FOR_CONFIG += qml qml-private quick-private SUBDIRS += \ qml @@ -18,8 +18,9 @@ qtHaveModule(gui):qtConfig(animation) { SUBDIRS += \ plugins \ - imports \ - qmldevtools + imports + +qtConfig(qml-devtools): SUBDIRS += qmldevtools qtConfig(qml-network) { QT_FOR_CONFIG += network diff --git a/tools/tools.pro b/tools/tools.pro index 20a3600fb8..23d5cb5299 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -1,16 +1,19 @@ TEMPLATE = subdirs QT_FOR_CONFIG += qml-private -SUBDIRS += \ - qmlmin \ - qmlimportscanner -qtConfig(commandlineparser): SUBDIRS += qmlcachegen +qtConfig(qml-devtools) { + SUBDIRS += \ + qmlmin \ + qmlimportscanner + + qtConfig(commandlineparser): SUBDIRS += qmlcachegen +} !android|android_app { SUBDIRS += \ - qml \ - qmllint + qml + qtConfig(qml-devtools): SUBDIRS += qmllint qtConfig(qml-profiler): SUBDIRS += qmlprofiler qtHaveModule(quick) { @@ -30,8 +33,10 @@ qtConfig(commandlineparser): SUBDIRS += qmlcachegen qtConfig(private_tests): SUBDIRS += qmljs } -qml.depends = qmlimportscanner -qmleasing.depends = qmlimportscanner +qtConfig(qml-devtools) { + qml.depends = qmlimportscanner + qmleasing.depends = qmlimportscanner +} # qmlmin, qmlimportscanner & qmlcachegen are build tools. # qmlscene is needed by the autotests. |