From afb80f0cd93fa31b94b22e4d0cedb55af14f2d89 Mon Sep 17 00:00:00 2001
From: Jason McDonald <jason.mcdonald@nokia.com>
Date: Mon, 17 Oct 2011 15:11:12 +1000
Subject: Prefer QSKIP to QTEST_NOOP_MAIN.

Use QSKIP instead of QTEST_NOOP_MAIN so that the user receives a clear
indication that this test isn't testing anything when not built for X11.

Change-Id: I9e9ef8fe738c06eb86f2ce398f6a515bf17e220a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
---
 tests/auto/qx11info/qx11info.pro     |  1 +
 tests/auto/qx11info/tst_qx11info.cpp | 25 +++++++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro
index 05d942adfe..a6c06e6fff 100644
--- a/tests/auto/qx11info/qx11info.pro
+++ b/tests/auto/qx11info/qx11info.pro
@@ -1,4 +1,5 @@
 load(qttest_p4)
+QT += widgets
 SOURCES += tst_qx11info.cpp
 
 
diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp
index d42be420fb..f94c29065c 100644
--- a/tests/auto/qx11info/tst_qx11info.cpp
+++ b/tests/auto/qx11info/tst_qx11info.cpp
@@ -41,9 +41,6 @@
 
 
 #include <QtTest/QtTest>
-
-#ifdef Q_WS_X11
-
 #include <QApplication>
 #include <QX11Info>
 
@@ -51,10 +48,23 @@ class tst_QX11Info : public QObject
 {
     Q_OBJECT
 
+#ifndef Q_WS_X11
+public slots:
+    void initTestCase();
+#else
 private slots:
     void staticFunctionsBeforeQApplication();
+#endif
 };
 
+#ifndef Q_WS_X11
+void tst_QX11Info::initTestCase()
+{
+    QSKIP("This test is only valid for X11", SkipAll);
+}
+
+#else
+
 void tst_QX11Info::staticFunctionsBeforeQApplication()
 {
     QVERIFY(!QApplication::instance());
@@ -111,12 +121,7 @@ void tst_QX11Info::staticFunctionsBeforeQApplication()
     QCOMPARE(appTime, 0ul);
 }
 
-QTEST_APPLESS_MAIN(tst_QX11Info)
+#endif
 
+QTEST_APPLESS_MAIN(tst_QX11Info)
 #include "tst_qx11info.moc"
-
-#else // !Q_WS_X11
-
-QTEST_NOOP_MAIN
-
-#endif
-- 
cgit v1.2.3