Tests: Remove Q_WS_QPA, qpa-sections from .profiles.

Compile without -qpa.

- Make Q_WS_QPA-#ifdefed sections the default in the code
- Replace some Q_WS_ by Q_OS_
- Add ### fixme for places that need checking
- Remove qpa conditionals from .pro files.

Change-Id: I6ea930afc0c236cc12a7b7e95f1b8a1c24b3a513
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

5 files changed, 21 insertions, 27 deletions

diff --git a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
index 637ec144d2..560713a064 100644
--- a/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
+++ b/tests/auto/widgets/kernel/qaction/tst_qaction.cpp
@@ -240,13 +240,12 @@ void tst_QAction::setStandardKeys()
     QVERIFY(act.shortcut() == act.shortcuts().first());
 
     QList<QKeySequence> expected;
-#if defined(Q_WS_MAC)
+#if defined(Q_OS_MAC)
     expected  << QKeySequence("CTRL+C");
-#elif defined(Q_WS_WIN) || defined(Q_WS_QWS) || defined(Q_WS_QPA)
-    expected  << QKeySequence("CTRL+C") << QKeySequence("CTRL+INSERT");
 #else
-    expected  << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT");
+    expected  << QKeySequence("CTRL+C") << QKeySequence("CTRL+INSERT");
 #endif
+//  Qt/Embedded on Windows: expected  << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT");
     QVERIFY(act.shortcuts() == expected);
 }
 
diff --git a/tests/auto/widgets/kernel/qsound/qsound.pro b/tests/auto/widgets/kernel/qsound/qsound.pro
index 4142afc88c..8317283d54 100644
--- a/tests/auto/widgets/kernel/qsound/qsound.pro
+++ b/tests/auto/widgets/kernel/qsound/qsound.pro
@@ -1,7 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qsound
 SOURCES += tst_qsound.cpp
