Examples, plugins: Remove remains of qpa in profiles.

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

diff --git a/examples/examples.pro b/examples/examples.pro
index 763ff4e..2e2f606 100644 (file)
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,11 +1,10 @@
-Qt += widgets
-
 TEMPLATE      = subdirs
 SUBDIRS       = \
                 network \
                 statemachine \
                 threads \
-                xml
+                xml \
+                qpa
 
 !contains(QT_CONFIG, no-gui) {
     SUBDIRS  += \
@@ -30,9 +29,6 @@ SUBDIRS       = \
                 touch \
                 gestures
 }
-
-qpa:SUBDIRS += qpa
-
 wince*|embedded|x11:!contains(QT_CONFIG, no-gui): SUBDIRS += embedded
 
 embedded:SUBDIRS += qws
@@ -46,5 +42,3 @@ contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent
 sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]
 INSTALLS += sources
-
-QT += widgets

diff --git a/examples/mainwindows/mainwindows.pro b/examples/mainwindows/mainwindows.pro
index cf8f4b6..3b81180 100644 (file)
--- a/examples/mainwindows/mainwindows.pro
+++ b/examples/mainwindows/mainwindows.pro
@@ -6,8 +6,8 @@ SUBDIRS       = application \
                 menus \
                 recentfiles \
                 sdi
-
-mac* && !qpa: SUBDIRS += macmainwindow
+# ### fixme
+# mac* && !qpa: SUBDIRS += macmainwindow
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows

diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro
index a5d5dbc..5b20a62 100644 (file)
--- a/examples/opengl/opengl.pro
+++ b/examples/opengl/opengl.pro
@@ -22,10 +22,8 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){
                 textures
 }
 
-qpa {
-    SUBDIRS += hellowindow
-    SUBDIRS += paintedwindow
-}
+SUBDIRS += hellowindow \
+           paintedwindow
 
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/opengl

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 19fa871..fd9c375 100644 (file)
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -10,8 +10,4 @@ unix:!symbian {
 !symbian:!contains(QT_CONFIG, no-gui):SUBDIRS += accessible
 
 symbian:SUBDIRS += s60
-qpa: {
-    SUBDIRS += platforms
-    SUBDIRS += platforminputcontexts
-    SUBDIRS += printsupport
-}
+SUBDIRS += platforms platforminputcontexts printsupport