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>

11 files changed, 15 insertions, 3 deletions

diff --git a/tests/auto/corelib/json/json.pro b/tests/auto/corelib/json/json.pro
index dc9cd3e383..16c2ae2fb7 100644
--- a/tests/auto/corelib/json/json.pro
+++ b/tests/auto/corelib/json/json.pro
@@ -1,5 +1,5 @@
 TARGET = tst_json
-QT = core testlib
+QT = core-private testlib
 CONFIG -= app_bundle
 CONFIG += testcase
 
diff --git a/tests/auto/corelib/tools/qcollator/qcollator.pro b/tests/auto/corelib/tools/qcollator/qcollator.pro
index 7725194e3d..2f3995a75f 100644
--- a/tests/auto/corelib/tools/qcollator/qcollator.pro
+++ b/tests/auto/corelib/tools/qcollator/qcollator.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qcollator
-QT = core testlib
+QT = core-private testlib
 SOURCES = tst_qcollator.cpp
 DEFINES += QT_NO_CAST_TO_ASCII
 qtConfig(icu): DEFINES += QT_USE_ICU
diff --git a/tests/auto/corelib/tools/qstring/qstring.pro b/tests/auto/corelib/tools/qstring/qstring.pro
index a94ad3405a..ec8a9b5df5 100644
--- a/tests/auto/corelib/tools/qstring/qstring.pro
+++ b/tests/auto/corelib/tools/qstring/qstring.pro
@@ -1,6 +1,6 @@
 CONFIG += testcase
 TARGET = tst_qstring
-QT = core testlib
+QT = core-private testlib
 SOURCES = tst_qstring.cpp
 DEFINES += QT_NO_CAST_TO_ASCII
 qtConfig(icu): DEFINES += QT_USE_ICU
diff --git a/tests/auto/gui/image/qmovie/qmovie.pro b/tests/auto/gui/image/qmovie/qmovie.pro
index 6a7e23be99..1de428a685 100644
--- a/tests/auto/gui/image/qmovie/qmovie.pro
+++ b/tests/auto/gui/image/qmovie/qmovie.pro
@@ -1,6 +1,7 @@
 CONFIG += testcase
 TARGET = tst_qmovie
 QT += testlib
+QT_FOR_CONFIG += gui-private
 qtHaveModule(widgets): QT += widgets
 SOURCES += tst_qmovie.cpp
 MOC_DIR=tmp
diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro
index 47e7f5ed15..45a5734305 100644
--- a/tests/auto/network/access/qnetworkreply/test/test.pro
+++ b/tests/auto/network/access/qnetworkreply/test/test.pro
@@ -5,6 +5,7 @@ SOURCES  += ../tst_qnetworkreply.cpp
 TARGET = ../tst_qnetworkreply
 
 QT = core-private network-private testlib
+QT_FOR_CONFIG += gui-private
 RESOURCES += ../qnetworkreply.qrc
 
 TESTDATA += ../empty ../rfc3252.txt ../resource ../bigfile ../*.jpg ../certs \
diff --git a/tests/auto/network/socket/socket.pro b/tests/auto/network/socket/socket.pro
index 307f7e92de..06fe356a5a 100644
--- a/tests/auto/network/socket/socket.pro
+++ b/tests/auto/network/socket/socket.pro
@@ -1,4 +1,6 @@
 TEMPLATE=subdirs
+QT_FOR_CONFIG += network
+
 SUBDIRS=\
    qhttpsocketengine \
    qudpsocket \
diff --git a/tests/auto/network/ssl/ssl.pro b/tests/auto/network/ssl/ssl.pro
index 65e35ea4c0..ec74748f5b 100644
--- a/tests/auto/network/ssl/ssl.pro
+++ b/tests/auto/network/ssl/ssl.pro
@@ -1,4 +1,6 @@
 TEMPLATE=subdirs
+QT_FOR_CONFIG += network
+
 SUBDIRS=\
    qsslcertificate \
    qsslcipher \
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index 94b5847b2e..0babac4b6f 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -1,4 +1,6 @@
 TEMPLATE=subdirs
+QT_FOR_CONFIG += gui-private
+
 SUBDIRS=\
    # atwrapper \ # QTBUG-19452
    compiler \
diff --git a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro
index 828f36348d..e152ac8200 100644
--- a/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro
+++ b/tests/benchmarks/gui/image/qimageconversion/qimageconversion.pro
@@ -1,6 +1,7 @@
 TEMPLATE = app
 TARGET = tst_bench_imageConversion
 QT += testlib
+QT_FOR_CONFIG += gui-private
 SOURCES += tst_qimageconversion.cpp
 
 qtConfig(gif): DEFINES += QTEST_HAVE_GIF
diff --git a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro
index 7de1eedbdf..33e0c50bba 100644
--- a/tests/benchmarks/gui/image/qimagereader/qimagereader.pro
+++ b/tests/benchmarks/gui/image/qimagereader/qimagereader.pro
@@ -1,4 +1,5 @@
 QT += testlib
+QT_FOR_CONFIG += gui-private
 
 TEMPLATE = app
 TARGET = tst_bench_qimagereader
diff --git a/tests/benchmarks/network/network.pro b/tests/benchmarks/network/network.pro
index 01b3b80ef4..d53041eb61 100644
--- a/tests/benchmarks/network/network.pro
+++ b/tests/benchmarks/network/network.pro
@@ -1,4 +1,6 @@
 TEMPLATE = subdirs
+QT_FOR_CONFIG += network-private
+
 SUBDIRS = \
         access \
         kernel \