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>

46 files changed, 19 insertions, 147 deletions

diff --git a/config.tests/unix/alsa/alsa.pro b/config.tests/unix/alsa/alsa.pro
index 6d5d55bcfd..211e9bc899 100644
--- a/config.tests/unix/alsa/alsa.pro
+++ b/config.tests/unix/alsa/alsa.pro
@@ -1,3 +1,2 @@
 SOURCES = alsatest.cpp
-LIBS+=-lasound
 CONFIG -= qt dylib
diff --git a/config.tests/unix/cups/cups.pro b/config.tests/unix/cups/cups.pro
index 3f8ca99d0f..d19ce7d9a6 100644
--- a/config.tests/unix/cups/cups.pro
+++ b/config.tests/unix/cups/cups.pro
@@ -1,3 +1,2 @@
 SOURCES = cups.cpp
 CONFIG -= qt dylib
-LIBS += -lcups
diff --git a/config.tests/unix/db2/db2.pro b/config.tests/unix/db2/db2.pro
index b7316051f9..ef233fc184 100644
--- a/config.tests/unix/db2/db2.pro
+++ b/config.tests/unix/db2/db2.pro
@@ -1,3 +1,2 @@
 SOURCES = db2.cpp
 CONFIG -= qt dylib
-LIBS += -ldb2
diff --git a/config.tests/unix/dbus/dbus.pro b/config.tests/unix/dbus/dbus.pro
index c2a01ea269..f9d793b867 100644
--- a/config.tests/unix/dbus/dbus.pro
+++ b/config.tests/unix/dbus/dbus.pro
@@ -1,2 +1,8 @@
 SOURCES = dbus.cpp
 CONFIG -= qt
+
+CONFIG += build_all
+CONFIG(debug, debug|release): \
+    LIBS += $$LIBS_DEBUG
+else: \
+    LIBS += $$LIBS_RELEASE
diff --git a/config.tests/unix/doubleconversion/doubleconversion.pro b/config.tests/unix/doubleconversion/doubleconversion.pro
index ae435b9293..8253d0c2a5 100644
--- a/config.tests/unix/doubleconversion/doubleconversion.pro
+++ b/config.tests/unix/doubleconversion/doubleconversion.pro
@@ -1,4 +1,3 @@
 SOURCES = doubleconversion.cpp
 CONFIG -= qt
 CONFIG += console
-LIBS += -ldouble-conversion
diff --git a/config.tests/unix/fontconfig/fontconfig.pro b/config.tests/unix/fontconfig/fontconfig.pro
index 8360774035..82dcfc80a0 100644
--- a/config.tests/unix/fontconfig/fontconfig.pro
+++ b/config.tests/unix/fontconfig/fontconfig.pro
@@ -1,4 +1,3 @@
 SOURCES = fontconfig.cpp
 CONFIG -= qt
-LIBS += -lfreetype -lfontconfig
 include(../../unix/freetype/freetype.pri)
diff --git a/config.tests/unix/freetype/freetype.pro b/config.tests/unix/freetype/freetype.pro
index c0cc02d564..1a9f06909a 100644
--- a/config.tests/unix/freetype/freetype.pro
+++ b/config.tests/unix/freetype/freetype.pro
@@ -1,4 +1,3 @@
 SOURCES = freetype.cpp
 CONFIG -= qt
-LIBS += -lfreetype
 include(freetype.pri)
diff --git a/config.tests/unix/getaddrinfo/getaddrinfo.pro b/config.tests/unix/getaddrinfo/getaddrinfo.pro
index cc739118fa..18e40971e5 100644
--- a/config.tests/unix/getaddrinfo/getaddrinfo.pro
+++ b/config.tests/unix/getaddrinfo/getaddrinfo.pro
@@ -1,3 +1,2 @@
 SOURCES = getaddrinfotest.cpp
 CONFIG -= qt dylib
-LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/getifaddrs/getifaddrs.pro b/config.tests/unix/getifaddrs/getifaddrs.pro
index 14a89f87b8..db2956a338 100644
--- a/config.tests/unix/getifaddrs/getifaddrs.pro
+++ b/config.tests/unix/getifaddrs/getifaddrs.pro
@@ -1,4 +1,3 @@
 SOURCES = getifaddrs.cpp
 CONFIG -= qt
 QT =
-LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/gnu-libiconv/gnu-libiconv.pro b/config.tests/unix/gnu-libiconv/gnu-libiconv.pro
index 1ecf94390a..4008f882eb 100644
--- a/config.tests/unix/gnu-libiconv/gnu-libiconv.pro
+++ b/config.tests/unix/gnu-libiconv/gnu-libiconv.pro
@@ -1,3 +1,2 @@
 SOURCES = gnu-libiconv.cpp
 CONFIG -= qt dylib
