diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/dbus/dbus.pro | 4 | ||||
| -rw-r--r-- | src/network/ssl/ssl.pri | 6 | ||||
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.pri | 9 |
3 files changed, 4 insertions, 15 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 2e4119ba93..c5afe8c4d2 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -3,9 +3,7 @@ QT = core-private CONFIG += link_pkgconfig MODULE_CONFIG = dbusadaptors dbusinterfaces -!isEmpty(DBUS_PATH) { - INCLUDEPATH += $$DBUS_PATH/include - QMAKE_LIBDIR += $$DBUS_PATH/lib +!contains(QT_LIBS_DBUS, .*dbus-1.*) { win32:CONFIG(debug, debug|release):QT_LIBS_DBUS += -ldbus-1d else:QT_LIBS_DBUS += -ldbus-1 } diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index f5afb43759..1d8c8e1ab7 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -41,11 +41,7 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { LIBS_PRIVATE += $$OPENSSL_LIBS_RELEASE } + QMAKE_CXXFLAGS += $$OPENSSL_CFLAGS LIBS_PRIVATE += $$OPENSSL_LIBS windows:LIBS += -lcrypt32 - - !isEmpty(OPENSSL_PATH) { - INCLUDEPATH += $$OPENSSL_PATH/include - QMAKE_LIBDIR += $$OPENSSL_PATH/lib - } } diff --git a/src/sql/drivers/mysql/qsql_mysql.pri b/src/sql/drivers/mysql/qsql_mysql.pri index 50f49ca548..3cfb6144a1 100644 --- a/src/sql/drivers/mysql/qsql_mysql.pri +++ b/src/sql/drivers/mysql/qsql_mysql.pri @@ -1,10 +1,8 @@ HEADERS += $$PWD/qsql_mysql_p.h SOURCES += $$PWD/qsql_mysql.cpp -!isEmpty(MYSQL_PATH) { - INCLUDEPATH += $$MYSQL_PATH/include - QMAKE_LIBDIR += $$MYSQL_PATH/lib -} +QMAKE_CXXFLAGS *= $$QT_CFLAGS_MYSQL +LIBS += $$QT_LFLAGS_MYSQL unix { isEmpty(QT_LFLAGS_MYSQL) { @@ -12,9 +10,6 @@ unix { 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 |