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>

3 files changed, 4 insertions, 3 deletions

diff --git a/tests/auto/integrationtests/integrationtests.pro b/tests/auto/integrationtests/integrationtests.pro
index 1d58f2c665..33d54e22e9 100644
--- a/tests/auto/integrationtests/integrationtests.pro
+++ b/tests/auto/integrationtests/integrationtests.pro
@@ -22,10 +22,10 @@ SUBDIRS=\
 
 wince*|!contains(QT_CONFIG, accessibility):SUBDIRS -= qaccessibility
 
-!mac|qpa: SUBDIRS -= \
+!mac: SUBDIRS -= \
            macgui \
            macnativeevents \
-           macplist \
+           macplist
 
 !embedded|wince*: SUBDIRS -= \
            qdirectpainter \
diff --git a/tests/auto/integrationtests/macplist/app/app.pro b/tests/auto/integrationtests/macplist/app/app.pro
index c1cf52e0ef..b4b895197c 100644
--- a/tests/auto/integrationtests/macplist/app/app.pro
+++ b/tests/auto/integrationtests/macplist/app/app.pro
@@ -9,3 +9,4 @@ INCLUDEPATH += .
 
 # Input
 SOURCES += main.cpp
+QT += widgets
diff --git a/tests/auto/integrationtests/macplist/app/main.cpp b/tests/auto/integrationtests/macplist/app/main.cpp
index ddc47a9a5f..90bf60ae38 100644
--- a/tests/auto/integrationtests/macplist/app/main.cpp
+++ b/tests/auto/integrationtests/macplist/app/main.cpp
@@ -40,7 +40,7 @@
 ****************************************************************************/
 
 
-#include <QtGui/QApplication>
+#include <QtWidgets/QApplication>
 
 int main(int argc, char **argv)
 {