summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2009-04-23 08:46:26 (GMT)
committerSimon Hausmann <simon.hausmann@nokia.com>2009-04-23 08:46:26 (GMT)
commitbe3916b7e4e8007394cbed40484ef6b696e90f2b (patch)
treea66dc85f3900e08a040f0d80eb0e56f43a163efc /src/testlib
parented24cd82444faeeda0a171a9082808ebb667e092 (diff)
parent389c4fdebe681eb3af5a2431c390323f52a03c17 (diff)
downloadQt-be3916b7e4e8007394cbed40484ef6b696e90f2b.zip
Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.tar.gz
Qt-be3916b7e4e8007394cbed40484ef6b696e90f2b.tar.bz2
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts: src/corelib/global/qfeatures.h src/gui/painting/qtransform.cpp util/scripts/make_qfeatures_dot_h
Diffstat (limited to 'src/testlib')
-rw-r--r--src/testlib/qtestcase.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index a9b85e8..936b936 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -1487,7 +1487,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv)
}
#endif
-#if defined(QTEST_NOEXITCODE) || (defined(QT_BUILD_INTERNAL) && !defined(QTEST_FORCE_EXITCODE))
+#if defined(QTEST_NOEXITCODE)
return 0;
#else