summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui/image/qimagereader
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2015-01-07 16:01:16 +0100
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2015-01-16 09:27:15 +0100
commitb4031387f91d9e96c19521486b82accdc45c178e (patch)
tree3d609a206ddc6d0e4521af9db27e347b84299872 /tests/auto/gui/image/qimagereader
parent988f1b2e5745646cf1bd7f9f65507356ff2ba12e (diff)
Android: Fix QImageReader test
The files for the test have to be included in a qrc to be available on Android. Most of the image files are already in a qrc, but a couple were missing. We add this in a separate qrc to avoid interfering with the tests on other platforms. Change-Id: Ibb24f5015a1aba4d5622e14f7aae80bc18611ec4 Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'tests/auto/gui/image/qimagereader')
-rw-r--r--tests/auto/gui/image/qimagereader/android_testdata.qrc6
-rw-r--r--tests/auto/gui/image/qimagereader/qimagereader.pro4
2 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/gui/image/qimagereader/android_testdata.qrc b/tests/auto/gui/image/qimagereader/android_testdata.qrc
new file mode 100644
index 0000000000..bba32781fa
--- /dev/null
+++ b/tests/auto/gui/image/qimagereader/android_testdata.qrc
@@ -0,0 +1,6 @@
+<RCC>
+ <qresource prefix="/">
+ <file>images/trans.gif</file>
+ <file>images/kollada-noext</file>
+ </qresource>
+</RCC>
diff --git a/tests/auto/gui/image/qimagereader/qimagereader.pro b/tests/auto/gui/image/qimagereader/qimagereader.pro
index 7686643b3a..76fb4d8bfc 100644
--- a/tests/auto/gui/image/qimagereader/qimagereader.pro
+++ b/tests/auto/gui/image/qimagereader/qimagereader.pro
@@ -5,6 +5,10 @@ MOC_DIR=tmp
QT += core-private gui-private network testlib
RESOURCES += qimagereader.qrc
+android: !android-no-sdk {
+ RESOURCES += android_testdata.qrc
+}
+
win32-msvc:QMAKE_CXXFLAGS -= -Zm200
win32-msvc:QMAKE_CXXFLAGS += -Zm800
win32-msvc.net:QMAKE_CXXFLAGS -= -Zm300