diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-11 15:12:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 15:12:00 +0100 |
| commit | df62c31807f7b0a8b9bc222b47ccc7016cfaee65 (patch) | |
| tree | a7df6263cdb4cc96e2d31486437ec19ca0bf01e5 /tests/auto/corelib/io/qfileselector/qfileselector.qrc | |
| parent | 17de86f2824c1807c0fa7fa7ae0ed3b7d2acca00 (diff) | |
| parent | a1fe728fa5bd6cb9e50cf317a58efcf4eea4de2c (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/corelib/io/qfileselector/qfileselector.qrc')
| -rw-r--r-- | tests/auto/corelib/io/qfileselector/qfileselector.qrc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/tests/auto/corelib/io/qfileselector/qfileselector.qrc index abfead2a55..8fe7b841d2 100644 --- a/tests/auto/corelib/io/qfileselector/qfileselector.qrc +++ b/tests/auto/corelib/io/qfileselector/qfileselector.qrc @@ -13,8 +13,10 @@ <file>platforms/test</file> <file>platforms/+unix/+android/test</file> <file>platforms/+unix/+blackberry/test</file> - <file>platforms/+unix/+ios/test</file> - <file>platforms/+unix/+mac/test</file> + <file>platforms/+unix/+darwin/+mac/+ios/test</file> + <file>platforms/+unix/+darwin/+mac/+osx/test</file> + <file>platforms/+unix/+darwin/+mac/test</file> + <file>platforms/+unix/+darwin/test</file> <file>platforms/+windows/+wince/test</file> <file>platforms/+windows/test</file> <file>platforms/+windows/test2</file> @@ -24,12 +26,14 @@ <file>platforms/+android/test2</file> <file>platforms/+blackberry/test2</file> <file>platforms/+ios/test2</file> - <file>platforms/+mac/test2</file> + <file>platforms/+osx/test2</file> <file>platforms/+linux/test2</file> <file>platforms/+wince/test2</file> <file>platforms/+android/test</file> <file>platforms/+blackberry/test</file> <file>platforms/+ios/test</file> + <file>platforms/+osx/test</file> + <file>platforms/+darwin/test</file> <file>platforms/+mac/test</file> <file>platforms/+linux/test</file> <file>platforms/+wince/test</file> |