rewrite library handling in configure

so far, each library was distributed over a test and (optionally) a
'library' output of a feature. this was conceptually messy and limiting.
so instead, turn libraries into a category of their own.

libraries now support multiple properly separated sources, which makes
overriding them a lot saner. sources can be conditional to accommodate
platform differences.

as an immediate consequence, move (almost) all library references from
the config test projects to the json file.
a few tests were excluded, because they are doing somewhat magic things
that should not be handled in this bulk change:
- freetype: .pri file shared with actual source code
- clock-gettime: -lrt is conditional, and there is a .pri file which is
  shared with actual source code
- ipc_posix: -lrt & -lpthread conditional
- iconv: -liconv conditional

the multi-source mechanism is used to make a variety of tests work on
windows, where the library name differs from unix (and sometimes between
build configurations). some tests still needed minor adjustments to
actually work.

on the way, fix up disagreements between manually specified libraries
and pkg-config lines (affecting several xcb-related tests).

Change-Id: Ic8c58556fa0cf8f981d386b13ea34b4431b127c5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

18 files changed, 0 insertions, 72 deletions

diff --git a/config.tests/qpa/direct2d/direct2d.pro b/config.tests/qpa/direct2d/direct2d.pro
index ab62a1da5c..98527b12a7 100644
--- a/config.tests/qpa/direct2d/direct2d.pro
+++ b/config.tests/qpa/direct2d/direct2d.pro
@@ -1,4 +1,3 @@
 SOURCES = direct2d.cpp
-LIBS += -ld2d1 -ldwrite -ld3d11
 CONFIG -= qt
 CONFIG += console
diff --git a/config.tests/qpa/egl-x11/egl-x11.pro b/config.tests/qpa/egl-x11/egl-x11.pro
index aceb03dd78..fd8479ba35 100644
--- a/config.tests/qpa/egl-x11/egl-x11.pro
+++ b/config.tests/qpa/egl-x11/egl-x11.pro
@@ -1,12 +1,3 @@
 SOURCES = egl-x11.cpp
 
-for(p, QMAKE_LIBDIR_EGL) {
-    LIBS += -L$$p
-}
-
-!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
-
 CONFIG -= qt
-
-LIBS += -lxcb -lX11 -lX11-xcb
diff --git a/config.tests/qpa/egl/egl.pro b/config.tests/qpa/egl/egl.pro
index b5396dab15..2c4ae07e64 100644
--- a/config.tests/qpa/egl/egl.pro
+++ b/config.tests/qpa/egl/egl.pro
@@ -1,10 +1,3 @@
 SOURCES = egl.cpp
 
-for(p, QMAKE_LIBDIR_EGL) {
-    LIBS += -L$$p
-}
-
-!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
-
 CONFIG -= qt
diff --git a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
index d8b1c3ec7e..d4afa460f7 100644
--- a/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
+++ b/config.tests/qpa/eglfs-brcm/eglfs-brcm.pro
@@ -1,11 +1,3 @@
 SOURCES = eglfs-brcm.cpp
 
 CONFIG -= qt
-
-INCLUDEPATH += $$QMAKE_INCDIR_EGL
-
-for(p, QMAKE_LIBDIR_EGL) {
-    LIBS += -L$$p
-}
-
-LIBS += -lEGL -lGLESv2 -lbcm_host
diff --git a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
index 0bb8c66cb1..2f20d993f5 100644
--- a/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
+++ b/config.tests/qpa/eglfs-egldevice/eglfs-egldevice.pro
@@ -1,9 +1,3 @@
 SOURCES = eglfs-egldevice.cpp
 
-for(p, QMAKE_LIBDIR_EGL) {
-    LIBS += -L$$p
-}
-
-INCLUDEPATH += $$QMAKE_INCDIR_EGL
-LIBS += $$QMAKE_LIBS_EGL
 CONFIG -= qt
diff --git a/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro
index 85bcf6484a..de6f85f20f 100644
--- a/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro
+++ b/config.tests/qpa/eglfs-mali-2/eglfs-mali-2.pro
@@ -1,5 +1,3 @@
 SOURCES = eglfs-mali-2.cpp
 
 CONFIG -= qt
-
-LIBS += -lEGL -lGLESv2
diff --git a/config.tests/qpa/eglfs-mali/eglfs-mali.pro b/config.tests/qpa/eglfs-mali/eglfs-mali.pro
index 132918c4bc..80f8282842 100644
--- a/config.tests/qpa/eglfs-mali/eglfs-mali.pro
+++ b/config.tests/qpa/eglfs-mali/eglfs-mali.pro
@@ -1,5 +1,3 @@
 SOURCES = eglfs-mali.cpp
 
 CONFIG -= qt
-
-LIBS += -lEGL -lGLESv2
diff --git a/config.tests/qpa/eglfs-viv/eglfs-viv.pro b/config.tests/qpa/eglfs-viv/eglfs-viv.pro
index 1617ee38ad..2c3dc5cb01 100644
--- a/config.tests/qpa/eglfs-viv/eglfs-viv.pro
+++ b/config.tests/qpa/eglfs-viv/eglfs-viv.pro
@@ -5,10 +5,3 @@ integrity {
   DEFINES += LINUX=1 EGL_API_FB=1
 }
 CONFIG -= qt
