summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qfileselector/qfileselector.qrc
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-07-07 19:29:23 -0700
committerThiago Macieira <thiago.macieira@intel.com>2015-01-16 03:11:51 +0100
commitbbded12df3a7465dc72872e69b7b34b815e7e81c (patch)
tree7a97d6ad4946a2a0f3508f3b72bade87a6ab6fd8 /tests/auto/corelib/io/qfileselector/qfileselector.qrc
parent23f663cad6a68a7af8e8adde4f25b3cae5f14b0e (diff)
Update QFileSelector to use QSysInfo better
This reduces a bit of string duplication by relying on the constants defined in qglobal.cpp and detection via uname(2), in addition to adding the Linux distribution name as a selector. Change-Id: I64a46a0fc552c399db787125b1b32aae5c50056f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'tests/auto/corelib/io/qfileselector/qfileselector.qrc')
-rw-r--r--tests/auto/corelib/io/qfileselector/qfileselector.qrc30
1 files changed, 20 insertions, 10 deletions
diff --git a/tests/auto/corelib/io/qfileselector/qfileselector.qrc b/tests/auto/corelib/io/qfileselector/qfileselector.qrc
index 8fe7b841d2..661647f933 100644
--- a/tests/auto/corelib/io/qfileselector/qfileselector.qrc
+++ b/tests/auto/corelib/io/qfileselector/qfileselector.qrc
@@ -10,6 +10,8 @@
<file>extras/+custom3/+custom4/test</file>
<file>extras/+custom3/+custom5/test</file>
<file>extras/+custom5/+custom3/test</file>
+
+ <!-- platforms/test: deepest possible selection -->
<file>platforms/test</file>
<file>platforms/+unix/+android/test</file>
<file>platforms/+unix/+blackberry/test</file>
@@ -17,18 +19,11 @@
<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>
<file>platforms/+unix/+linux/test</file>
<file>platforms/+unix/test</file>
- <file>platforms/test2</file>
- <file>platforms/+android/test2</file>
- <file>platforms/+blackberry/test2</file>
- <file>platforms/+ios/test2</file>
- <file>platforms/+osx/test2</file>
- <file>platforms/+linux/test2</file>
- <file>platforms/+wince/test2</file>
+ <file>platforms/+windows/+wince/test</file>
+ <file>platforms/+windows/+winnt/test</file>
+ <file>platforms/+windows/test</file>
<file>platforms/+android/test</file>
<file>platforms/+blackberry/test</file>
<file>platforms/+ios/test</file>
@@ -37,5 +32,20 @@
<file>platforms/+mac/test</file>
<file>platforms/+linux/test</file>
<file>platforms/+wince/test</file>
+
+ <!-- platforms/test2: shallow selection for the deepest selector -->
+ <file>platforms/test2</file>
+ <file>platforms/+android/test2</file>
+ <file>platforms/+blackberry/test2</file>
+ <file>platforms/+ios/test2</file>
+ <file>platforms/+osx/test2</file>
+ <file>platforms/+linux/test2</file>
+ <file>platforms/+wince/test2</file>
+ <file>platforms/+winnt/test2</file>
+
+ <!-- platforms/test3: selection for the family only -->
+ <file>platforms/test3</file>
+ <file>platforms/+windows/test3</file>
+ <file>platforms/+unix/test3</file>
</qresource>
</RCC>