diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2017-05-11 17:49:08 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2017-05-11 17:49:08 +0200 |
| commit | 1fc2dfee7e0a0240d0823b5153be7491406518d9 (patch) | |
| tree | ed3667e135bf16abe4001ef281903211faf4c6dd /tests/auto/auto.pro | |
| parent | 52e578611c5d9dca43d967c833e23b7bbcb53079 (diff) | |
| parent | 2d11f49ecd48fbf154cf5dc759526bf28fc732b7 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: I5c6398e4146e62109bef231fe358b7ed69fa9488
Diffstat (limited to 'tests/auto/auto.pro')
| -rw-r--r-- | tests/auto/auto.pro | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 7c6f7a16..46275a3c 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -23,3 +23,9 @@ SUBDIRS += \ revisions \ sanity \ snippets + +# QTBUG-60268 +boot2qt: SUBDIRS -= applicationwindow calendar controls cursor \ + drawer focus menu platform popup qquickmaterialstyle \ + qquickmaterialstyleconf qquickuniversalstyle \ + qquickuniversalstyleconf snippets |