-
-for(p, QMAKE_LIBDIR_OPENGL_EGL) {
-    exists($$p):LIBS += -L$$p
-}
-
-!isEmpty(QMAKE_INCDIR_EGL): INCLUDEPATH += $$QMAKE_INCDIR_EGL
-!isEmpty(QMAKE_LIBS_EGL): LIBS += $$QMAKE_LIBS_EGL
diff --git a/config.tests/qpa/gbm/gbm.pro b/config.tests/qpa/gbm/gbm.pro
index 19177062a8..1c08eb4e67 100644
--- a/config.tests/qpa/gbm/gbm.pro
+++ b/config.tests/qpa/gbm/gbm.pro
@@ -1,4 +1,2 @@
 SOURCES = gbm.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += gbm
 CONFIG -= qt
diff --git a/config.tests/qpa/kms/kms.pro b/config.tests/qpa/kms/kms.pro
index ff6b1f6299..c823914308 100644
--- a/config.tests/qpa/kms/kms.pro
+++ b/config.tests/qpa/kms/kms.pro
@@ -1,8 +1,2 @@
 SOURCES = kms.cpp
-!contains(QT_CONFIG, no-pkg-config) {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += libdrm
-} else {
-    LIBS += -ldrm
-}
 CONFIG -= qt
diff --git a/config.tests/qpa/mirclient/mirclient.pro b/config.tests/qpa/mirclient/mirclient.pro
index b397c2d08a..3e87194e4e 100644
--- a/config.tests/qpa/mirclient/mirclient.pro
+++ b/config.tests/qpa/mirclient/mirclient.pro
@@ -1,4 +1,2 @@
 SOURCES = mirclient.cpp
-CONFIG += link_pkgconfig
-PKGCONFIG += egl mirclient ubuntu-platform-api
 CONFIG -= qt
diff --git a/config.tests/qpa/wayland-server/wayland-server.pro b/config.tests/qpa/wayland-server/wayland-server.pro
index c07740d20f..969bc542bb 100644
--- a/config.tests/qpa/wayland-server/wayland-server.pro
+++ b/config.tests/qpa/wayland-server/wayland-server.pro
@@ -1,5 +1,3 @@
 SOURCES = wl.cpp
 
 CONFIG -= qt
-CONFIG += link_pkgconfig
-PKGCONFIG += wayland-server
diff --git a/config.tests/qpa/xcb-glx/xcb-glx.pro b/config.tests/qpa/xcb-glx/xcb-glx.pro
index d7fd1d7208..8086e3a388 100644
--- a/config.tests/qpa/xcb-glx/xcb-glx.pro
+++ b/config.tests/qpa/xcb-glx/xcb-glx.pro
@@ -1,5 +1,2 @@
 SOURCES = xcb-glx.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lxcb-glx
-
diff --git a/config.tests/qpa/xcb-render/xcb-render.pro b/config.tests/qpa/xcb-render/xcb-render.pro
index 3248b66a67..7555fa9b61 100644
--- a/config.tests/qpa/xcb-render/xcb-render.pro
+++ b/config.tests/qpa/xcb-render/xcb-render.pro
@@ -1,5 +1,2 @@
 SOURCES = xcb-render.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lxcb-render -lxcb-render-util
-
diff --git a/config.tests/qpa/xcb-syslibs/xcb-syslibs.pro b/config.tests/qpa/xcb-syslibs/xcb-syslibs.pro
index 23eedb03a7..6363ae90ee 100644
--- a/config.tests/qpa/xcb-syslibs/xcb-syslibs.pro
+++ b/config.tests/qpa/xcb-syslibs/xcb-syslibs.pro
@@ -1,5 +1,2 @@
 SOURCES = xcb.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lxcb-image -lxcb-keysyms -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-randr
-
diff --git a/config.tests/qpa/xcb-xkb/xcb-xkb.pro b/config.tests/qpa/xcb-xkb/xcb-xkb.pro
index a684a869d3..804be7b894 100644
--- a/config.tests/qpa/xcb-xkb/xcb-xkb.pro
+++ b/config.tests/qpa/xcb-xkb/xcb-xkb.pro
@@ -1,5 +1,2 @@
 SOURCES = xcb-xkb.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lxcb-xkb
-
diff --git a/config.tests/qpa/xcb-xlib/xcb-xlib.pro b/config.tests/qpa/xcb-xlib/xcb-xlib.pro
index 03250b4480..0e98a00fd0 100644
--- a/config.tests/qpa/xcb-xlib/xcb-xlib.pro
+++ b/config.tests/qpa/xcb-xlib/xcb-xlib.pro
@@ -1,5 +1,2 @@
 SOURCES = xcb-xlib.cpp
 CONFIG -= qt
-
-LIBS += -lxcb -lX11 -lX11-xcb
-
diff --git a/config.tests/qpa/xcb/xcb.pro b/config.tests/qpa/xcb/xcb.pro
index a48fdbd15f..6363ae90ee 100644
--- a/config.tests/qpa/xcb/xcb.pro
+++ b/config.tests/qpa/xcb/xcb.pro
@@ -1,5 +1,2 @@
 SOURCES = xcb.cpp
 CONFIG -= qt
-
-LIBS += -lxcb
-