summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io/qfileselector
diff options
context:
space:
mode:
authorSebastian Lösch <Sebastian.Loesch@governikus.de>2016-11-01 11:16:32 +0100
committerAndré Klitzing <aklitzing@gmail.com>2017-01-20 05:25:19 +0000
commitda0241a2e7df020b2ae3b93c7a4204af851222f3 (patch)
treecf8e4d072e0a41076262d287358e698d75ddd4d9 /tests/auto/corelib/io/qfileselector
parent04dc59d98993585d540ea5885a9f24583f1a33d7 (diff)
Make variant selection possible if base is missing
[ChangeLog][QtCore][QFileSelector] Removed the requirement for an unused default base file in case you want to load only a variant. When the base file (e.g. /image.jpg) was missing, no selectors were considered and it was not possible to load variants of this file (e.g. /+android/image.jpg, /+android/+tablet/image.jpg) without specifying the directory as well. As a work around, one previously had to place a default file in the base location, which is undesirable in some cases because: 1. The extra file consumes unnecessary space. 2. It is impossible to encapsulate platform-specific implementation details by hiding files in a subdirectory. Task-number: QTBUG-51230 Change-Id: I4c7f9ec952bff6e5b7738d8cabe3c762c208a38e Reviewed-by: Robin Burchell <robin.burchell@crimson.no>
Diffstat (limited to 'tests/auto/corelib/io/qfileselector')
-rw-r--r--tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
index e5ede1ad06..8c2886f337 100644
--- a/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
+++ b/tests/auto/corelib/io/qfileselector/tst_qfileselector.cpp
@@ -138,7 +138,7 @@ void tst_QFileSelector::basicTest_data()
<< QString(":/extras/test2");
QTest::newRow("custom1-withselector-nobasefile") << QString(":/extras/test3") << (QStringList() << custom1)
- << QString(":/extras/test3");
+ << QString(":/extras/+custom1/test3");
QString custom2("custom2");
QString custom3("custom3");