From da95152dfb968d815f898f3d190988a915f49142 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@theqtcompany.com>
Date: Sun, 20 Mar 2016 23:07:46 +0100
Subject: 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>
---
 src/plugins/sqldrivers/mysql/mysql.pro   | 6 +++---
 src/plugins/sqldrivers/odbc/odbc.pro     | 2 +-
 src/plugins/sqldrivers/psql/psql.pro     | 4 ++--
 src/plugins/sqldrivers/sqlite/sqlite.pro | 4 ++--
 src/plugins/sqldrivers/tds/tds.pro       | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/plugins/sqldrivers')

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
 }
-- 
cgit v1.2.3