diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-08 10:09:30 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-08 10:09:30 +0200 |
| commit | 7036de7bb303735e7ef0fdf7f2d220bdbc867c71 (patch) | |
| tree | 78c810ee55f7f08d263503f5c0dd6085868c5556 /tests | |
| parent | 7c770c6e510d6c2274fd10a10e6f812672e3a6d1 (diff) | |
| parent | 2102196073a045d354e1ff5ea0e00ee4923b948d (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
src/virtualkeyboard/virtualkeyboard.pro
Change-Id: Idf7682b63379b94a1d444d3528472afea77133bc
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/auto.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 2d2a8618..3a406734 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -5,3 +5,6 @@ SUBDIRS += \ styles \ layoutfilesystem \ layoutresources \ + +# QTBUG-60268 +boot2qt: SUBDIRS = "" |