-LIBS += -liconv
diff --git a/config.tests/unix/gstreamer/gstreamer.pro b/config.tests/unix/gstreamer/gstreamer.pro
index a5e158fa21..7b6fbb4d75 100644
--- a/config.tests/unix/gstreamer/gstreamer.pro
+++ b/config.tests/unix/gstreamer/gstreamer.pro
@@ -1,22 +1,4 @@
 SOURCES += gstreamer.cpp
 
-CONFIG += link_pkgconfig
-
-gst-0.10 {
-    PKGCONFIG_PRIVATE += \
-        gstreamer-0.10 \
-        gstreamer-base-0.10 \
-        gstreamer-audio-0.10 \
-        gstreamer-video-0.10 \
-        gstreamer-pbutils-0.10
-} else:gst-1.0 {
-    PKGCONFIG_PRIVATE += \
-        gstreamer-1.0 \
-        gstreamer-base-1.0 \
-        gstreamer-audio-1.0 \
-        gstreamer-video-1.0 \
-        gstreamer-pbutils-1.0
-}
-
 CONFIG -= qt
 
diff --git a/config.tests/unix/harfbuzz/harfbuzz.pro b/config.tests/unix/harfbuzz/harfbuzz.pro
index 32edd6e358..71a7c355cb 100644
--- a/config.tests/unix/harfbuzz/harfbuzz.pro
+++ b/config.tests/unix/harfbuzz/harfbuzz.pro
@@ -1,3 +1,2 @@
 SOURCES = harfbuzz.cpp
 CONFIG -= qt dylib
-LIBS += -lharfbuzz
diff --git a/config.tests/unix/ibase/ibase.pro b/config.tests/unix/ibase/ibase.pro
index 58787851e1..8c47f66954 100644
--- a/config.tests/unix/ibase/ibase.pro
+++ b/config.tests/unix/ibase/ibase.pro
@@ -1,3 +1,2 @@
 SOURCES = ibase.cpp
 CONFIG -= qt dylib
-LIBS += -lgds
diff --git a/config.tests/unix/icu/icu.pro b/config.tests/unix/icu/icu.pro
index f92d7cdfb8..eeed0eaff3 100644
--- a/config.tests/unix/icu/icu.pro
+++ b/config.tests/unix/icu/icu.pro
@@ -2,4 +2,8 @@ SOURCES = icu.cpp
 CONFIG += console
 CONFIG -= qt dylib
 
-include($$PWD/../../../src/3rdparty/icu_dependency.pri)
+CONFIG += build_all
+CONFIG(debug, debug|release): \
+    LIBS += $$LIBS_DEBUG
+else: \
+    LIBS += $$LIBS_RELEASE
diff --git a/config.tests/unix/iodbc/iodbc.cpp b/config.tests/unix/iodbc/iodbc.cpp
deleted file mode 100644
index 3ce12390c2..0000000000
--- a/config.tests/unix/iodbc/iodbc.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the documentation 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 <sql.h>
-#include <sqlext.h>
-
-int main(int, char **)
-{
-    return 0;
-}
diff --git a/config.tests/unix/iodbc/iodbc.pro b/config.tests/unix/iodbc/iodbc.pro
deleted file mode 100644
index 68a0bd0ef4..0000000000
--- a/config.tests/unix/iodbc/iodbc.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = iodbc.cpp
-CONFIG -= qt dylib
-LIBS += -liodbc
diff --git a/config.tests/unix/ipv6ifname/ipv6ifname.pro b/config.tests/unix/ipv6ifname/ipv6ifname.pro
index 88203a782c..7574dce180 100644
--- a/config.tests/unix/ipv6ifname/ipv6ifname.pro
+++ b/config.tests/unix/ipv6ifname/ipv6ifname.pro
@@ -1,4 +1,3 @@
 SOURCES = ipv6ifname.cpp
 CONFIG -= qt
 QT =
-LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/journald/journald.pro b/config.tests/unix/journald/journald.pro
index ea765642e6..deb28ae97f 100644
--- a/config.tests/unix/journald/journald.pro
+++ b/config.tests/unix/journald/journald.pro
@@ -1,10 +1,3 @@
 SOURCES = journald.c
 
-CONFIG += link_pkgconfig
-
-packagesExist(libsystemd): \
-    PKGCONFIG_PRIVATE += libsystemd
-else: \
-    PKGCONFIG_PRIVATE += libsystemd-journal
-
 CONFIG -= qt
