Don't depend on moc to disable test functions.

The moc tool is not aware of all defines (particularly those that are
compiler builtins) and does not correctly evaluate others that depend
on compiler builtins, such as Q_OS_FOO.

This commit reverts parts of the following commits, but is not a
complete fix as there were many instances of this problem in the tests
prior to those commits:
    924d810dbdcd5b5b0fa860922b2487ea9062d002
    8aaff6751038b88d17e23be6fcee945771297c5b
    338d3f11973412047c2c9cd41cbd0c961d738ef3
    a55034062ba2bf73a9f1ed3d9cf31745b38149e3
    253497b7446c7d723aa3bdd7152e25d6852f2604
    7cfad460c56319ba89c4a3a0bbcb2e54ab1cdbc6
    9d2ff58f3642828e494e7e9b2df7dbb8e2cd408f
    0cf6baa2d61ebaad2a2a0530c37f27e719b68f4b

Change-Id: I947d797fe3ec76139ba1b55561cea569895662c5
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

3 files changed, 17 insertions, 22 deletions

diff --git a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
index 00fc1bd1df..65900a4bed 100644
--- a/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
+++ b/tests/auto/widgets/itemviews/qdirmodel/tst_qdirmodel.cpp
@@ -54,14 +54,10 @@ class tst_QDirModel : public QObject
     Q_OBJECT
 public slots:
     void cleanupTestCase();
-#ifdef Q_OS_UNIX
     void init();
-#endif
 private slots:
     void getSetCheck();
-#ifdef Q_OS_UNIX
     void unreadable();
-#endif
     /*
     void construct();
     void rowCount();
@@ -87,9 +83,7 @@ private slots:
 
     void filePath();
 
-#ifdef Q_OS_UNIX
     void hidden();
-#endif
 
     void fileName();
     void fileName_data();
@@ -140,9 +134,9 @@ void tst_QDirModel::cleanupTestCase()
     current.rmdir(".qtest_hidden");
 }
 
-#ifdef Q_OS_UNIX
 void tst_QDirModel::init()
 {
+#ifdef Q_OS_UNIX
     if (QTest::currentTestFunction() == QLatin1String( "unreadable" )) {
         // Make sure that the unreadable file created by the unreadable()
         // test function doesn't already exist.
@@ -152,8 +146,8 @@ void tst_QDirModel::init()
             QVERIFY(!unreadableFile.exists());
         }
     }
-}
 #endif
+}
 
 /*
   tests
@@ -502,9 +496,11 @@ void tst_QDirModel::rowsAboutToBeRemoved()
     QVERIFY(rowsAboutToBeRemoved_cleanup(test_path));
 }
 
-#ifdef Q_OS_UNIX
 void tst_QDirModel::hidden()
 {
+#ifndef Q_OS_UNIX
+    QSKIP("Test not implemented on non-Unixes");
+#else
     QDir current;
     current.mkdir(".qtest_hidden");
 
@@ -520,8 +516,8 @@ void tst_QDirModel::hidden()
     model2.setFilter(model2.filter() | QDir::Hidden);
     index = model2.index(QDir::currentPath() + "/.qtest_hidden");
     QVERIFY(index.isValid());
-}
 #endif
+}
 
 void tst_QDirModel::fileName_data()
 {
@@ -543,9 +539,11 @@ void tst_QDirModel::fileName()
     QCOMPARE(model.fileName(model.index(path)), result);
 }
 
-#ifdef Q_OS_UNIX
 void tst_QDirModel::unreadable()
 {
+#ifndef Q_OS_UNIX
+    QSKIP("Test not implemented on non-Unixes");
+#else
     // Create an empty file which has no read permissions (file will be removed by cleanup()).
     QFile unreadableFile(QDir::currentPath() + "qtest_unreadable");
     QVERIFY2(unreadableFile.open(QIODevice::WriteOnly | QIODevice::Text), qPrintable(unreadableFile.errorString()));
@@ -563,8 +561,8 @@ void tst_QDirModel::unreadable()
     model2.setFilter(model2.filter() | QDir::Hidden);
     index = model2.index(QDir::currentPath() + "/qtest_unreadable");
     QVERIFY(!index.isValid());
-}
 #endif
+}
 
 void tst_QDirModel::filePath()
 {
diff --git a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
index b58a306f94..cb582be3c2 100644
--- a/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
+++ b/tests/auto/widgets/itemviews/qlistview/tst_qlistview.cpp
@@ -112,9 +112,7 @@ private slots:
     void scrollBarAsNeeded();
     void moveItems();
     void wordWrap();
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && WINVER >= 0x0500
     void setCurrentIndexAfterAppendRowCrash();
-#endif
     void emptyItemSize();
     void task203585_selectAll();
     void task228566_infiniteRelayout();
@@ -1496,14 +1494,15 @@ private:
 };
 #endif
 
-// This test only makes sense on Windows 2000 and higher.
-#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && WINVER >= 0x0500
 void tst_QListView::setCurrentIndexAfterAppendRowCrash()
 {
+#if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) && WINVER >= 0x0500
     SetCurrentIndexAfterAppendRowCrashDialog w;
     w.exec();
-}
+#else
+    QSKIP("This test only makes sense on windows 2000 and higher.");
 #endif
+}
 
 void tst_QListView::emptyItemSize()
 {
diff --git a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
index de76768d24..47e6d861b7 100644
--- a/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
+++ b/tests/auto/widgets/itemviews/qtableview/tst_qtableview.cpp
@@ -204,10 +204,8 @@ private slots:
     void taskQTBUG_8777_scrollToSpans();
     void taskQTBUG_10169_sizeHintForRow();
 
-#ifndef Q_OS_WINCE
     void mouseWheel_data();
     void mouseWheel();
-#endif
 
     void addColumnWhileEditing();
     void task234926_setHeaderSorting();
@@ -3638,8 +3636,6 @@ void tst_QTableView::task248688_autoScrollNavigation()
 }
 
 
-// Since different Windows CE versions sport different taskbars, we skip this test.
-#ifndef Q_OS_WINCE
 void tst_QTableView::mouseWheel_data()
 {
     QTest::addColumn<int>("scrollMode");
@@ -3660,6 +3656,9 @@ void tst_QTableView::mouseWheel_data()
 
 void tst_QTableView::mouseWheel()
 {
+#ifdef Q_OS_WINCE
+    QSKIP("Since different Windows CE versions sport different taskbars, we skip this test");
+#endif
 
     QFETCH(int, scrollMode);
     QFETCH(int, delta);
@@ -3693,7 +3692,6 @@ void tst_QTableView::mouseWheel()
     QApplication::sendEvent(view.viewport(), &verticalEvent);
     QVERIFY(qAbs(view.verticalScrollBar()->value() - verticalPosition) < 10);
 }
-#endif
 
 void tst_QTableView::addColumnWhileEditing()
 {