summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@nokia.com>2009-09-09 15:25:21 (GMT)
committerJoerg Bornemann <joerg.bornemann@nokia.com>2009-09-09 15:51:28 (GMT)
commit27a748fbe22de01eef7333d1c3710bec0267a2e9 (patch)
tree0cad272f389c6fbfaba44a7be75afc14db6e0b88
parent9454edf25aaba24c24f1df3242bea575fa6208ad (diff)
downloadQt-27a748fbe22de01eef7333d1c3710bec0267a2e9.zip
Qt-27a748fbe22de01eef7333d1c3710bec0267a2e9.tar.gz
Qt-27a748fbe22de01eef7333d1c3710bec0267a2e9.tar.bz2
tests/auto/qdir/qdir.pro fixed after destroying it during Symbian merge
Reviewed-by: thartman
-rw-r--r--tests/auto/qdir/qdir.pro20
1 files changed, 8 insertions, 12 deletions
diff --git a/tests/auto/qdir/qdir.pro b/tests/auto/qdir/qdir.pro
index 0111672..cf612f1 100644
--- a/tests/auto/qdir/qdir.pro
+++ b/tests/auto/qdir/qdir.pro
@@ -1,25 +1,21 @@
load(qttest_p4)
-SOURCES += tst_qdir.cpp
-RESOURCES += qdir.qrc
-wince*:{
- DirFiles.sources = testdir testdata searchdir resources unprintablenames entrylist types tst_qdir.cpp
- DirFiles.path = .
- DEPLOYMENT += DirFiles
+SOURCES += tst_qdir.cpp
+RESOURCES += qdir.qrc
+QT = core
- QT = core
- DEFINES += SRCDIR=\\\"\\\"
-} symbian:{
+wince*|symbian {
DirFiles.sources = testdir testdata searchdir resources entrylist types tst_qdir.cpp
DirFiles.path = .
DEPLOYMENT += DirFiles
+}
- QT = core
+wince* {
+ DEFINES += SRCDIR=\\\"\\\"
+} else:symbian {
TARGET.CAPABILITY += AllFiles
-
TARGET.UID3 = 0xE0340002
DEFINES += SYMBIAN_SRCDIR_UID=$$lower($$replace(TARGET.UID3,"0x",""))
} else {
- QT = core
contains(QT_CONFIG, qt3support):QT += qt3support
DEFINES += SRCDIR=\\\"$$PWD/\\\"
}