summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-08-06 09:10:00 (GMT)
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2009-08-06 09:10:00 (GMT)
commit190e9803165b3d3d076cc02b8861cff96f3e11d0 (patch)
treebfebcc32a00ed6efbc21db19a33959605684b272
parentf5979a98bab248ce07567e72258257f78424e835 (diff)
downloadQt-190e9803165b3d3d076cc02b8861cff96f3e11d0.zip
Qt-190e9803165b3d3d076cc02b8861cff96f3e11d0.tar.gz
Qt-190e9803165b3d3d076cc02b8861cff96f3e11d0.tar.bz2
Tests: Make tools tests (rcc/moc/uic/uic3) run without X11-connection.
-rw-r--r--tests/auto/moc/tst_moc.cpp2
-rw-r--r--tests/auto/rcc/tst_rcc.cpp2
-rw-r--r--tests/auto/uic/tst_uic.cpp2
-rw-r--r--tests/auto/uic3/tst_uic3.cpp2
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/moc/tst_moc.cpp b/tests/auto/moc/tst_moc.cpp
index 3a40ae0..3ead204 100644
--- a/tests/auto/moc/tst_moc.cpp
+++ b/tests/auto/moc/tst_moc.cpp
@@ -1180,7 +1180,7 @@ void tst_Moc::typenameWithUnsigned()
QVERIFY(mobj->indexOfSlot("l(unsignedQImage)") != -1);
}
-QTEST_MAIN(tst_Moc)
+QTEST_APPLESS_MAIN(tst_Moc)
#include "tst_moc.moc"
diff --git a/tests/auto/rcc/tst_rcc.cpp b/tests/auto/rcc/tst_rcc.cpp
index dcdf1b6..e4255a3 100644
--- a/tests/auto/rcc/tst_rcc.cpp
+++ b/tests/auto/rcc/tst_rcc.cpp
@@ -157,6 +157,6 @@ void tst_rcc::rcc()
-QTEST_MAIN(tst_rcc)
+QTEST_APPLESS_MAIN(tst_rcc)
#include "tst_rcc.moc"
diff --git a/tests/auto/uic/tst_uic.cpp b/tests/auto/uic/tst_uic.cpp
index 6f91ab3..b605aa9 100644
--- a/tests/auto/uic/tst_uic.cpp
+++ b/tests/auto/uic/tst_uic.cpp
@@ -218,7 +218,7 @@ QString tst_uic::workingDir() const
return QDir::cleanPath(SRCDIR);
}
-QTEST_MAIN(tst_uic)
+QTEST_APPLESS_MAIN(tst_uic)
#include "tst_uic.moc"
#else
QTEST_NOOP_MAIN
diff --git a/tests/auto/uic3/tst_uic3.cpp b/tests/auto/uic3/tst_uic3.cpp
index 67011fa..cc5a66f 100644
--- a/tests/auto/uic3/tst_uic3.cpp
+++ b/tests/auto/uic3/tst_uic3.cpp
@@ -183,7 +183,7 @@ QString tst_uic3::workingDir() const
return QDir::cleanPath(SRCDIR);
}
-QTEST_MAIN(tst_uic3)
+QTEST_APPLESS_MAIN(tst_uic3)
#include "tst_uic3.moc"
#else
QTEST_NOOP_MAIN