summaryrefslogtreecommitdiffstats
path: root/tests/auto/corelib/io
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/corelib/io')
-rw-r--r--tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro2
-rw-r--r--tests/auto/corelib/io/qbuffer/qbuffer.pro5
-rw-r--r--tests/auto/corelib/io/qdatastream/qdatastream.pro18
-rw-r--r--tests/auto/corelib/io/qdebug/qdebug.pro5
-rw-r--r--tests/auto/corelib/io/qdir/qdir.pro11
-rw-r--r--tests/auto/corelib/io/qdiriterator/qdiriterator.pro8
-rw-r--r--tests/auto/corelib/io/qfile/largefile/largefile.pro7
-rw-r--r--tests/auto/corelib/io/qfile/test/test.pro11
-rw-r--r--tests/auto/corelib/io/qfileinfo/qfileinfo.pro17
-rw-r--r--tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro11
-rw-r--r--tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro6
-rw-r--r--tests/auto/corelib/io/qiodevice/qiodevice.pro21
-rw-r--r--tests/auto/corelib/io/qprocess/test/test.pro179
-rw-r--r--tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro7
-rw-r--r--tests/auto/corelib/io/qresourceengine/qresourceengine.pro15
-rw-r--r--tests/auto/corelib/io/qsettings/qsettings.pro10
-rw-r--r--tests/auto/corelib/io/qstandardpaths/qstandardpaths.pro5
-rw-r--r--tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro7
-rw-r--r--tests/auto/corelib/io/qtextstream/test/test.pro19
-rw-r--r--tests/auto/corelib/io/qurl/qurl.pro7
20 files changed, 151 insertions, 220 deletions
diff --git a/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro b/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro
index d498b530bc..d7565b5429 100644
--- a/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro
+++ b/tests/auto/corelib/io/qabstractfileengine/qabstractfileengine.pro
@@ -1,7 +1,5 @@
CONFIG += testcase
TARGET = tst_qabstractfileengine
QT = core testlib
-
SOURCES = tst_qabstractfileengine.cpp
RESOURCES += qabstractfileengine.qrc
-
diff --git a/tests/auto/corelib/io/qbuffer/qbuffer.pro b/tests/auto/corelib/io/qbuffer/qbuffer.pro
index 9745fcd862..a21af80be1 100644
--- a/tests/auto/corelib/io/qbuffer/qbuffer.pro
+++ b/tests/auto/corelib/io/qbuffer/qbuffer.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qbuffer
-SOURCES += tst_qbuffer.cpp
QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qbuffer.cpp
diff --git a/tests/auto/corelib/io/qdatastream/qdatastream.pro b/tests/auto/corelib/io/qdatastream/qdatastream.pro
index 2cb4282296..2214bdb0b0 100644
--- a/tests/auto/corelib/io/qdatastream/qdatastream.pro
+++ b/tests/auto/corelib/io/qdatastream/qdatastream.pro
@@ -1,13 +1,13 @@
CONFIG += testcase
TARGET = tst_qdatastream
-SOURCES += tst_qdatastream.cpp
-QT += gui widgets testlib
-wince*: {
- addFiles.files = datastream.q42
- addFiles.path = .
- DEPLOYMENT += addFiles
- DEFINES += SRCDIR=\\\"\\\"
+QT = gui widgets testlib
+SOURCES = tst_qdatastream.cpp
+
+wince* {
+ addFiles.files = datastream.q42
+ addFiles.path = .
+ DEPLOYMENT += addFiles
+ DEFINES += SRCDIR=\\\"\\\"
} else {
- DEFINES += SRCDIR=\\\"$$PWD/\\\"
+ DEFINES += SRCDIR=\\\"$$PWD/\\\"
}
-
diff --git a/tests/auto/corelib/io/qdebug/qdebug.pro b/tests/auto/corelib/io/qdebug/qdebug.pro
index b6a91a7703..ab0260621b 100644
--- a/tests/auto/corelib/io/qdebug/qdebug.pro
+++ b/tests/auto/corelib/io/qdebug/qdebug.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qdebug
-SOURCES += tst_qdebug.cpp
QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qdebug.cpp
diff --git a/tests/auto/corelib/io/qdir/qdir.pro b/tests/auto/corelib/io/qdir/qdir.pro
index 44cf644b37..c26262e826 100644
--- a/tests/auto/corelib/io/qdir/qdir.pro
+++ b/tests/auto/corelib/io/qdir/qdir.pro
@@ -1,19 +1,14 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qdir
-SOURCES += tst_qdir.cpp
+QT = core testlib
+SOURCES = tst_qdir.cpp
RESOURCES += qdir.qrc
-QT = core testlib
wince* {
DirFiles.files = testdir testData searchdir resources entrylist types tst_qdir.cpp
DirFiles.path = .
DEPLOYMENT += DirFiles
-}
-
-wince* {
DEFINES += SRCDIR=\\\"\\\"
} else {
DEFINES += SRCDIR=\\\"$$PWD/\\\"
}
-
-CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
index ea0789ae16..b51a734d10 100644
--- a/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
+++ b/tests/auto/corelib/io/qdiriterator/qdiriterator.pro
@@ -1,9 +1,7 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qdiriterator
-SOURCES += tst_qdiriterator.cpp
-RESOURCES += qdiriterator.qrc
QT = core testlib
+SOURCES = tst_qdiriterator.cpp
+RESOURCES += qdiriterator.qrc
wince*mips*|wincewm50smart-msvc200*: DEFINES += WINCE_BROKEN_ITERATE=1
-
-CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qfile/largefile/largefile.pro b/tests/auto/corelib/io/qfile/largefile/largefile.pro
index ca2a1864bd..4e629122ec 100644
--- a/tests/auto/corelib/io/qfile/largefile/largefile.pro
+++ b/tests/auto/corelib/io/qfile/largefile/largefile.pro
@@ -1,9 +1,6 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_largefile
-
QT = core testlib
-SOURCES += tst_largefile.cpp
+SOURCES = tst_largefile.cpp
wince*: SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp
-
-CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qfile/test/test.pro b/tests/auto/corelib/io/qfile/test/test.pro
index 44dd20cf50..aca034b098 100644
--- a/tests/auto/corelib/io/qfile/test/test.pro
+++ b/tests/auto/corelib/io/qfile/test/test.pro
@@ -1,5 +1,7 @@
CONFIG += testcase
-SOURCES += ../tst_qfile.cpp
+TARGET = ../tst_qfile
+SOURCES = ../tst_qfile.cpp
+RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc
wince* {
QT = core gui testlib
@@ -11,9 +13,6 @@ wince* {
resour.path = resources
DEPLOYMENT += files resour
-}
-
-wince* {
SOURCES += $$QT_SOURCE_TREE/src/corelib/kernel/qfunctions_wince.cpp # needed for QT_OPEN
DEFINES += SRCDIR=\\\"\\\"
} else {
@@ -21,10 +20,6 @@ wince* {
DEFINES += SRCDIR=\\\"$$PWD/../\\\"
}
-RESOURCES += ../qfile.qrc ../rename-fallback.qrc ../copy-fallback.qrc
-
-TARGET = ../tst_qfile
-
win32 {
CONFIG(debug, debug|release) {
TARGET = ../../debug/tst_qfile
diff --git a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
index 42a045dc23..2f3fa3fded 100644
--- a/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
+++ b/tests/auto/corelib/io/qfileinfo/qfileinfo.pro
@@ -1,26 +1,17 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qfileinfo
-SOURCES += tst_qfileinfo.cpp
-
QT = core-private testlib
-
-
-RESOURCES += qfileinfo.qrc
+SOURCES = tst_qfileinfo.cpp
+RESOURCES += qfileinfo.qrc
wince* {
deploy.files += qfileinfo.qrc tst_qfileinfo.cpp
res.files = resources\\file1 resources\\file1.ext1 resources\\file1.ext1.ext2
res.path = resources
DEPLOYMENT += deploy res
-}
-
-win32*:LIBS += -ladvapi32 -lnetapi32
-
-# support for running test from shadow build directory
-wince* {
DEFINES += SRCDIR=\\\"\\\"
} else {
DEFINES += SRCDIR=\\\"$$PWD/\\\"
}
-CONFIG += parallel_test
+win32*:LIBS += -ladvapi32 -lnetapi32
diff --git a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro
index 7990bb69c3..382dc316e6 100644
--- a/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro
+++ b/tests/auto/corelib/io/qfilesystementry/qfilesystementry.pro
@@ -1,9 +1,6 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qfilesystementry
-
-SOURCES += tst_qfilesystementry.cpp \
+QT = core-private testlib
+SOURCES = tst_qfilesystementry.cpp \
$${QT.core.sources}/io/qfilesystementry.cpp
-HEADERS += $${QT.core.sources}/io/qfilesystementry_p.h
-QT = core core-private testlib
-
-CONFIG += parallel_test
+HEADERS = $${QT.core.sources}/io/qfilesystementry_p.h
diff --git a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
index aa1e37f972..8ada44fdf7 100644
--- a/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
+++ b/tests/auto/corelib/io/qfilesystemwatcher/qfilesystemwatcher.pro
@@ -1,6 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qfilesystemwatcher
-SOURCES += tst_qfilesystemwatcher.cpp
QT = core testlib
-
-CONFIG += parallel_test
+SOURCES = tst_qfilesystemwatcher.cpp
diff --git a/tests/auto/corelib/io/qiodevice/qiodevice.pro b/tests/auto/corelib/io/qiodevice/qiodevice.pro
index 7ef227dd57..fa5ee1492c 100644
--- a/tests/auto/corelib/io/qiodevice/qiodevice.pro
+++ b/tests/auto/corelib/io/qiodevice/qiodevice.pro
@@ -1,18 +1,15 @@
CONFIG += testcase
TARGET = tst_qiodevice
-SOURCES += tst_qiodevice.cpp
-
QT = core network testlib
-
-wince*: {
- addFiles.files = tst_qiodevice.cpp
- addFiles.path = .
- DEPLOYMENT += addFiles
- DEFINES += SRCDIR=\\\"\\\"
- !wince50standard-x86-msvc2005: DEFINES += WINCE_EMULATOR_TEST=1
+SOURCES = tst_qiodevice.cpp
+
+wince* {
+ addFiles.files = tst_qiodevice.cpp
+ addFiles.path = .
+ DEPLOYMENT += addFiles
+ DEFINES += SRCDIR=\\\"\\\"
+ !wince50standard-x86-msvc2005: DEFINES += WINCE_EMULATOR_TEST=1
} else {
- DEFINES += SRCDIR=\\\"$$PWD/\\\"
+ DEFINES += SRCDIR=\\\"$$PWD/\\\"
}
MOC_DIR=tmp
-
-
diff --git a/tests/auto/corelib/io/qprocess/test/test.pro b/tests/auto/corelib/io/qprocess/test/test.pro
index 3bac7eae3d..bb21f76dd1 100644
--- a/tests/auto/corelib/io/qprocess/test/test.pro
+++ b/tests/auto/corelib/io/qprocess/test/test.pro
@@ -1,105 +1,94 @@
CONFIG += testcase
+QT = core testlib network
+embedded: QT += gui
+SOURCES = ../tst_qprocess.cpp
-SOURCES += ../tst_qprocess.cpp
!wince*: {
-TARGET = ../tst_qprocess
-
-win32: {
- CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qprocess
+ TARGET = ../tst_qprocess
+ win32: {
+ CONFIG(debug, debug|release) {
+ TARGET = ../../debug/tst_qprocess
+ } else {
+ TARGET = ../../release/tst_qprocess
+ }
+ }
} else {
- TARGET = ../../release/tst_qprocess
- }
-}
-} else {
- TARGET = tst_qprocess
-}
+ TARGET = tst_qprocess
+ addFile_fileWriterProcess.files = $$OUT_PWD/../fileWriterProcess/fileWriterProcess.exe
+ addFile_fileWriterProcess.path = fileWriterProcess
+ addFile_testBatFiles.files = $$PWD/../testBatFiles/*
+ addFile_testBatFiles.path = testBatFiles
+ addFile_testDetached.files = $$OUT_PWD/../testDetached/testDetached.exe
+ addFile_testDetached.path = testDetached
-QT = core testlib
-QT += network
+ addFile_testExitCodes.files = $$OUT_PWD/../testExitCodes/testExitCodes.exe
+ addFile_testExitCodes.path = testExitCodes
-embedded: QT += gui
+ addFile_testGuiProcess.files = $$OUT_PWD/../testGuiProcess/testGuiProcess.exe
+ addFile_testGuiProcess.path = testGuiProcess
+
+ addFile_testProcessCrash.files = $$OUT_PWD/../testProcessCrash/testProcessCrash.exe
+ addFile_testProcessCrash.path = testProcessCrash
+
+ addFile_testProcessDeadWhileReading.files = $$OUT_PWD/../testProcessDeadWhileReading/testProcessDeadWhileReading.exe
+ addFile_testProcessDeadWhileReading.path = testProcessDeadWhileReading
+
+ addFile_testProcessEcho.files = $$OUT_PWD/../testProcessEcho/testProcessEcho.exe
+ addFile_testProcessEcho.path = testProcessEcho
+
+ addFile_testProcessEcho2.files = $$OUT_PWD/../testProcessEcho2/testProcessEcho2.exe
+ addFile_testProcessEcho2.path = testProcessEcho2
+
+ addFile_testProcessEcho3.files = $$OUT_PWD/../testProcessEcho3/testProcessEcho3.exe
+ addFile_testProcessEcho3.path = testProcessEcho3
+
+ addFile_testProcessEOF.files = $$OUT_PWD/../testProcessEOF/testProcessEOF.exe
+ addFile_testProcessEOF.path = testProcessEOF
+
+ addFile_testProcessLoopback.files = $$OUT_PWD/../testProcessLoopback/testProcessLoopback.exe
+ addFile_testProcessLoopback.path = testProcessLoopback
+
+ addFile_testProcessNormal.files = $$OUT_PWD/../testProcessNormal/testProcessNormal.exe
+ addFile_testProcessNormal.path = testProcessNormal
+
+ addFile_testProcessOutput.files = $$OUT_PWD/../testProcessOutput/testProcessOutput.exe
+ addFile_testProcessOutput.path = testProcessOutput
+
+ addFile_testProcessNoSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/nospace.exe
+ addFile_testProcessNoSpacesArgs.path = testProcessSpacesArgs
+
+ addFile_testProcessOneSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/"one space".exe
+ addFile_testProcessOneSpacesArgs.path = testProcessSpacesArgs
+
+ addFile_testProcessTwoSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/"two space s".exe
+ addFile_testProcessTwoSpacesArgs.path = testProcessSpacesArgs
+
+ addFile_testSoftExit.files = $$OUT_PWD/../testSoftExit/testSoftExit.exe
+ addFile_testSoftExit.path = testSoftExit
+
+ addFile_testSpaceInName.files = $$OUT_PWD/../"test Space In Name"/testSpaceInName.exe
+ addFile_testSpaceInName.path = "test Space In Name"
-wince*: {
-
- addFile_fileWriterProcess.files = $$OUT_PWD/../fileWriterProcess/fileWriterProcess.exe
- addFile_fileWriterProcess.path = fileWriterProcess
-
- addFile_testBatFiles.files = $$PWD/../testBatFiles/*
- addFile_testBatFiles.path = testBatFiles
-
- addFile_testDetached.files = $$OUT_PWD/../testDetached/testDetached.exe
- addFile_testDetached.path = testDetached
-
- addFile_testExitCodes.files = $$OUT_PWD/../testExitCodes/testExitCodes.exe
- addFile_testExitCodes.path = testExitCodes
-
- addFile_testGuiProcess.files = $$OUT_PWD/../testGuiProcess/testGuiProcess.exe
- addFile_testGuiProcess.path = testGuiProcess
-
- addFile_testProcessCrash.files = $$OUT_PWD/../testProcessCrash/testProcessCrash.exe
- addFile_testProcessCrash.path = testProcessCrash
-
- addFile_testProcessDeadWhileReading.files = $$OUT_PWD/../testProcessDeadWhileReading/testProcessDeadWhileReading.exe
- addFile_testProcessDeadWhileReading.path = testProcessDeadWhileReading
-
- addFile_testProcessEcho.files = $$OUT_PWD/../testProcessEcho/testProcessEcho.exe
- addFile_testProcessEcho.path = testProcessEcho
-
- addFile_testProcessEcho2.files = $$OUT_PWD/../testProcessEcho2/testProcessEcho2.exe
- addFile_testProcessEcho2.path = testProcessEcho2
-
- addFile_testProcessEcho3.files = $$OUT_PWD/../testProcessEcho3/testProcessEcho3.exe
- addFile_testProcessEcho3.path = testProcessEcho3
-
- addFile_testProcessEOF.files = $$OUT_PWD/../testProcessEOF/testProcessEOF.exe
- addFile_testProcessEOF.path = testProcessEOF
-
- addFile_testProcessLoopback.files = $$OUT_PWD/../testProcessLoopback/testProcessLoopback.exe
- addFile_testProcessLoopback.path = testProcessLoopback
-
- addFile_testProcessNormal.files = $$OUT_PWD/../testProcessNormal/testProcessNormal.exe
- addFile_testProcessNormal.path = testProcessNormal
-
- addFile_testProcessOutput.files = $$OUT_PWD/../testProcessOutput/testProcessOutput.exe
- addFile_testProcessOutput.path = testProcessOutput
-
- addFile_testProcessNoSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/nospace.exe
- addFile_testProcessNoSpacesArgs.path = testProcessSpacesArgs
-
- addFile_testProcessOneSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/"one space".exe
- addFile_testProcessOneSpacesArgs.path = testProcessSpacesArgs
-
- addFile_testProcessTwoSpacesArgs.files = $$OUT_PWD/../testProcessSpacesArgs/"two space s".exe
- addFile_testProcessTwoSpacesArgs.path = testProcessSpacesArgs
-
- addFile_testSoftExit.files = $$OUT_PWD/../testSoftExit/testSoftExit.exe
- addFile_testSoftExit.path = testSoftExit
-
- addFile_testSpaceInName.files = $$OUT_PWD/../"test Space In Name"/testSpaceInName.exe
- addFile_testSpaceInName.path = "test Space In Name"
-
-
- DEPLOYMENT += addFile_fileWriterProcess \
- addFile_testBatFiles \
- addFile_testDetached \
- addFile_testExitCodes \
- addFile_testGuiProcess \
- addFile_testProcessCrash \
- addFile_testProcessDeadWhileReading \
- addFile_testProcessEcho \
- addFile_testProcessEcho2 \
- addFile_testProcessEcho3 \
- addFile_testProcessEchoGui \
- addFile_testProcessEOF \
- addFile_testProcessLoopback \
- addFile_testProcessNormal \
- addFile_testProcessOutput \
- addFile_testProcessNoSpacesArgs \
- addFile_testProcessOneSpacesArgs \
- addFile_testProcessTwoSpacesArgs \
- addFile_testSoftExit \
- addFile_testSpaceInName
+ DEPLOYMENT += addFile_fileWriterProcess \
+ addFile_testBatFiles \
+ addFile_testDetached \
+ addFile_testExitCodes \
+ addFile_testGuiProcess \
+ addFile_testProcessCrash \
+ addFile_testProcessDeadWhileReading \
+ addFile_testProcessEcho \
+ addFile_testProcessEcho2 \
+ addFile_testProcessEcho3 \
+ addFile_testProcessEchoGui \
+ addFile_testProcessEOF \
+ addFile_testProcessLoopback \
+ addFile_testProcessNormal \
+ addFile_testProcessOutput \
+ addFile_testProcessNoSpacesArgs \
+ addFile_testProcessOneSpacesArgs \
+ addFile_testProcessTwoSpacesArgs \
+ addFile_testSoftExit \
+ addFile_testSpaceInName
}
diff --git a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro b/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro
index b05b8a5265..f0443935fd 100644
--- a/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro
+++ b/tests/auto/corelib/io/qprocessenvironment/qprocessenvironment.pro
@@ -1,7 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qprocessenvironment
-
QT = core testlib
-
-SOURCES += tst_qprocessenvironment.cpp
-CONFIG += parallel_test
+SOURCES = tst_qprocessenvironment.cpp
diff --git a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
index 9ed11dfe64..1bb7bd9a90 100644
--- a/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
+++ b/tests/auto/corelib/io/qresourceengine/qresourceengine.pro
@@ -1,12 +1,7 @@
-######################################################################
-# Automatically generated by qmake (2.00a) ma 2. mai 16:14:33 2005
-######################################################################
-
-CONFIG += testcase
+CONFIG += testcase parallel_test
load(resources)
-
-# Input
-SOURCES += tst_qresourceengine.cpp
+QT = core testlib
+SOURCES = tst_qresourceengine.cpp
RESOURCES += testqrc/test.qrc
runtime_resource.target = runtime_resource.rcc
@@ -15,7 +10,6 @@ runtime_resource.commands = $$QMAKE_RCC -root /runtime_resource/ -binary $${runt
QMAKE_EXTRA_TARGETS = runtime_resource
PRE_TARGETDEPS += $${runtime_resource.target}
-QT = core testlib
wince* {
deploy.files += runtime_resource.rcc parentdir.txt
test.files = testqrc/*
@@ -37,6 +31,5 @@ wince* {
DEPLOYMENT += deploy test alias other search1 search2 sub testsub testsub2
DEFINES += SRCDIR=\\\"\\\"
} else {
- DEFINES += SRCDIR=\\\"$$PWD/\\\"
+ DEFINES += SRCDIR=\\\"$$PWD/\\\"
}
-CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qsettings/qsettings.pro b/tests/auto/corelib/io/qsettings/qsettings.pro
index ac85ea8f41..1772f4b65f 100644
--- a/tests/auto/corelib/io/qsettings/qsettings.pro
+++ b/tests/auto/corelib/io/qsettings/qsettings.pro
@@ -1,11 +1,7 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qsettings
-
-QT += core-private testlib
-
-SOURCES += tst_qsettings.cpp
+QT = core-private gui testlib
+SOURCES = tst_qsettings.cpp
RESOURCES += qsettings.qrc
win32-msvc*:LIBS += advapi32.lib
-
-CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qstandardpaths/qstandardpaths.pro b/tests/auto/corelib/io/qstandardpaths/qstandardpaths.pro
index 983f87ac6f..c39204af51 100644
--- a/tests/auto/corelib/io/qstandardpaths/qstandardpaths.pro
+++ b/tests/auto/corelib/io/qstandardpaths/qstandardpaths.pro
@@ -1,8 +1,7 @@
+CONFIG += testcase parallel_test
TARGET = tst_qstandardpaths
-CONFIG += testcase
-SOURCES += tst_qstandardpaths.cpp
QT = core testlib
-CONFIG += parallel_test
+SOURCES = tst_qstandardpaths.cpp
wince* {
DEFINES += SRCDIR=\\\"\\\"
diff --git a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro
index 0c43b9c39c..b9650b8dde 100644
--- a/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro
+++ b/tests/auto/corelib/io/qtemporaryfile/qtemporaryfile.pro
@@ -1,8 +1,5 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qtemporaryfile
-SOURCES += tst_qtemporaryfile.cpp
QT = core testlib
-
+SOURCES = tst_qtemporaryfile.cpp
DEFINES += SRCDIR=\\\"$$PWD/\\\"
-
-CONFIG += parallel_test
diff --git a/tests/auto/corelib/io/qtextstream/test/test.pro b/tests/auto/corelib/io/qtextstream/test/test.pro
index 8a0c9d4fb1..cf53f44833 100644
--- a/tests/auto/corelib/io/qtextstream/test/test.pro
+++ b/tests/auto/corelib/io/qtextstream/test/test.pro
@@ -1,20 +1,17 @@
CONFIG += testcase
-SOURCES += ../tst_qtextstream.cpp
-
TARGET = ../tst_qtextstream
+QT = core network testlib
+SOURCES = ../tst_qtextstream.cpp
+RESOURCES += ../qtextstream.qrc
win32 {
- CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qtextstream
-} else {
- TARGET = ../../release/tst_qtextstream
- }
+ CONFIG(debug, debug|release) {
+ TARGET = ../../debug/tst_qtextstream
+ } else {
+ TARGET = ../../release/tst_qtextstream
+ }
}
-RESOURCES += ../qtextstream.qrc
-
-QT = core network testlib
-
wince* {
addFiles.files = ../rfc3261.txt ../shift-jis.txt ../task113817.txt ../qtextstream.qrc ../tst_qtextstream.cpp
addFiles.path = .
diff --git a/tests/auto/corelib/io/qurl/qurl.pro b/tests/auto/corelib/io/qurl/qurl.pro
index 99aeb56d37..84538c0859 100644
--- a/tests/auto/corelib/io/qurl/qurl.pro
+++ b/tests/auto/corelib/io/qurl/qurl.pro
@@ -1,5 +1,4 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qurl
-SOURCES += tst_qurl.cpp
-QT = core core-private testlib
-CONFIG += parallel_test
+QT = core-private testlib
+SOURCES = tst_qurl.cpp