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>

4 files changed, 0 insertions, 60 deletions

diff --git a/config.tests/x11/opengl/opengl.cpp b/config.tests/x11/opengl/opengl.cpp
deleted file mode 100644
index e73c46b9e6..0000000000
--- a/config.tests/x11/opengl/opengl.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the config.tests of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <GL/gl.h>
-
-int main(int, char **)
-{
-    GLuint x;
-    x = 0;
-    return 0;
-}
diff --git a/config.tests/x11/opengl/opengl.pro b/config.tests/x11/opengl/opengl.pro
deleted file mode 100644
index d6814f1bd5..0000000000
--- a/config.tests/x11/opengl/opengl.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-SOURCES = opengl.cpp
-CONFIG += x11
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-
-for(p, QMAKE_LIBDIR_OPENGL) {
-    exists($$p):LIBS += -L$$p
-}
-
-CONFIG -= qt
-mingw:LIBS += -lopengl32
-else:LIBS += -lGL
diff --git a/config.tests/x11/xinput2/xinput2.pro b/config.tests/x11/xinput2/xinput2.pro
index ae8819b3d1..4788f0e14b 100644
--- a/config.tests/x11/xinput2/xinput2.pro
+++ b/config.tests/x11/xinput2/xinput2.pro
@@ -1,4 +1,3 @@
 CONFIG += x11
 CONFIG -= qt
-LIBS += -lXi
 SOURCES = xinput2.cpp
diff --git a/config.tests/x11/xrender/xrender.pro b/config.tests/x11/xrender/xrender.pro
index e7786420fa..ab5c5efa77 100644
--- a/config.tests/x11/xrender/xrender.pro
+++ b/config.tests/x11/xrender/xrender.pro
@@ -1,4 +1,3 @@
 SOURCES = xrender.cpp
 CONFIG += x11
 CONFIG -= qt
-LIBS += -lXrender