summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/kernel/qapplication/test
diff options
context:
space:
mode:
authorKurt Korbatits <kurt.korbatits@nokia.com>2012-01-25 11:29:16 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-31 04:55:38 +0100
commitc8f88e6292c155c431cf8eb8657e46717c862eb0 (patch)
tree664d01f8f76e49bf2240f29d5847828130ba541e /tests/auto/widgets/kernel/qapplication/test
parent4ca298f42bfdc908815cca06236827e5158a5f67 (diff)
Changed qapplication unittest to work from installation directory
- Changed to use TESTDATA and installTestHelperApp() - Changed to use QFINDTESTDATA instead of currentPath() Change-Id: Ia24ebc758d5d0fdfcca951500766adefbcf9fe93 Reviewed-by: Kurt Korbatits <kurt.korbatits@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/widgets/kernel/qapplication/test')
-rw-r--r--tests/auto/widgets/kernel/qapplication/test/test.pro18
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/auto/widgets/kernel/qapplication/test/test.pro b/tests/auto/widgets/kernel/qapplication/test/test.pro
index db9d59bdf6..9f6db3cd3e 100644
--- a/tests/auto/widgets/kernel/qapplication/test/test.pro
+++ b/tests/auto/widgets/kernel/qapplication/test/test.pro
@@ -6,14 +6,6 @@ QT += core-private gui-private
SOURCES += ../tst_qapplication.cpp
TARGET = ../tst_qapplication
-wince* {
- additional.files = ../desktopsettingsaware/desktopsettingsaware.exe
- additional.path = desktopsettingsaware
- someTest.files = test.pro
- someTest.path = test
- DEPLOYMENT += additional deploy someTest
-}
-
win32 {
CONFIG(debug, debug|release) {
TARGET = ../../debug/tst_qapplication
@@ -23,3 +15,13 @@ win32 {
}
mac*:CONFIG+=insignificant_test
+
+TESTDATA = ../test/test.pro ../tmp/README
+
+SUBPROGRAMS = desktopsettingsaware modal
+win32: !wince*: SUBPROGRAMS += wincmdline
+
+load(testcase) # for target.path and installTestHelperApp()
+for(file, SUBPROGRAMS): installTestHelperApp("../$${file}/$${file}",$${file},$${file})
+
+