diff options
| author | kh <qtc-committer@nokia.com> | 2009-04-23 13:16:04 (GMT) |
|---|---|---|
| committer | kh <qtc-committer@nokia.com> | 2009-04-23 13:16:04 (GMT) |
| commit | d913582c270f9f1039a3a788980360aadf39b286 (patch) | |
| tree | 367b3c0beba61f9179cdf814fd17d116ac68bb5a | |
| parent | 6d0bdd9a3130985451c61d8caa53148c10263059 (diff) | |
| parent | 7fec4bb21bc78760bd1603efb1b62453ac743e01 (diff) | |
| download | Qt-d913582c270f9f1039a3a788980360aadf39b286.zip Qt-d913582c270f9f1039a3a788980360aadf39b286.tar.gz Qt-d913582c270f9f1039a3a788980360aadf39b286.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | tests/auto/qlocalsocket/test/test.pro | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qlocalsocket/test/test.pro b/tests/auto/qlocalsocket/test/test.pro index 8ce7c50..7befdf9 100644 --- a/tests/auto/qlocalsocket/test/test.pro +++ b/tests/auto/qlocalsocket/test/test.pro @@ -1,7 +1,5 @@ load(qttest_p4) -include(../src/src.pri) - DEFINES += QLOCALSERVER_DEBUG DEFINES += QLOCALSOCKET_DEBUG !wince*: { @@ -14,14 +12,16 @@ DEFINES += QLOCALSOCKET_DEBUG QT = core network SOURCES += ../tst_qlocalsocket.cpp -TARGET = ../tst_qlocalsocket -win32 { +TARGET = tst_qlocalsocket +CONFIG(debug_and_release) { CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qlocalsocket -} else { - TARGET = ../../release/tst_qlocalsocket + DESTDIR = ../debug + } else { + DESTDIR = ../release } +} else { + DESTDIR = .. } wince* { |