summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/src/snippets/code/src_qtestlib_qtestcase.cpp10
-rw-r--r--src/testlib/qtest.h7
-rw-r--r--src/testlib/qtestcase.cpp13
3 files changed, 0 insertions, 30 deletions
diff --git a/doc/src/snippets/code/src_qtestlib_qtestcase.cpp b/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
index 986026f089..5b1f558610 100644
--- a/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
+++ b/doc/src/snippets/code/src_qtestlib_qtestcase.cpp
@@ -123,16 +123,6 @@ QTEST_MAIN(TestQString)
//! [11]
-//! [12]
-#ifdef Q_WS_X11
- QTEST_MAIN(MyX11Test)
-#else
- // do nothing on non-X11 platforms
- QTEST_NOOP_MAIN
-#endif
-//! [12]
-
-
//! [13]
QTest::keyClick(myWidget, 'a');
//! [13]
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 66e747a2ac..35ab5a31e8 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -238,13 +238,6 @@ int main(int argc, char *argv[]) \
return QTest::qExec(&tc, argc, argv); \
}
-#define QTEST_NOOP_MAIN \
-int main(int argc, char *argv[]) \
-{ \
- QObject tc; \
- return QTest::qExec(&tc, argc, argv); \
-}
-
#include <QtTest/qtestsystem.h>
#if defined(QT_WIDGETS_LIB)
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp
index 41bdd9b62a..c579e0f11f 100644
--- a/src/testlib/qtestcase.cpp
+++ b/src/testlib/qtestcase.cpp
@@ -326,19 +326,6 @@ QT_BEGIN_NAMESPACE
\sa QTEST_MAIN()
*/
-/*! \macro QTEST_NOOP_MAIN()
-
- \relates QTest
-
- Implements a main() function with a test class that does absolutely nothing.
- Use this macro to create a test that produces valid test output but just
- doesn't execute any test, for example in conditional compilations:
-
- \snippet doc/src/snippets/code/src_qtestlib_qtestcase.cpp 12
-
- \sa QTEST_MAIN()
-*/
-
/*! \macro QTEST_GUILESS_MAIN(TestClass)
\relates QTest