diff --git a/config.tests/unix/lgmon/lgmon.pro b/config.tests/unix/lgmon/lgmon.pro
index 7bd094dc86..33633b19f8 100644
--- a/config.tests/unix/lgmon/lgmon.pro
+++ b/config.tests/unix/lgmon/lgmon.pro
@@ -1,3 +1,2 @@
 SOURCES = lgmon.cpp
 CONFIG -= qt
-LIBS += -llgmon
diff --git a/config.tests/unix/libdl/libdl.pro b/config.tests/unix/libdl/libdl.pro
deleted file mode 100644
index 4016395d35..0000000000
--- a/config.tests/unix/libdl/libdl.pro
+++ /dev/null
@@ -1,2 +0,0 @@
-include(../dlopen/dlopen.pro)
-LIBS += -ldl
diff --git a/config.tests/unix/libinput/libinput.pro b/config.tests/unix/libinput/libinput.pro
index 150119c504..941a0b73ef 100644
--- a/config.tests/unix/libinput/libinput.pro
+++ b/config.tests/unix/libinput/libinput.pro
@@ -1,4 +1,2 @@
 SOURCES = libinput.cpp
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_LIBINPUT
-INCLUDEPATH += $$QMAKE_INCDIR_LIBINPUT
diff --git a/config.tests/unix/libjpeg/libjpeg.pro b/config.tests/unix/libjpeg/libjpeg.pro
index 01329a11fe..173249c634 100644
--- a/config.tests/unix/libjpeg/libjpeg.pro
+++ b/config.tests/unix/libjpeg/libjpeg.pro
@@ -1,3 +1,2 @@
 SOURCES = libjpeg.cpp
 CONFIG -= qt dylib
-LIBS += -ljpeg
diff --git a/config.tests/unix/libpng/libpng.pro b/config.tests/unix/libpng/libpng.pro
index cdca43171c..72e5e77b06 100644
--- a/config.tests/unix/libpng/libpng.pro
+++ b/config.tests/unix/libpng/libpng.pro
@@ -1,8 +1,2 @@
 SOURCES = libpng.cpp
 CONFIG -= qt dylib
-!contains(QT_CONFIG, no-pkg-config) {
-    CONFIG += link_pkgconfig
-    PKGCONFIG += libpng
-} else {
-    LIBS += -lpng
-}
diff --git a/config.tests/unix/libudev/libudev.pro b/config.tests/unix/libudev/libudev.pro
index 28b8980e2e..b557e7b17b 100644
--- a/config.tests/unix/libudev/libudev.pro
+++ b/config.tests/unix/libudev/libudev.pro
@@ -1,4 +1,2 @@
 SOURCES = libudev.cpp
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_LIBUDEV
-INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV
diff --git a/config.tests/unix/mtdev/mtdev.pro b/config.tests/unix/mtdev/mtdev.pro
index 4c7f76c89f..14111c6dc6 100644
--- a/config.tests/unix/mtdev/mtdev.pro
+++ b/config.tests/unix/mtdev/mtdev.pro
@@ -1,6 +1,3 @@
 SOURCES = mtdev.cpp
 
-CONFIG += link_pkgconfig
-PKGCONFIG_PRIVATE += mtdev
-
 CONFIG -= qt
diff --git a/config.tests/unix/mysql/mysql.cpp b/config.tests/unix/mysql/mysql.cpp
index 697148cbcb..3f83cb1e68 100644
--- a/config.tests/unix/mysql/mysql.cpp
+++ b/config.tests/unix/mysql/mysql.cpp
@@ -36,6 +36,9 @@
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
+#include <windows.h>
+#endif
 
 #include "mysql.h"
 
diff --git a/config.tests/unix/mysql/mysql.pro b/config.tests/unix/mysql/mysql.pro
index 06d1880f08..745f9ee0fb 100644
--- a/config.tests/unix/mysql/mysql.pro
+++ b/config.tests/unix/mysql/mysql.pro
@@ -1,3 +1,2 @@
 SOURCES = mysql.cpp
 CONFIG -= qt dylib
-LIBS += -lmysqlclient
diff --git a/config.tests/unix/mysql_r/mysql_r.pro b/config.tests/unix/mysql_r/mysql_r.pro
deleted file mode 100644
index 096da69487..0000000000
--- a/config.tests/unix/mysql_r/mysql_r.pro
+++ /dev/null
@@ -1,3 +0,0 @@
-SOURCES = ../mysql/mysql.cpp
-CONFIG -= qt dylib
-LIBS += -lmysqlclient_r
diff --git a/config.tests/unix/oci/oci.pro b/config.tests/unix/oci/oci.pro
index 3ffda1ddd7..c9aec08ee0 100644
--- a/config.tests/unix/oci/oci.pro
+++ b/config.tests/unix/oci/oci.pro
@@ -1,3 +1,2 @@
 SOURCES = oci.cpp
 CONFIG -= qt dylib
