summaryrefslogtreecommitdiffstats
path: root/tests/auto/qdirectpainter
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2009-08-06 03:55:27 (GMT)
committerRohan McGovern <rohan.mcgovern@nokia.com>2009-08-06 03:55:27 (GMT)
commit06d57fc65c47d12047e985202ae1e394c48f78ca (patch)
treea897a8f91ad5e919e7cc66671b60d83248c96e72 /tests/auto/qdirectpainter
parent31fa1d0f6144e7e92748b33f8633eeb2f52483a1 (diff)
parent56b349951a70f3ab95e334e41e37f017e91cf481 (diff)
downloadQt-06d57fc65c47d12047e985202ae1e394c48f78ca.zip
Qt-06d57fc65c47d12047e985202ae1e394c48f78ca.tar.gz
Qt-06d57fc65c47d12047e985202ae1e394c48f78ca.tar.bz2
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/qdirectpainter')
-rw-r--r--tests/auto/qdirectpainter/qdirectpainter.pro4
-rw-r--r--tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro1
-rw-r--r--tests/auto/qdirectpainter/test/test.pro9
3 files changed, 3 insertions, 11 deletions
diff --git a/tests/auto/qdirectpainter/qdirectpainter.pro b/tests/auto/qdirectpainter/qdirectpainter.pro
index 8967194..e86b342 100644
--- a/tests/auto/qdirectpainter/qdirectpainter.pro
+++ b/tests/auto/qdirectpainter/qdirectpainter.pro
@@ -1,7 +1,5 @@
-load(qttest_p4)
-SOURCES += tst_qdirectpainter.cpp
-
TEMPLATE = subdirs
SUBDIRS = test runDirectPainter
+requires(embedded)
diff --git a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
index 9e5131c..09524e9 100644
--- a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
+++ b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro
@@ -2,4 +2,5 @@ load(qttest_p4)
SOURCES = main.cpp
TARGET = runDirectPainter
+requires(embedded)
diff --git a/tests/auto/qdirectpainter/test/test.pro b/tests/auto/qdirectpainter/test/test.pro
index 98c74e4..6d820b1 100644
--- a/tests/auto/qdirectpainter/test/test.pro
+++ b/tests/auto/qdirectpainter/test/test.pro
@@ -3,12 +3,5 @@ load(qttest_p4)
SOURCES += ../tst_qdirectpainter.cpp
TARGET = ../tst_qdirectpainter
-win32 {
- CONFIG(debug, debug|release) {
- TARGET = ../../debug/tst_qdirectpainter
-} else {
- TARGET = ../../release/tst_qdirectpainter
- }
-}
-
+requires(embedded)