summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2015-01-07 20:27:47 +0100
committerEskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>2015-01-08 10:07:06 +0100
commit14c94240f9d7d630873dc402d787c0fe4a7b38bd (patch)
tree5ff63e6720c766b785dc1b955e2a739fb0015326
parentd056618d685bd93d57538b703f25d8cb35d91aed (diff)
Android: Fix some QStyle tests
This adds the testdata to a qrc to make them available on Android. There are still some failures which might be actual errors, and which will be addressed separately. Change-Id: I1bdcfb2c6676134ca52388d49a1b2d25cf2813f9 Reviewed-by: BogDan Vatra <bogdan@kde.org>
-rw-r--r--tests/auto/widgets/styles/qstyle/qstyle.pro5
-rw-r--r--tests/auto/widgets/styles/qstyle/testdata.qrc20
2 files changed, 25 insertions, 0 deletions
diff --git a/tests/auto/widgets/styles/qstyle/qstyle.pro b/tests/auto/widgets/styles/qstyle/qstyle.pro
index 4d18971cc6..b4546aa760 100644
--- a/tests/auto/widgets/styles/qstyle/qstyle.pro
+++ b/tests/auto/widgets/styles/qstyle/qstyle.pro
@@ -10,3 +10,8 @@ wince* {
addPixmap.path = .
DEPLOYMENT += addPixmap
}
+
+android: !android-no-sdk {
+ RESOURCES += \
+ testdata.qrc
+}
diff --git a/tests/auto/widgets/styles/qstyle/testdata.qrc b/tests/auto/widgets/styles/qstyle/testdata.qrc
new file mode 100644
index 0000000000..c16b9be775
--- /dev/null
+++ b/tests/auto/widgets/styles/qstyle/testdata.qrc
@@ -0,0 +1,20 @@
+<RCC>
+ <qresource prefix="/">
+ <file>images/mac/button.png</file>
+ <file>images/mac/combobox.png</file>
+ <file>images/mac/lineedit.png</file>
+ <file>images/mac/mdi.png</file>
+ <file>images/mac/menu.png</file>
+ <file>images/mac/radiobutton.png</file>
+ <file>images/mac/slider.png</file>
+ <file>images/mac/spinbox.png</file>
+ <file>images/vista/button.png</file>
+ <file>images/vista/combobox.png</file>
+ <file>images/vista/lineedit.png</file>
+ <file>images/vista/menu.png</file>
+ <file>images/vista/radiobutton.png</file>
+ <file>images/vista/slider.png</file>
+ <file>images/vista/spinbox.png</file>
+ <file>task_25863.png</file>
+ </qresource>
+</RCC>