diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-06 14:21:16 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-07 13:07:25 +0100 |
| commit | a1fe728fa5bd6cb9e50cf317a58efcf4eea4de2c (patch) | |
| tree | 0798ae897d111147238544826c79243b6f9a48a4 /tests/auto/corelib/io/qfileselector/qfileselector.qrc | |
| parent | 57fe9bd2c6a361cf979d17d962abed5db17a1457 (diff) | |
| parent | 65bd80ebfc1be81a196a861ade40ff874a3554f0 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/kernel/qguiapplication.cpp
src/plugins/platforms/android/androidjnimain.cpp
src/plugins/platforms/android/qandroidplatformintegration.cpp
src/plugins/platforms/android/qandroidplatformintegration.h
src/plugins/platforms/android/qandroidplatformopenglcontext.cpp
src/plugins/platforms/cocoa/qcocoawindow.h
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/sql/doc/src/sql-driver.qdoc
src/widgets/widgets/qtoolbararealayout.cpp
Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e
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> |