aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephan Binner <stephan.binner@basyskom.com>2017-02-24 09:50:25 +0100
committerStephan Binner <stephan.binner@basyskom.com>2017-02-24 10:00:41 +0000
commitaa0e51beaba1a338db42391c575212b4aac815b1 (patch)
tree8138b94f702d537d05342ee35165cf76ea4ddcc9
parentfe5d69669197a51662061b014810f0242eec5ca7 (diff)
Add feature.qml-profiler with extended build dependencies
Change-Id: If165cea6f176e7a7066f50b73261baf97634a0bb Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
-rw-r--r--src/qml/configure.json13
-rw-r--r--tools/tools.pro2
2 files changed, 14 insertions, 1 deletions
diff --git a/src/qml/configure.json b/src/qml/configure.json
index d22ba3b8f0..2c4887365f 100644
--- a/src/qml/configure.json
+++ b/src/qml/configure.json
@@ -22,6 +22,19 @@
"label": "QML network support",
"purpose": "Provides network transparency for QML",
"output": [ "publicFeature" ]
+ },
+ "qml-profiler": {
+ "label": "Command line QML Profiler",
+ "purpose": "The QML Profiler retrieves QML tracing data from an application.",
+ "condition": [
+ "features.commandlineparser",
+ "features.localserver",
+ "features.process",
+ "features.qml-debug",
+ "features.qml-network",
+ "features.xmlstreamwriter"
+ ],
+ "output": [ "privateFeature" ]
}
},
diff --git a/tools/tools.pro b/tools/tools.pro
index d16888e539..a7fe0d983d 100644
--- a/tools/tools.pro
+++ b/tools/tools.pro
@@ -9,7 +9,7 @@ SUBDIRS += \
qml \
qmllint
- qtConfig(qml-network):!contains(QT_CONFIG, no-qml-debug): SUBDIRS += qmlprofiler
+ qtConfig(qml-profiler): SUBDIRS += qmlprofiler
qtHaveModule(quick) {
!static: {