diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:06:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:37:40 +0200 |
| commit | 53fcf914e278ed4395a4873af2b64272c5d7882c (patch) | |
| tree | 6394dc7e3dffe2f8a93b0bf48610016c7917e905 /tests | |
| parent | e7b022ec334ce6768c30402c1e17fe0a1e3a0bb0 (diff) | |
| parent | 9546547495582628ba815a7d99e621d11ca84fa1 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I363b4779fe630b7956f6582ac3821d4ea8ee34c8
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 3 | ||||
| -rw-r--r-- | tests/auto/cpptest/cpptest.pro | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 70ffea39..ec2dc3ba 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -5,3 +5,6 @@ TEMPLATE = subdirs qtHaveModule(quick): SUBDIRS += qmltest installed_cmake.depends = cmake + +# QTBUG-60268 +boot2qt: SUBDIRS -= qmltest diff --git a/tests/auto/cpptest/cpptest.pro b/tests/auto/cpptest/cpptest.pro index abd8f38e..ac91d813 100644 --- a/tests/auto/cpptest/cpptest.pro +++ b/tests/auto/cpptest/cpptest.pro @@ -24,3 +24,14 @@ SUBDIRS = q3dbars \ q3dcustom \ q3dcustom-label \ q3dcustom-volume + +# QTBUG-60268 +boot2qt { + SUBDIRS -= q3dbars \ + q3dcustom-label \ + q3dsurface-modelproxy \ + q3dbars-modelproxy \ + q3dscene \ + q3dscatter \ + q3dsurface +} |