diff options
| author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-08-06 13:55:27 +1000 |
|---|---|---|
| committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2009-08-06 13:55:27 +1000 |
| commit | 06d57fc65c47d12047e985202ae1e394c48f78ca (patch) | |
| tree | a897a8f91ad5e919e7cc66671b60d83248c96e72 /tests/auto/qcopchannel | |
| parent | 31fa1d0f6144e7e92748b33f8633eeb2f52483a1 (diff) | |
| parent | 56b349951a70f3ab95e334e41e37f017e91cf481 (diff) | |
Merge commit 'origin/4.5'
Conflicts:
src/gui/dialogs/qfiledialog.cpp
src/gui/dialogs/qfiledialog_win.cpp
tests/auto/qicoimageformat/tst_qicoimageformat.cpp
tests/auto/qscriptqobject/qscriptqobject.pro
Diffstat (limited to 'tests/auto/qcopchannel')
| -rw-r--r-- | tests/auto/qcopchannel/qcopchannel.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qcopchannel/test/test.pro | 8 | ||||
| -rw-r--r-- | tests/auto/qcopchannel/testSend/testSend.pro | 1 |
3 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/qcopchannel/qcopchannel.pro b/tests/auto/qcopchannel/qcopchannel.pro index 29f78349a2..427430f620 100644 --- a/tests/auto/qcopchannel/qcopchannel.pro +++ b/tests/auto/qcopchannel/qcopchannel.pro @@ -3,4 +3,5 @@ SUBDIRS = testSend SUBDIRS += test +requires(embedded) diff --git a/tests/auto/qcopchannel/test/test.pro b/tests/auto/qcopchannel/test/test.pro index 48a218ee0f..8c7cc5baaa 100644 --- a/tests/auto/qcopchannel/test/test.pro +++ b/tests/auto/qcopchannel/test/test.pro @@ -3,12 +3,4 @@ load(qttest_p4) SOURCES += ../tst_qcopchannel.cpp TARGET = ../tst_qcopchannel -win32 { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qcopchannel -} else { - TARGET = ../../release/tst_qcopchannel - } -} - diff --git a/tests/auto/qcopchannel/testSend/testSend.pro b/tests/auto/qcopchannel/testSend/testSend.pro index f78341c526..ebce3ddb4e 100644 --- a/tests/auto/qcopchannel/testSend/testSend.pro +++ b/tests/auto/qcopchannel/testSend/testSend.pro @@ -2,4 +2,5 @@ load(qttest_p4) SOURCES = main.cpp TARGET = testSend +requires(embedded) |