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 /tests | |
| parent | fee3be1bdf6de5192a70400e6acf4c5b5e55680b (diff) | |
| parent | e0c119ccd4ca49b6fecb708133bb0d3008903560 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Change-Id: I312dcd7f8bbe6e15b157406e174c160e0eb7e225
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qml/qml.pro | 2 |
2 files changed, 1 insertions, 3 deletions
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 } |