Modularize configure.json/.pri

Move the different parts of configure.json/.pri into the libraries where
they belong.

Gui is not yet fully modularized, and contains many things related to
the different QPA plugins.

Done-with: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Change-Id: I6659bb29354ed1f36b95b8c69e7fce58f642053f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

12 files changed, 13 insertions, 2 deletions

diff --git a/src/plugins/bearer/bearer.pro b/src/plugins/bearer/bearer.pro
index 8078a5708c..b362722b28 100644
--- a/src/plugins/bearer/bearer.pro
+++ b/src/plugins/bearer/bearer.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += network-private
 
 !android:linux*:qtHaveModule(dbus) {
     SUBDIRS += generic
diff --git a/src/plugins/generic/generic.pro b/src/plugins/generic/generic.pro
index c0a81d4dc8..69e832906b 100644
--- a/src/plugins/generic/generic.pro
+++ b/src/plugins/generic/generic.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += gui-private
 
 load(qfeatures)
 
diff --git a/src/plugins/imageformats/imageformats.pro b/src/plugins/imageformats/imageformats.pro
index d2588c1b18..9d1c0c8fdf 100644
--- a/src/plugins/imageformats/imageformats.pro
+++ b/src/plugins/imageformats/imageformats.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += gui-private
 
 qtConfig(ico): SUBDIRS += ico
 qtConfig(jpeg): SUBDIRS += jpeg
diff --git a/src/plugins/platforminputcontexts/platforminputcontexts.pro b/src/plugins/platforminputcontexts/platforminputcontexts.pro
index f22b8b69db..ed6b1b8702 100644
--- a/src/plugins/platforminputcontexts/platforminputcontexts.pro
+++ b/src/plugins/platforminputcontexts/platforminputcontexts.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += gui-private
 
 qtHaveModule(dbus) {
 !mac:!win32:SUBDIRS += ibus
diff --git a/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro b/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro
index b46b04d149..d86a67b4f4 100644
--- a/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro
+++ b/src/plugins/platforms/eglfs/deviceintegration/deviceintegration.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += gui-private
 
 qtConfig(egl_x11): SUBDIRS += eglfs_x11
 qtConfig(eglfs_gbm): SUBDIRS += eglfs_kms_support eglfs_kms
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index fcfebf6e94..938e63d95a 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += gui-private
 
 android: SUBDIRS += android
 
diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro b/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro
index 0cdee03f62..b8f878ffe8 100644
--- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro
+++ b/src/plugins/platforms/xcb/gl_integrations/gl_integrations.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += gui-private
 
 qtConfig(egl):qtConfig(egl_x11):qtConfig(opengl) {
     SUBDIRS += xcb_egl
diff --git a/src/plugins/platforms/xcb/qxcbconnection.h b/src/plugins/platforms/xcb/qxcbconnection.h
index 6ad8a36460..f6ba828a15 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.h
+++ b/src/plugins/platforms/xcb/qxcbconnection.h
@@ -43,6 +43,7 @@
 #include <xcb/xcb.h>
 #include <xcb/randr.h>
 
+#include <QtGui/private/qtguiglobal_p.h>
 #include "qxcbexport.h"
 #include <QHash>
 #include <QList>
diff --git a/src/plugins/platforms/xcb/xcb.pro b/src/plugins/platforms/xcb/xcb.pro
index 7840a4583f..0d27645a60 100644
--- a/src/plugins/platforms/xcb/xcb.pro
+++ b/src/plugins/platforms/xcb/xcb.pro
@@ -1,5 +1,6 @@
 TEMPLATE = subdirs
 CONFIG += ordered
+QT_FOR_CONFIG += gui-private
 
 !qtConfig(system-xcb): SUBDIRS += xcb-static
 
diff --git a/src/plugins/platformthemes/platformthemes.pro b/src/plugins/platformthemes/platformthemes.pro
index 166b39ce8c..0e2812bed3 100644
--- a/src/plugins/platformthemes/platformthemes.pro
+++ b/src/plugins/platformthemes/platformthemes.pro
@@ -1,3 +1,4 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += widgets-private
 
-qtConfig(gtk3): SUBDIRS += gtk3
+qtHaveModule(widgets):qtConfig(gtk3): SUBDIRS += gtk3
diff --git a/src/plugins/printsupport/printsupport.pro b/src/plugins/printsupport/printsupport.pro
index 55feaba40c..05cf1bc0b2 100644
--- a/src/plugins/printsupport/printsupport.pro
+++ b/src/plugins/printsupport/printsupport.pro
@@ -1,5 +1,5 @@
-QT += printsupport
 TEMPLATE = subdirs
+QT_FOR_CONFIG += printsupport-private
 
 osx:   SUBDIRS += cocoa
 win32: SUBDIRS += windows
diff --git a/src/plugins/sqldrivers/sqldrivers.pro b/src/plugins/sqldrivers/sqldrivers.pro
index afd2008826..30fb6019ce 100644
--- a/src/plugins/sqldrivers/sqldrivers.pro
+++ b/src/plugins/sqldrivers/sqldrivers.pro
@@ -1,4 +1,5 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += sql
 
 qtConfig(sql-psql)     : SUBDIRS += psql
 qtConfig(sql-mysql)    : SUBDIRS += mysql