diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:56:18 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-01-30 12:56:18 +0100 |
| commit | 6b1f857db586586e56ce5829635b33e51be74e8e (patch) | |
| tree | e776581154f51e1ec9b0b21033d5fcabde1b17d5 | |
| parent | fee3be1bdf6de5192a70400e6acf4c5b5e55680b (diff) | |
| parent | e0c119ccd4ca49b6fecb708133bb0d3008903560 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I312dcd7f8bbe6e15b157406e174c160e0eb7e225
| -rw-r--r-- | examples/quick/demos/stocqt/doc/src/stocqt.qdoc | 2 | ||||
| -rw-r--r-- | src/src.pro | 2 | ||||
| -rw-r--r-- | tests/auto/auto.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qml.pro | 2 | ||||
| -rw-r--r-- | tools/tools.pro | 3 |
5 files changed, 2 insertions, 9 deletions
diff --git a/examples/quick/demos/stocqt/doc/src/stocqt.qdoc b/examples/quick/demos/stocqt/doc/src/stocqt.qdoc index bd204c8211..800bba570c 100644 --- a/examples/quick/demos/stocqt/doc/src/stocqt.qdoc +++ b/examples/quick/demos/stocqt/doc/src/stocqt.qdoc @@ -69,7 +69,7 @@ \quotefromfile demos/stocqt/content/StockChart.qml \skipto Rectangle - \printuntil height + \printuntil id \dots \skipto Canvas \printuntil id diff --git a/src/src.pro b/src/src.pro index 21925c9330..c2a58c3757 100644 --- a/src/src.pro +++ b/src/src.pro @@ -21,5 +21,3 @@ SUBDIRS += \ qmldevtools qtConfig(localserver):!contains(QT_CONFIG, no-qml-debug): SUBDIRS += qmldebug - -qmldevtools.CONFIG = host_build diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index f25742fb14..1e80f1bf65 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -18,6 +18,4 @@ qtHaveModule(gui):qtConfig(opengl(es1|es2)?) { # console applications not supported uikit: SUBDIRS -= qmltest -qmldevtools.CONFIG = host_build - installed_cmake.depends = cmake diff --git a/tests/auto/qml/qml.pro b/tests/auto/qml/qml.pro index 68a2eace19..04e4b04114 100644 --- a/tests/auto/qml/qml.pro +++ b/tests/auto/qml/qml.pro @@ -73,7 +73,7 @@ qtHaveModule(widgets) { SUBDIRS += $$PUBLICTESTS \ qqmlextensionplugin SUBDIRS += $$METATYPETESTS -!uikit:!winrt { # no QProcess on uikit/winrt +!qtConfig(process) { !contains(QT_CONFIG, no-qml-debug): SUBDIRS += debugger SUBDIRS += qmllint qmlplugindump } diff --git a/tools/tools.pro b/tools/tools.pro index 3952ec4b01..f3988a909a 100644 --- a/tools/tools.pro +++ b/tools/tools.pro @@ -4,9 +4,6 @@ SUBDIRS += \ qmlmin \ qmlimportscanner -qmlmin.CONFIG = host_build -qmlimportscanner.CONFIG = host_build - !android|android_app { SUBDIRS += \ qml \ |