diff options
author | Liang Qi <liang.qi@qt.io> | 2017-04-20 11:19:14 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-04-20 12:31:27 +0200 |
commit | 7950b6b283549c98f1e0f981c84b68071a13b616 (patch) | |
tree | cf7281872045ebd57c68e10064ff0f400084aa13 /tests/auto/corelib/io/qfileselector/qfileselector.qrc | |
parent | 58d2927861d3e57cac4f6db599e209d2bfb17a2c (diff) | |
parent | 0794d61c822585530243f638687b8a75f0a15d0c (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/tools/qbytearray.h
src/corelib/tools/qdatetime.h
src/corelib/tools/qstring.h
src/corelib/tools/qversionnumber.h
src/plugins/platforms/android/qandroidplatformintegration.cpp
tests/auto/corelib/tools/qhashfunctions/tst_qhashfunctions.cpp
Change-Id: Iefd92a435e687a76cd593099e40d9a9620a1454d
Diffstat (limited to 'tests/auto/corelib/io/qfileselector/qfileselector.qrc')
-rw-r--r-- | tests/auto/corelib/io/qfileselector/qfileselector.qrc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/tests/auto/corelib/io/qfileselector/qfileselector.qrc index ab7a4d7f23..ea9b8270e0 100644 --- a/tests/auto/corelib/io/qfileselector/qfileselector.qrc +++ b/tests/auto/corelib/io/qfileselector/qfileselector.qrc @@ -15,6 +15,7 @@ <file>platforms/test</file> <file>platforms/+unix/+android/test</file> <file>platforms/+unix/+darwin/+mac/+ios/test</file> + <file>platforms/+unix/+darwin/+mac/+osx/+macos/test</file> <file>platforms/+unix/+darwin/+mac/+osx/test</file> <file>platforms/+unix/+darwin/+mac/test</file> <file>platforms/+unix/+darwin/test</file> @@ -27,6 +28,7 @@ <file>platforms/+windows/test</file> <file>platforms/+android/test</file> <file>platforms/+ios/test</file> + <file>platforms/+macos/test</file> <file>platforms/+osx/test</file> <file>platforms/+darwin/test</file> <file>platforms/+mac/test</file> @@ -39,7 +41,7 @@ <file>platforms/test2</file> <file>platforms/+android/test2</file> <file>platforms/+ios/test2</file> - <file>platforms/+osx/test2</file> + <file>platforms/+macos/test2</file> <file>platforms/+haiku/test2</file> <file>platforms/+linux/test2</file> <file>platforms/+wince/test2</file> @@ -50,5 +52,11 @@ <file>platforms/test3</file> <file>platforms/+windows/test3</file> <file>platforms/+unix/test3</file> + + <!-- platforms/test4 and 5: special cases for macOS --> + <file>platforms/test4</file> + <file>platforms/+osx/test4</file> + <file>platforms/test5</file> + <file>platforms/+mac/test5</file> </qresource> </RCC> |