diff options
-rw-r--r-- | tests/auto/qbytearray/qbytearray.pro | 2 | ||||
-rw-r--r-- | tests/auto/qchar/qchar.pro | 2 | ||||
-rw-r--r-- | tests/auto/qelapsedtimer/qelapsedtimer.pro | 2 | ||||
-rw-r--r-- | tests/auto/qfileinfo/qfileinfo.pro | 2 | ||||
-rw-r--r-- | tests/auto/qresourceengine/qresourceengine.pro | 2 | ||||
-rw-r--r-- | tests/auto/qsharedpointer/qsharedpointer.pro | 4 | ||||
-rw-r--r-- | tests/auto/qtemporaryfile/qtemporaryfile.pro | 4 | ||||
-rw-r--r-- | tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro | 4 |
8 files changed, 3 insertions, 19 deletions
diff --git a/tests/auto/qbytearray/qbytearray.pro b/tests/auto/qbytearray/qbytearray.pro index b954ca0..f195dc8 100644 --- a/tests/auto/qbytearray/qbytearray.pro +++ b/tests/auto/qbytearray/qbytearray.pro @@ -14,8 +14,6 @@ wince* { DEFINES += SRCDIR=\\\"./\\\" } else:symbian { TARGET.EPOCHEAPSIZE="0x100 0x800000" -} else:integrity { - DEFINES += SRCDIR=\"/\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qchar/qchar.pro b/tests/auto/qchar/qchar.pro index ef2dc9e..f8ba1a6 100644 --- a/tests/auto/qchar/qchar.pro +++ b/tests/auto/qchar/qchar.pro @@ -13,8 +13,6 @@ wince*: { DEFINES += SRCDIR=\\\"\\\" } else:symbian: { DEFINES += SRCDIR="" -} else:integrity { - DEFINES += SRCDIR=\"/\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qelapsedtimer/qelapsedtimer.pro b/tests/auto/qelapsedtimer/qelapsedtimer.pro index 1d74fc5..8768876 100644 --- a/tests/auto/qelapsedtimer/qelapsedtimer.pro +++ b/tests/auto/qelapsedtimer/qelapsedtimer.pro @@ -7,8 +7,6 @@ wince* { } else:symbian { # do not define SRCDIR at all TARGET.EPOCHEAPSIZE = 0x100000 0x3000000 -} else:integrity { - DEFINES += SRCDIR=\"/\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qfileinfo/qfileinfo.pro b/tests/auto/qfileinfo/qfileinfo.pro index a7f7280..e60b4d9 100644 --- a/tests/auto/qfileinfo/qfileinfo.pro +++ b/tests/auto/qfileinfo/qfileinfo.pro @@ -26,8 +26,6 @@ wince* { DEFINES += SRCDIR=\\\"\\\" } else:symbian { # do not define SRCDIR at all -} else:integrity { - DEFINES += SRCDIR=\"/\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qresourceengine/qresourceengine.pro b/tests/auto/qresourceengine/qresourceengine.pro index 6359549..9ca6994 100644 --- a/tests/auto/qresourceengine/qresourceengine.pro +++ b/tests/auto/qresourceengine/qresourceengine.pro @@ -40,8 +40,6 @@ wince*|symbian:{ testsub2.path = testqrc/test/test DEPLOYMENT += deploy test alias other search1 search2 sub testsub testsub2 !symbian:DEFINES += SRCDIR=\\\"\\\" -} else:integrity { - DEFINES += SRCDIR=\"/\" } else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qsharedpointer/qsharedpointer.pro b/tests/auto/qsharedpointer/qsharedpointer.pro index 0542d6b..0497c29 100644 --- a/tests/auto/qsharedpointer/qsharedpointer.pro +++ b/tests/auto/qsharedpointer/qsharedpointer.pro @@ -10,9 +10,7 @@ HEADERS += forwarddeclared.h \ QT = core -integrity { - DEFINES += SRCDIR=\"/\" -} else:!symbian { +!symbian { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qtemporaryfile/qtemporaryfile.pro b/tests/auto/qtemporaryfile/qtemporaryfile.pro index 4cbc76d..a3c4421 100644 --- a/tests/auto/qtemporaryfile/qtemporaryfile.pro +++ b/tests/auto/qtemporaryfile/qtemporaryfile.pro @@ -7,9 +7,7 @@ symbian { testData.files = tst_qtemporaryfile.cpp testData.path = . DEPLOYMENT += testData -} else:integrity { - DEFINES += SRCDIR=\"/\" -}else { +} else { DEFINES += SRCDIR=\\\"$$PWD/\\\" } diff --git a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro index c52ca52..ba0084a 100644 --- a/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro +++ b/tests/auto/qtextboundaryfinder/qtextboundaryfinder.pro @@ -2,9 +2,7 @@ load(qttest_p4) QT = core HEADERS += SOURCES += tst_qtextboundaryfinder.cpp -integrity { - DEFINES += SRCDIR=\"/\" -} else:!symbian { +!symbian { DEFINES += SRCDIR=\\\"$$PWD/\\\" } |