-LIBS += -lclntsh
diff --git a/config.tests/unix/odbc/odbc.cpp b/config.tests/unix/odbc/odbc.cpp
index f4a52f9dac..fc36f121c4 100644
--- a/config.tests/unix/odbc/odbc.cpp
+++ b/config.tests/unix/odbc/odbc.cpp
@@ -37,7 +37,7 @@
 **
 ****************************************************************************/
 
-#ifdef __MINGW32__
+#if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(WIN64) || defined(_WIN64) || defined(__WIN64__)
 #include <windows.h>
 #endif
 #include <sql.h>
@@ -45,5 +45,7 @@
 
 int main(int, char **)
 {
+    SQLHANDLE env;
+    SQLAllocHandle(SQL_HANDLE_ENV, SQL_NULL_HANDLE, &env);
     return 0;
 }
diff --git a/config.tests/unix/odbc/odbc.pro b/config.tests/unix/odbc/odbc.pro
index 70f3b668da..6c72dc7b1c 100644
--- a/config.tests/unix/odbc/odbc.pro
+++ b/config.tests/unix/odbc/odbc.pro
@@ -1,4 +1,2 @@
 SOURCES = odbc.cpp
 CONFIG -= qt dylib
-mingw:LIBS += -lodbc32
-else:LIBS += -lodbc
diff --git a/config.tests/unix/opengldesktop/opengldesktop.pro b/config.tests/unix/opengldesktop/opengldesktop.pro
index c3e700c50a..22c0be247d 100644
--- a/config.tests/unix/opengldesktop/opengldesktop.pro
+++ b/config.tests/unix/opengldesktop/opengldesktop.pro
@@ -1,11 +1,5 @@
 SOURCES = opengldesktop.cpp
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL
-
-for(p, QMAKE_LIBDIR_OPENGL) {
-    exists($$p):LIBS += -L$$p
-}
 
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_OPENGL
 
 mac:DEFINES += Q_OS_MAC
diff --git a/config.tests/unix/opengles2/opengles2.pro b/config.tests/unix/opengles2/opengles2.pro
index da30b453c6..c84563f62e 100644
--- a/config.tests/unix/opengles2/opengles2.pro
+++ b/config.tests/unix/opengles2/opengles2.pro
@@ -1,12 +1,7 @@
 SOURCES = opengles2.cpp
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
-
-for(p, QMAKE_LIBDIR_OPENGL_ES2) {
-    LIBS += -L$$p
-}
 
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_OPENGL_ES2
+
 mac {
     DEFINES += BUILD_ON_MAC
 }
diff --git a/config.tests/unix/opengles3/opengles3.pro b/config.tests/unix/opengles3/opengles3.pro
index 720985f14d..956a3bc102 100644
--- a/config.tests/unix/opengles3/opengles3.pro
+++ b/config.tests/unix/opengles3/opengles3.pro
@@ -3,14 +3,9 @@
 # the library.
 
 SOURCES = opengles3.cpp
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
-
-for(p, QMAKE_LIBDIR_OPENGL_ES2) {
-    LIBS += -L$$p
-}
 
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_OPENGL_ES2
+
 mac {
     DEFINES += BUILD_ON_MAC
 }
diff --git a/config.tests/unix/opengles31/opengles31.pro b/config.tests/unix/opengles31/opengles31.pro
index 225180e1c6..7895be9efc 100644
--- a/config.tests/unix/opengles31/opengles31.pro
+++ b/config.tests/unix/opengles31/opengles31.pro
@@ -3,11 +3,5 @@
 # the library.
 
 SOURCES = opengles31.cpp
-INCLUDEPATH += $$QMAKE_INCDIR_OPENGL_ES2
-
-for(p, QMAKE_LIBDIR_OPENGL_ES2) {
-    LIBS += -L$$p
-}
 
 CONFIG -= qt
-LIBS += $$QMAKE_LIBS_OPENGL_ES2
diff --git a/config.tests/unix/pcre/pcre.pro b/config.tests/unix/pcre/pcre.pro
index 7b8bfc6545..a47e6d1e96 100644
--- a/config.tests/unix/pcre/pcre.pro
+++ b/config.tests/unix/pcre/pcre.pro
@@ -1,3 +1,2 @@
 SOURCES = pcre.cpp
 CONFIG -= qt dylib
