diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-11-19 12:42:10 +0100 |
| commit | 4d180586cddbd71a67c83246db3bec1caa595e05 (patch) | |
| tree | 0970def686b4e28e9cf6a3f0fc897e05bb0a9fbc /tests | |
| parent | 6b088b7a1da37511a8abb1503e4f2f95632dbdac (diff) | |
| parent | 527406cbd99f44470ef87468b73c18df949e8ac7 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/platformsupport/fontdatabases/mac/qfontengine_coretext.mm
Change-Id: I66a08c770767a93cd26535689e3e7806486aab06
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/corelib/io/io.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/corelib/io/io.pro b/tests/auto/corelib/io/io.pro index 3c93fd5e1f..eee2c0e30d 100644 --- a/tests/auto/corelib/io/io.pro +++ b/tests/auto/corelib/io/io.pro @@ -65,6 +65,9 @@ win32:!qtConfig(private_tests): SUBDIRS -= \ qprocess \ qprocess-noapplication +!qtConfig(settings): SUBDIRS -= \ + qsettings + winrt: SUBDIRS -= \ qstorageinfo |