Unify naming of LIBS/CFLAGS for 3rd party libraries

Most libs use QMAKE_LIBS/CFLAGS, but some have other naming
conventions. Unify them into using QMAKE_LIBS/CFLAGS.

Change-Id: I39b188adc1f9a223a83b294c5315c3095a9c68de
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

10 files changed, 22 insertions, 22 deletions

diff --git a/src/corelib/kernel/kernel.pri b/src/corelib/kernel/kernel.pri
index a8d1ec08a6..aa60e1686c 100644
--- a/src/corelib/kernel/kernel.pri
+++ b/src/corelib/kernel/kernel.pri
@@ -148,8 +148,8 @@ unix|integrity {
             kernel/qeventdispatcher_glib.cpp
         HEADERS += \
             kernel/qeventdispatcher_glib_p.h
-        QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
-        LIBS_PRIVATE +=$$QT_LIBS_GLIB
+        QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GLIB
+        LIBS_PRIVATE +=$$QMAKE_LIBS_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 4c1aec7bb3..445ff48482 100644
--- a/src/dbus/dbus.pro
+++ b/src/dbus/dbus.pro
@@ -3,15 +3,15 @@ QT = core-private
 CONFIG += link_pkgconfig
 MODULE_CONFIG = dbusadaptors dbusinterfaces
 
-!contains(QT_LIBS_DBUS, .*dbus-1.*) {
-    win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d
-    else:QT_LIBS_DBUS += -ldbus-1
+!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 += $$QT_CFLAGS_DBUS
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_DBUS
 contains(QT_CONFIG, dbus-linked) {
-    LIBS_PRIVATE += $$QT_LIBS_DBUS
+    LIBS_PRIVATE += $$QMAKE_LIBS_DBUS
     DEFINES += QT_LINKED_LIBDBUS
 }
 
diff --git a/src/platformsupport/eventdispatchers/eventdispatchers.pri b/src/platformsupport/eventdispatchers/eventdispatchers.pri
index a0b37cae1a..6a4689eb19 100644
--- a/src/platformsupport/eventdispatchers/eventdispatchers.pri
+++ b/src/platformsupport/eventdispatchers/eventdispatchers.pri
@@ -17,6 +17,6 @@ HEADERS +=\
 contains(QT_CONFIG, glib) {
     SOURCES +=$$PWD/qeventdispatcher_glib.cpp
     HEADERS +=$$PWD/qeventdispatcher_glib_p.h
-    QMAKE_CXXFLAGS += $$QT_CFLAGS_GLIB
-    LIBS_PRIVATE += $$QT_LIBS_GLIB
+    QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_GLIB
+    LIBS_PRIVATE += $$QMAKE_LIBS_GLIB
 }
diff --git a/src/plugins/platforms/xcb/xcb_qpa_lib.pro b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
index f4a4e5a78a..8ae0b72cd7 100644
--- a/src/plugins/platforms/xcb/xcb_qpa_lib.pro
+++ b/src/plugins/platforms/xcb/xcb_qpa_lib.pro
@@ -81,7 +81,7 @@ CONFIG += qpa/genericunixfontdatabase
 
 contains(QT_CONFIG, dbus-linked) {
     QT += dbus
-    LIBS += $$QT_LIBS_DBUS
+    LIBS += $$QMAKE_LIBS_DBUS
 }
 
 contains(QT_CONFIG, xcb-qt) {
diff --git a/src/plugins/platformthemes/gtk3/gtk3.pro b/src/plugins/platformthemes/gtk3/gtk3.pro
index cd19e73ed8..ba459843f0 100644
--- a/src/plugins/platformthemes/gtk3/gtk3.pro
+++ b/src/plugins/platformthemes/gtk3/gtk3.pro
@@ -8,8 +8,8 @@ load(qt_plugin)
 QT += core-private gui-private platformsupport-private
 
 CONFIG += X11
-QMAKE_CXXFLAGS += $$QT_CFLAGS_QGTK3
-LIBS += $$QT_LIBS_QGTK3
+QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_QGTK3
+LIBS += $$QMAKE_LIBS_QGTK3
 
 HEADERS += \
         qgtk3dialoghelpers.h \
diff --git a/src/plugins/sqldrivers/mysql/mysql.pro b/src/plugins/sqldrivers/mysql/mysql.pro
index 442ad7f5a4..3bd8cd0040 100644
--- a/src/plugins/sqldrivers/mysql/mysql.pro
+++ b/src/plugins/sqldrivers/mysql/mysql.pro
@@ -3,11 +3,11 @@ TARGET = qsqlmysql
 HEADERS += $$PWD/qsql_mysql_p.h
 SOURCES += $$PWD/qsql_mysql.cpp $$PWD/main.cpp
 
-QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
-LIBS += $$QT_LFLAGS_MYSQL
+QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_MYSQL
+LIBS += $$QMAKE_LIBS_MYSQL
 
 unix {
-    isEmpty(QT_LFLAGS_MYSQL) {
+    isEmpty(QMAKE_LIBS_MYSQL) {
         !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
             use_libmysqlclient_r:LIBS += -lmysqlclient_r
             else:LIBS += -lmysqlclient
diff --git a/src/plugins/sqldrivers/odbc/odbc.pro b/src/plugins/sqldrivers/odbc/odbc.pro
index e002f06576..0e49f1ac66 100644
--- a/src/plugins/sqldrivers/odbc/odbc.pro
+++ b/src/plugins/sqldrivers/odbc/odbc.pro
@@ -7,7 +7,7 @@ unix {
     DEFINES += UNICODE
     !contains(LIBS, .*odbc.*) {
         osx:LIBS += -liodbc
-        else:LIBS += $$QT_LFLAGS_ODBC
+        else:LIBS += $$QMAKE_LIBS_ODBC
     }
 } else {
     LIBS *= -lodbc32
diff --git a/src/plugins/sqldrivers/psql/psql.pro b/src/plugins/sqldrivers/psql/psql.pro
index 43eebab7d3..4a05266120 100644
--- a/src/plugins/sqldrivers/psql/psql.pro
+++ b/src/plugins/sqldrivers/psql/psql.pro
@@ -4,9 +4,9 @@ HEADERS += $$PWD/qsql_psql_p.h
 SOURCES += $$PWD/qsql_psql.cpp $$PWD/main.cpp
 
 unix|mingw {
-    LIBS += $$QT_LFLAGS_PSQL
+    LIBS += $$QMAKE_LIBS_PSQL
     !contains(LIBS, .*pq.*):LIBS += -lpq
-    QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
+    QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_PSQL
 } else {
     !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32
 }
diff --git a/src/plugins/sqldrivers/sqlite/sqlite.pro b/src/plugins/sqldrivers/sqlite/sqlite.pro
index 6b2c083878..c98655f85c 100644
--- a/src/plugins/sqldrivers/sqlite/sqlite.pro
+++ b/src/plugins/sqldrivers/sqlite/sqlite.pro
@@ -6,8 +6,8 @@ SOURCES += $$PWD/qsql_sqlite.cpp $$PWD/smain.cpp
 !system-sqlite:!contains(LIBS, .*sqlite3.*) {
     include($$PWD/../../../3rdparty/sqlite.pri)
 } else {
-    LIBS += $$QT_LFLAGS_SQLITE
-    QMAKE_CXXFLAGS *= $$QT_CFLAGS_SQLITE
+    LIBS += $$QMAKE_LIBS_SQLITE
+    QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_SQLITE
 }
 
 OTHER_FILES += sqlite.json
diff --git a/src/plugins/sqldrivers/tds/tds.pro b/src/plugins/sqldrivers/tds/tds.pro
index 790c74de4e..b5d32ae5a8 100644
--- a/src/plugins/sqldrivers/tds/tds.pro
+++ b/src/plugins/sqldrivers/tds/tds.pro
@@ -4,9 +4,9 @@ HEADERS += $$PWD/qsql_tds_p.h
 SOURCES += $$PWD/qsql_tds.cpp $$PWD/main.cpp
 
 unix|mingw: {
-    LIBS += $$QT_LFLAGS_TDS
+    LIBS += $$QMAKE_LIBS_TDS
     !contains(LIBS, .*sybdb.*):LIBS += -lsybdb
-    QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS
+    QMAKE_CXXFLAGS *= $$QMAKE_CFLAGS_TDS
 } else {
     LIBS *= -lNTWDBLIB
 }