From 27a748fbe22de01eef7333d1c3710bec0267a2e9 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Wed, 9 Sep 2009 17:25:21 +0200
Subject: tests/auto/qdir/qdir.pro fixed after destroying it during Symbian
 merge

Reviewed-by: thartman
---
 tests/auto/qdir/qdir.pro | 20 ++++++++------------
 1 file 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/\\\"
 }
-- 
cgit v0.12