From 484c05ef374ef1c1043836b074693838d6b30adb Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 7 Jul 2010 12:05:37 +0200
Subject: Simplify *= to += after contains() test
Merge-request: 715
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
---
src/sql/drivers/db2/qsql_db2.pri | 4 ++--
src/sql/drivers/ibase/qsql_ibase.pri | 4 ++--
src/sql/drivers/mysql/qsql_mysql.pri | 6 +++---
src/sql/drivers/oci/qsql_oci.pri | 2 +-
src/sql/drivers/odbc/qsql_odbc.pri | 4 ++--
src/sql/drivers/psql/qsql_psql.pri | 4 ++--
src/sql/drivers/sqlite2/qsql_sqlite2.pri | 2 +-
src/sql/drivers/tds/qsql_tds.pri | 2 +-
8 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/src/sql/drivers/db2/qsql_db2.pri b/src/sql/drivers/db2/qsql_db2.pri
index e53a8a0..16557f0 100644
--- a/src/sql/drivers/db2/qsql_db2.pri
+++ b/src/sql/drivers/db2/qsql_db2.pri
@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_db2.h
SOURCES += $$PWD/qsql_db2.cpp
unix {
- !contains(LIBS, .*db2.*):LIBS *= -ldb2
+ !contains(LIBS, .*db2.*):LIBS += -ldb2
} else:!win32-borland {
- !contains(LIBS, .*db2.*):LIBS *= -ldb2cli
+ !contains(LIBS, .*db2.*):LIBS += -ldb2cli
}
diff --git a/src/sql/drivers/ibase/qsql_ibase.pri b/src/sql/drivers/ibase/qsql_ibase.pri
index ebcd18a..33fbb0d 100644
--- a/src/sql/drivers/ibase/qsql_ibase.pri
+++ b/src/sql/drivers/ibase/qsql_ibase.pri
@@ -2,10 +2,10 @@ HEADERS += $$PWD/qsql_ibase.h
SOURCES += $$PWD/qsql_ibase.cpp
unix {
- !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS *= -lgds
+ !contains(LIBS, .*gds.*):!contains(LIBS, .*libfb.*):LIBS += -lgds
} else {
!contains(LIBS, .*gds.*):!contains(LIBS, .*fbclient.*) {
win32-borland:LIBS += gds32.lib
- else:LIBS *= -lgds32_ms
+ else:LIBS += -lgds32_ms
}
}
diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri
index 801b891..1b9c3dd 100644
--- a/src/sql/drivers/mysql/qsql_mysql.pri
+++ b/src/sql/drivers/mysql/qsql_mysql.pri
@@ -4,13 +4,13 @@ SOURCES += $$PWD/qsql_mysql.cpp
unix {
isEmpty(QT_LFLAGS_MYSQL) {
!contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) {
- use_libmysqlclient_r:LIBS *= -lmysqlclient_r
- else:LIBS *= -lmysqlclient
+ use_libmysqlclient_r:LIBS += -lmysqlclient_r
+ else:LIBS += -lmysqlclient
}
} else {
LIBS *= $$QT_LFLAGS_MYSQL
QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL
}
} else {
- !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS *= -llibmysql
+ !contains(LIBS, .*mysql.*):!contains(LIBS, .*mysqld.*):LIBS += -llibmysql
}
diff --git a/src/sql/drivers/oci/qsql_oci.pri b/src/sql/drivers/oci/qsql_oci.pri
index 6859156..60ccc4c 100644
--- a/src/sql/drivers/oci/qsql_oci.pri
+++ b/src/sql/drivers/oci/qsql_oci.pri
@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_oci.h
SOURCES += $$PWD/qsql_oci.cpp
unix {
- !contains(LIBS, .*clnts.*):LIBS *= -lclntsh
+ !contains(LIBS, .*clnts.*):LIBS += -lclntsh
} else {
LIBS *= -loci
}
diff --git a/src/sql/drivers/odbc/qsql_odbc.pri b/src/sql/drivers/odbc/qsql_odbc.pri
index c4c92be..8394012 100644
--- a/src/sql/drivers/odbc/qsql_odbc.pri
+++ b/src/sql/drivers/odbc/qsql_odbc.pri
@@ -2,10 +2,10 @@ HEADERS += $$PWD/qsql_odbc.h
SOURCES += $$PWD/qsql_odbc.cpp
mac {
- !contains(LIBS, .*odbc.*):LIBS *= -liodbc
+ !contains(LIBS, .*odbc.*):LIBS += -liodbc
} else:unix {
DEFINES += UNICODE
- !contains(LIBS, .*odbc.*):LIBS *= $$QT_LFLAGS_ODBC
+ !contains(LIBS, .*odbc.*):LIBS += $$QT_LFLAGS_ODBC
} else:win32-borland {
LIBS *= $(BCB)/lib/PSDK/odbc32.lib
} else {
diff --git a/src/sql/drivers/psql/qsql_psql.pri b/src/sql/drivers/psql/qsql_psql.pri
index c282d57..97db4be 100644
--- a/src/sql/drivers/psql/qsql_psql.pri
+++ b/src/sql/drivers/psql/qsql_psql.pri
@@ -7,7 +7,7 @@ unix|win32-g++* {
LIBS *= $$QT_LFLAGS_PSQL
QMAKE_CXXFLAGS *= $$QT_CFLAGS_PSQL
}
- !contains(LIBS, .*pq.*):LIBS *= -lpq
+ !contains(LIBS, .*pq.*):LIBS += -lpq
} else {
- !contains(LIBS, .*pq.*):LIBS *= -llibpq -lws2_32 -ladvapi32
+ !contains(LIBS, .*pq.*):LIBS += -llibpq -lws2_32 -ladvapi32
}
diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.pri b/src/sql/drivers/sqlite2/qsql_sqlite2.pri
index 9f0e807..76fe255 100644
--- a/src/sql/drivers/sqlite2/qsql_sqlite2.pri
+++ b/src/sql/drivers/sqlite2/qsql_sqlite2.pri
@@ -1,4 +1,4 @@
HEADERS += $PWD/qsql_sqlite2.h
SOURCES += $PWD/qsql_sqlite2.cpp
-!contains(LIBS, .*sqlite.*):LIBS *= -lsqlite
+!contains(LIBS, .*sqlite.*):LIBS += -lsqlite
diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri
index e2662ca..c552ead 100644
--- a/src/sql/drivers/tds/qsql_tds.pri
+++ b/src/sql/drivers/tds/qsql_tds.pri
@@ -2,7 +2,7 @@ HEADERS += $$PWD/qsql_tds.h
SOURCES += $$PWD/qsql_tds.cpp
unix {
- !contains(LIBS, .*sybdb.*):LIBS *= -lsybdb
+ !contains(LIBS, .*sybdb.*):LIBS += -lsybdb
} else:win32-borland {
LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB
} else {
--
cgit v0.12