diff options
23 files changed, 31 insertions, 93 deletions
diff --git a/configure.json b/configure.json index da051d6371..d5610a6402 100644 --- a/configure.json +++ b/configure.json @@ -532,7 +532,6 @@ }, "xcb_syslibs": { "description": "XCB (secondary)", - "export": "", "test": "qpa/xcb-syslibs", "sources": [ { "type": "pkgConfig", @@ -702,7 +701,6 @@ }, "db2": { "description": "DB2 (IBM)", - "export": "", "test": "unix/db2", "sources": [ { "libs": "-ldb2cli", "condition": "config.win32" }, @@ -711,7 +709,6 @@ }, "ibase": { "description": "InterBase", - "export": "", "test": "unix/ibase", "sources": [ { "libs": "-lgds32_ms", "condition": "config.win32" }, @@ -748,7 +745,6 @@ }, "oci": { "description": "OCI (Oracle)", - "export": "", "test": "unix/oci", "sources": [ { "libs": "-loci", "condition": "config.win32" }, @@ -766,7 +762,6 @@ }, "sqlite2": { "description": "SQLite (version 2)", - "export": "", "test": "unix/sqlite2", "sources": [ "-lsqlite" diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri index f21a1d5d3e..8e45766f17 100644 --- a/src/corelib/kernel/kernel.pri +++ b/src/corelib/kernel/kernel.pri @@ -157,8 +157,7 @@ unix|integrity { kernel/qeventdispatcher_glib.cpp HEADERS += \ kernel/qeventdispatcher_glib_p.h - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GLIB - LIBS_PRIVATE +=$$QMAKE_LIBS_GLIB + QMAKE_USE_PRIVATE += glib } contains(QT_CONFIG, clock-gettime):include($$QT_SOURCE_TREE/config.tests/unix/clock-gettime/clock-gettime.pri) diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 96a798ed66..f2e066852b 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -1,17 +1,11 @@ TARGET = QtDBus QT = core-private -CONFIG += link_pkgconfig MODULE_CONFIG = dbusadaptors dbusinterfaces -!contains(QMAKE_LIBS_DBUS, .*dbus-1.*) { - win32:CONFIG(debug, debug|release):QMAKE_LIBS_DBUS += -ldbus-1d - else:QMAKE_LIBS_DBUS += -ldbus-1 -} - DEFINES += DBUS_API_SUBJECT_TO_CHANGE QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS contains(QT_CONFIG, dbus-linked) { - LIBS_PRIVATE += $$QMAKE_LIBS_DBUS + QMAKE_USE_PRIVATE += dbus DEFINES += QT_LINKED_LIBDBUS } diff --git a/src/platformsupport/devicediscovery/devicediscovery.pri b/src/platformsupport/devicediscovery/devicediscovery.pri index 9829ae88ba..4a92c404d4 100644 --- a/src/platformsupport/devicediscovery/devicediscovery.pri +++ b/src/platformsupport/devicediscovery/devicediscovery.pri @@ -3,8 +3,7 @@ HEADERS += $$PWD/qdevicediscovery_p.h contains(QT_CONFIG, libudev) { SOURCES += $$PWD/qdevicediscovery_udev.cpp HEADERS += $$PWD/qdevicediscovery_udev_p.h - INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV - LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV + QMAKE_USE_PRIVATE += libudev } else: contains(QT_CONFIG, evdev) { SOURCES += $$PWD/qdevicediscovery_static.cpp HEADERS += $$PWD/qdevicediscovery_static_p.h diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri index 6a4689eb19..4a562ace99 100644 --- a/src/platformsupport/eventdispatchers/eventdispatchers.pri +++ b/src/platformsupport/eventdispatchers/eventdispatchers.pri @@ -17,6 +17,5 @@ HEADERS +=\ contains(QT_CONFIG, glib) { SOURCES +=$$PWD/qeventdispatcher_glib.cpp HEADERS +=$$PWD/qeventdispatcher_glib_p.h - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GLIB - LIBS_PRIVATE += $$QMAKE_LIBS_GLIB + QMAKE_USE_PRIVATE += glib } diff --git a/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri b/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri index c058498ba0..19cc8b1c33 100644 --- a/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri +++ b/src/platformsupport/input/evdevkeyboard/evdevkeyboard.pri @@ -8,5 +8,5 @@ SOURCES += \ $$PWD/qevdevkeyboardmanager.cpp contains(QT_CONFIG, libudev) { - LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV + QMAKE_USE_PRIVATE += libudev } diff --git a/src/platformsupport/input/evdevmouse/evdevmouse.pri b/src/platformsupport/input/evdevmouse/evdevmouse.pri index 7e7a9e1629..103092b7d0 100644 --- a/src/platformsupport/input/evdevmouse/evdevmouse.pri +++ b/src/platformsupport/input/evdevmouse/evdevmouse.pri @@ -7,6 +7,6 @@ SOURCES += \ $$PWD/qevdevmousemanager.cpp contains(QT_CONFIG, libudev) { - LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV + QMAKE_USE_PRIVATE += libudev } diff --git a/src/platformsupport/input/evdevtablet/evdevtablet.pri b/src/platformsupport/input/evdevtablet/evdevtablet.pri index fb9489353c..2475f76a05 100644 --- a/src/platformsupport/input/evdevtablet/evdevtablet.pri +++ b/src/platformsupport/input/evdevtablet/evdevtablet.pri @@ -7,5 +7,5 @@ SOURCES += \ $$PWD/qevdevtabletmanager.cpp contains(QT_CONFIG, libudev) { - LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV + QMAKE_USE_PRIVATE += libudev } diff --git a/src/platformsupport/input/evdevtouch/evdevtouch.pri b/src/platformsupport/input/evdevtouch/evdevtouch.pri index 44eb9da113..1e9f697868 100644 --- a/src/platformsupport/input/evdevtouch/evdevtouch.pri +++ b/src/platformsupport/input/evdevtouch/evdevtouch.pri @@ -9,7 +9,7 @@ SOURCES += \ INCLUDEPATH += $$PWD/../shared contains(QT_CONFIG, libudev) { - LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV + QMAKE_USE_PRIVATE += libudev } contains(QT_CONFIG, mtdev) { diff --git a/src/platformsupport/input/libinput/libinput.pri b/src/platformsupport/input/libinput/libinput.pri index aeba6c725a..9595e15f4e 100644 --- a/src/platformsupport/input/libinput/libinput.pri +++ b/src/platformsupport/input/libinput/libinput.pri @@ -10,14 +10,12 @@ SOURCES += \ $$PWD/qlibinputkeyboard.cpp \ $$PWD/qlibinputtouch.cpp -INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV $$QMAKE_INCDIR_LIBINPUT -LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV $$QMAKE_LIBS_LIBINPUT +QMAKE_USE_PRIVATE += libudev libinput INCLUDEPATH += $$PWD/../shared contains(QT_CONFIG, xkbcommon-evdev) { - INCLUDEPATH += $$QMAKE_INCDIR_XKBCOMMON_EVDEV - LIBS_PRIVATE += $$QMAKE_LIBS_XKBCOMMON_EVDEV + QMAKE_USE_PRIVATE += xkbcommon_evdev } else { DEFINES += QT_NO_XKBCOMMON_EVDEV } diff --git a/src/plugins/platforminputcontexts/compose/compose.pro b/src/plugins/platforminputcontexts/compose/compose.pro index 86bdd4729b..df61873902 100644 --- a/src/plugins/platforminputcontexts/compose/compose.pro +++ b/src/plugins/platforminputcontexts/compose/compose.pro @@ -17,8 +17,7 @@ contains(QT_CONFIG, xkbcommon-qt): { QT_CONFIG -= use-xkbcommon-x11support include(../../../3rdparty/xkbcommon.pri) } else { - LIBS += $$QMAKE_LIBS_XKBCOMMON - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON + QMAKE_USE += xkbcommon } OTHER_FILES += $$PWD/compose.json diff --git a/src/plugins/platforms/directfb/directfb.pro b/src/plugins/platforms/directfb/directfb.pro index 5c81e0283a..d4977bf40f 100644 --- a/src/plugins/platforms/directfb/directfb.pro +++ b/src/plugins/platforms/directfb/directfb.pro @@ -2,8 +2,7 @@ TARGET = qdirectfb QT += core-private gui-private platformsupport-private -LIBS += $$QMAKE_LIBS_DIRECTFB -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DIRECTFB +QMAKE_USE += directfb SOURCES = main.cpp \ qdirectfbintegration.cpp \ diff --git a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri index c2d3849d8e..8fd57da29d 100644 --- a/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri +++ b/src/plugins/platforms/xcb/gl_integrations/gl_integrations_plugin_base.pri @@ -21,18 +21,15 @@ contains(QT_CONFIG, xcb-sm) { DEFINES += XCB_USE_SM } -DEFINES += $$QMAKE_DEFINES_XCB -LIBS += $$QMAKE_LIBS_XCB -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB - CONFIG += qpa/genericunixfontdatabase contains(QT_CONFIG, xcb-qt) { DEFINES += XCB_USE_RENDER XCB_DIR = $$clean_path($$PWD/../../../../3rdparty/xcb) INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/include/xcb $$XCB_DIR/sysinclude - LIBS += -lxcb -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix() + LIBS += -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix() + QMAKE_USE += xcb } else { - LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb + QMAKE_USE += xcb_syslibs } diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro index 2013f40dd0..1cf13c7795 100644 --- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro +++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro @@ -72,26 +72,22 @@ contains(QT_CONFIG, xcb-sm) { include(gl_integrations/gl_integrations.pri) -DEFINES += $$QMAKE_DEFINES_XCB -LIBS += $$QMAKE_LIBS_XCB -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XCB -QMAKE_CFLAGS += $$QMAKE_CFLAGS_XCB - CONFIG += qpa/genericunixfontdatabase contains(QT_CONFIG, dbus-linked) { QT += dbus - LIBS += $$QMAKE_LIBS_DBUS } contains(QT_CONFIG, xcb-qt) { DEFINES += XCB_USE_RENDER XCB_DIR = ../../../3rdparty/xcb INCLUDEPATH += $$XCB_DIR/include $$XCB_DIR/sysinclude - LIBS += -lxcb -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix() + LIBS += -L$$MODULE_BASE_OUTDIR/lib -lxcb-static$$qtPlatformTargetSuffix() + QMAKE_USE += xcb } else { - LIBS += -lxcb -lxcb-image -lxcb-icccm -lxcb-sync -lxcb-xfixes -lxcb-shm -lxcb-randr -lxcb-shape -lxcb-keysyms -lxcb-xinerama + LIBS += -lxcb-xinerama ### there is no configure test for this! !contains(DEFINES, QT_NO_XKB):LIBS += -lxcb-xkb + QMAKE_USE += xcb_syslibs } # libxkbcommon @@ -99,8 +95,7 @@ contains(QT_CONFIG, xkbcommon-qt) { QT_CONFIG += use-xkbcommon-x11support include(../../../3rdparty/xkbcommon.pri) } else { - LIBS += $$QMAKE_LIBS_XKBCOMMON - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_XKBCOMMON + QMAKE_USE += xkbcommon } load(qt_module) diff --git a/src/plugins/platformthemes/gtk3/gtk3.pro b/src/plugins/platformthemes/gtk3/gtk3.pro index 72a33efeac..12364b0b57 100644 --- a/src/plugins/platformthemes/gtk3/gtk3.pro +++ b/src/plugins/platformthemes/gtk3/gtk3.pro @@ -8,8 +8,7 @@ load(qt_plugin) QT += core-private gui-private platformsupport-private CONFIG += X11 -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GTK3 -LIBS += $$QMAKE_LIBS_GTK3 +QMAKE_USE += gtk3 HEADERS += \ qgtk3dialoghelpers.h \ diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro index 3bd8cd0040..56dd5f598c 100644 --- a/src/plugins/sqldrivers/mysql/mysql.pro +++ b/src/plugins/sqldrivers/mysql/mysql.pro @@ -3,19 +3,7 @@ TARGET = qsqlmysql HEADERS += $$PWD/qsql_mysql_p.h SOURCES += $$PWD/qsql_mysql.cpp $$PWD/main.cpp -QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_MYSQL -LIBS += $$QMAKE_LIBS_MYSQL - -unix { - isEmpty(QMAKE_LIBS_MYSQL) { - !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { - use_libmysqlclient_r:LIBS += -lmysqlclient_r - else:LIBS += -lmysqlclient - } - } -} else { - !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS += -llibmysql -} +QMAKE_USE += mysql OTHER_FILES += mysql.json diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro index 0e49f1ac66..17844f27d2 100644 --- a/src/plugins/sqldrivers/odbc/odbc.pro +++ b/src/plugins/sqldrivers/odbc/odbc.pro @@ -3,15 +3,8 @@ TARGET = qsqlodbc HEADERS += $$PWD/qsql_odbc_p.h SOURCES += $$PWD/qsql_odbc.cpp $$PWD/main.cpp -unix { - DEFINES += UNICODE - !contains(LIBS, .*odbc.*) { - osx:LIBS += -liodbc - else:LIBS += $$QMAKE_LIBS_ODBC - } -} else { - LIBS *= -lodbc32 -} +QMAKE_USE += odbc +unix: DEFINES += UNICODE OTHER_FILES += odbc.json diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro index 4a05266120..c44a6319c3 100644 --- a/src/plugins/sqldrivers/psql/psql.pro +++ b/src/plugins/sqldrivers/psql/psql.pro @@ -3,13 +3,7 @@ TARGET = qsqlpsql HEADERS += $$PWD/qsql_psql_p.h SOURCES += $$PWD/qsql_psql.cpp $$PWD/main.cpp -unix|mingw { - LIBS += $$QMAKE_LIBS_PSQL - !contains(LIBS, .*pq.*):LIBS += -lpq - QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_PSQL -} else { - !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32 -} +QMAKE_USE += psql OTHER_FILES += psql.json diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro index c98655f85c..bcdf7d36f3 100644 --- a/src/plugins/sqldrivers/sqlite/sqlite.pro +++ b/src/plugins/sqldrivers/sqlite/sqlite.pro @@ -3,11 +3,10 @@ TARGET = qsqlite HEADERS += $$PWD/qsql_sqlite_p.h SOURCES += $$PWD/qsql_sqlite.cpp $$PWD/smain.cpp -!system-sqlite:!contains(LIBS, .*sqlite3.*) { +!system-sqlite { include($$PWD/../../../3rdparty/sqlite.pri) } else { - LIBS += $$QMAKE_LIBS_SQLITE - QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_SQLITE + QMAKE_USE += sqlite } OTHER_FILES += sqlite.json diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro index b5d32ae5a8..67bc0f5c48 100644 --- a/src/plugins/sqldrivers/tds/tds.pro +++ b/src/plugins/sqldrivers/tds/tds.pro @@ -3,13 +3,7 @@ TARGET = qsqltds HEADERS += $$PWD/qsql_tds_p.h SOURCES += $$PWD/qsql_tds.cpp $$PWD/main.cpp -unix|mingw: { - LIBS += $$QMAKE_LIBS_TDS - !contains(LIBS, .*sybdb.*):LIBS += -lsybdb - QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_TDS -} else { - LIBS *= -lNTWDBLIB -} +QMAKE_USE += tds OTHER_FILES += tds.json diff --git a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro index 21e665fa37..ed6084b702 100644 --- a/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro +++ b/tests/auto/dbus/qdbusmarshall/qdbusmarshall/qdbusmarshall.pro @@ -7,8 +7,7 @@ QT = core-private dbus-private testlib contains(QT_CONFIG, dbus-linked) { DEFINES += QT_LINKED_LIBDBUS - LIBS += $$QMAKE_LIBS_DBUS - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS + QMAKE_USE += dbus } else { SOURCES += ../../../../../src/dbus/qdbus_symbols.cpp } diff --git a/tests/auto/dbus/qdbustype/qdbustype.pro b/tests/auto/dbus/qdbustype/qdbustype.pro index e65b9ec5b3..fb0ebd6b1e 100644 --- a/tests/auto/dbus/qdbustype/qdbustype.pro +++ b/tests/auto/dbus/qdbustype/qdbustype.pro @@ -4,8 +4,7 @@ QT = core-private dbus-private testlib SOURCES += tst_qdbustype.cpp contains(QT_CONFIG, dbus-linked) { DEFINES += QT_LINKED_LIBDBUS - LIBS += $$QMAKE_LIBS_DBUS - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS + QMAKE_USE += dbus } else { SOURCES += ../../../../src/dbus/qdbus_symbols.cpp } diff --git a/tests/benchmarks/dbus/qdbustype/qdbustype.pro b/tests/benchmarks/dbus/qdbustype/qdbustype.pro index 8d2f45edf8..dd97169551 100644 --- a/tests/benchmarks/dbus/qdbustype/qdbustype.pro +++ b/tests/benchmarks/dbus/qdbustype/qdbustype.pro @@ -3,8 +3,7 @@ QT -= gui QT += core-private dbus-private testlib contains(QT_CONFIG, dbus-linked) { DEFINES += QT_LINKED_LIBDBUS - LIBS += $$QMAKE_LIBS_DBUS - QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS + QMAKE_USE += dbus } else { SOURCES += ../../../../src/dbus/qdbus_symbols.cpp } |