-LIBS += -lpcre16
diff --git a/config.tests/unix/pps/pps.pro b/config.tests/unix/pps/pps.pro
index 21bdeedbfb..af9b339f97 100644
--- a/config.tests/unix/pps/pps.pro
+++ b/config.tests/unix/pps/pps.pro
@@ -1,3 +1,2 @@
 SOURCES = pps.cpp
 CONFIG -= qt
-LIBS += -lpps
diff --git a/config.tests/unix/psql/psql.pro b/config.tests/unix/psql/psql.pro
index d0f3761bfb..dae7375be5 100644
--- a/config.tests/unix/psql/psql.pro
+++ b/config.tests/unix/psql/psql.pro
@@ -1,3 +1,2 @@
 SOURCES = psql.cpp
 CONFIG -= qt dylib
-LIBS *= -lpq
diff --git a/config.tests/unix/pulseaudio/pulseaudio.pro b/config.tests/unix/pulseaudio/pulseaudio.pro
index d75b16f41e..5e36c0aa81 100644
--- a/config.tests/unix/pulseaudio/pulseaudio.pro
+++ b/config.tests/unix/pulseaudio/pulseaudio.pro
@@ -1,3 +1,2 @@
 SOURCES = pulseaudio.cpp
 CONFIG -= qt
-LIBS +=
diff --git a/config.tests/unix/qqnx_imf/qqnx_imf.pro b/config.tests/unix/qqnx_imf/qqnx_imf.pro
index c51adb65ad..e1a2d9cecb 100644
--- a/config.tests/unix/qqnx_imf/qqnx_imf.pro
+++ b/config.tests/unix/qqnx_imf/qqnx_imf.pro
@@ -1,3 +1,2 @@
 SOURCES = qqnx_imf.cpp
 CONFIG -= qt
-LIBS += -linput_client
diff --git a/config.tests/unix/sctp/sctp.pro b/config.tests/unix/sctp/sctp.pro
index edcc0a444a..2138254732 100644
--- a/config.tests/unix/sctp/sctp.pro
+++ b/config.tests/unix/sctp/sctp.pro
@@ -1,4 +1,3 @@
 SOURCES = sctp.cpp
 CONFIG -= qt
 QT =
-LIBS += $$QMAKE_LIBS_NETWORK
diff --git a/config.tests/unix/slog2/slog2.pro b/config.tests/unix/slog2/slog2.pro
index e65460bb94..269a88a383 100644
--- a/config.tests/unix/slog2/slog2.pro
+++ b/config.tests/unix/slog2/slog2.pro
@@ -1,3 +1,2 @@
 SOURCES = slog2.cpp
 CONFIG -= qt
-LIBS += -lslog2
diff --git a/config.tests/unix/sqlite2/sqlite2.pro b/config.tests/unix/sqlite2/sqlite2.pro
index 7e69fdf2f3..b1252721dc 100644
--- a/config.tests/unix/sqlite2/sqlite2.pro
+++ b/config.tests/unix/sqlite2/sqlite2.pro
@@ -1,3 +1,2 @@
 SOURCES = sqlite2.cpp
 CONFIG -= qt dylib
-LIBS += -lsqlite
diff --git a/config.tests/unix/tds/tds.pro b/config.tests/unix/tds/tds.pro
index 6712779d58..f60fc0a602 100644
--- a/config.tests/unix/tds/tds.pro
+++ b/config.tests/unix/tds/tds.pro
@@ -1,3 +1,2 @@
 SOURCES = tds.cpp
 CONFIG -= qt dylib
-LIBS += -lsybdb
diff --git a/config.tests/unix/tslib/tslib.pro b/config.tests/unix/tslib/tslib.pro
index 1191120b89..6fc652dd96 100644
--- a/config.tests/unix/tslib/tslib.pro
+++ b/config.tests/unix/tslib/tslib.pro
@@ -1,3 +1,2 @@
 SOURCES = tslib.cpp
 CONFIG -= qt 
-LIBS += -lts
diff --git a/config.tests/unix/zlib/zlib.pro b/config.tests/unix/zlib/zlib.pro
index d9bd03e5df..6a6b324611 100644
--- a/config.tests/unix/zlib/zlib.pro
+++ b/config.tests/unix/zlib/zlib.pro
@@ -1,3 +1,2 @@
 SOURCES = zlib.cpp
 CONFIG -= qt dylib
-LIBS += -lz