-QT += testlib
+QT += testlib widgets
 
 wince* {
     deploy.files += 4.wav
diff --git a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp
index 1b8907b1be..5f1e5fb47c 100644
--- a/tests/auto/widgets/kernel/qsound/tst_qsound.cpp
+++ b/tests/auto/widgets/kernel/qsound/tst_qsound.cpp
@@ -41,7 +41,7 @@
 
 
 #include <QtTest/QtTest>
-#include <QtGui>
+#include <QtWidgets>
 
 class tst_QSound : public QObject
 {
@@ -59,9 +59,7 @@ private slots:
 
 void tst_QSound::checkFinished()
 {
-#if defined(Q_WS_QPA)
     QSKIP("QSound is not implemented on Lighthouse");
-#else
     QSound sound(SRCDIR"4.wav");
     sound.setLoops(3);
     sound.play();
@@ -71,17 +69,14 @@ void tst_QSound::checkFinished()
     QEXPECT_FAIL("", "QSound buggy on embedded (task QTBUG-157)", Abort);
 #endif
     QVERIFY(sound.isFinished() );
-#endif
 }
 
 void tst_QSound::staticPlay()
 {
     QSKIP("Test disabled -- only for manual purposes");
-#if !defined(Q_WS_QPA)
     // Check that you hear sound with static play also.
     QSound::play(SRCDIR"4.wav");
     QTest::qWait(2000);
-#endif
 }
 
 QTEST_MAIN(tst_QSound);
diff --git a/tests/auto/widgets/kernel/qwidget/qwidget.pro b/tests/auto/widgets/kernel/qwidget/qwidget.pro
index e6ec3b92f9..33b95d7d2b 100644
--- a/tests/auto/widgets/kernel/qwidget/qwidget.pro
+++ b/tests/auto/widgets/kernel/qwidget/qwidget.pro
@@ -10,9 +10,10 @@ aix-g++*:QMAKE_CXXFLAGS+=-fpermissive
 
 CONFIG += x11inc
 
-mac:!qpa {
-    LIBS += -framework Security -framework AppKit -framework Carbon
-    OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm
+mac {
+# ### fixme
+# LIBS += -framework Security -framework AppKit -framework Carbon
+# OBJECTIVE_SOURCES += tst_qwidget_mac_helpers.mm
 }
 
 x11 {
diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
index e92389ff62..c508c15a88 100644
--- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
+++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp
@@ -380,7 +380,7 @@ private slots:
 
     void setClearAndResizeMask();
     void maskedUpdate();
-#if defined(Q_WS_X11) || (defined(Q_WS_WIN) && !defined(Q_OS_WINCE_WM)) || defined(Q_WS_QWS) || defined(Q_WS_QPA)
+#if !defined(Q_OS_WINCE_WM)
     void syntheticEnterLeave();
     void taskQTBUG_4055_sendSyntheticEnterLeave();
 #endif
@@ -1931,8 +1931,9 @@ void tst_QWidget::showMaximized()
     layouted.showNormal();
     QVERIFY(!(layouted.windowState() & Qt::WindowMaximized));
 
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_QPA)
-//embedded may choose a different size to fit on the screen.
+    // ### fixme: embedded may choose a different size to fit on the screen.
+    // Check platforms (QTBUG-22326)
+#if 0
     QCOMPARE(layouted.size(), layouted.sizeHint());
 #endif
     layouted.showMaximized();
@@ -2008,8 +2009,8 @@ void tst_QWidget::showFullScreen()
     layouted.showNormal();
     QVERIFY(!(layouted.windowState() & Qt::WindowFullScreen));
 
-#if !defined(Q_WS_QWS) && !defined(Q_OS_WINCE) && !defined(Q_WS_QPA)
-//embedded may choose a different size to fit on the screen.
+    // ### fixme: embedded may choose a different size to fit on the screen. (QTBUG-22326)
+#if 0
     QCOMPARE(layouted.size(), layouted.sizeHint());
 #endif
 
@@ -3278,9 +3279,8 @@ void tst_QWidget::widgetAt()
 #if defined(Q_OS_WINCE)
     QEXPECT_FAIL("", "Windows CE does only support rectangular regions", Continue); //See also task 147191
 #endif
-#if defined(Q_WS_QPA)
-    QEXPECT_FAIL("", "Window mask not implemented on Lighthouse", Continue); 
-#endif
+    /// ### fixme: Check platforms
+    QEXPECT_FAIL("", "Window mask not implemented on Lighthouse QTBUG-22326", Continue);
 
     QTRY_COMPARE(QApplication::widgetAt(100,100)->objectName(), w1->objectName());
     QTRY_COMPARE(QApplication::widgetAt(101,101)->objectName(), w2->objectName());
@@ -3297,9 +3297,8 @@ void tst_QWidget::widgetAt()
 #if defined(Q_OS_WINCE)
     QEXPECT_FAIL("", "Windows CE does only support rectangular regions", Continue); //See also task 147191
 #endif
-#if defined(Q_WS_QPA)
-    QEXPECT_FAIL("", "Window mask not implemented on Lighthouse", Continue); 
-#endif
+    /// ### fixme: Check platforms
+    QEXPECT_FAIL("", "Window mask not implemented on Lighthouse  QTBUG-22326", Continue);
     QTRY_VERIFY(QApplication::widgetAt(100,100) == w1);
     QTRY_VERIFY(QApplication::widgetAt(101,101) == w2);
 
@@ -8632,7 +8631,7 @@ void tst_QWidget::maskedUpdate()
 }
 
 // Windows Mobile has no proper cursor support, so skip this test on that platform.
-#if defined(Q_WS_X11) || (defined(Q_WS_WIN) && !defined(Q_OS_WINCE_WM)) || defined(Q_WS_QWS) || defined(Q_WS_QPA)
+#if !defined(Q_OS_WINCE_WM)
 void tst_QWidget::syntheticEnterLeave()
 {
     class MyWidget : public QWidget
@@ -8737,7 +8736,7 @@ void tst_QWidget::syntheticEnterLeave()
 #endif
 
 // Windows Mobile has no proper cursor support, so skip this test on that platform.
-#if defined(Q_WS_X11) || (defined(Q_WS_WIN) && !defined(Q_OS_WINCE_WM)) || defined(Q_WS_QWS) || defined(Q_WS_QPA)
+#if !defined(Q_OS_WINCE_WM)
 void tst_QWidget::taskQTBUG_4055_sendSyntheticEnterLeave()
 {
     class SELParent : public QWidget