diff options
| -rw-r--r-- | src/dbus/dbus.pro | 5 | ||||
| -rw-r--r-- | src/network/ssl/ssl.pri | 5 | ||||
| -rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.pri | 5 | ||||
| -rw-r--r-- | src/tools/qdbuscpp2xml/qdbuscpp2xml.pro | 2 | ||||
| -rw-r--r-- | src/tools/qdbusxml2cpp/qdbusxml2cpp.pro | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 13 | ||||
| -rw-r--r-- | tools/configure/configureapp.h | 3 |
7 files changed, 35 insertions, 0 deletions
diff --git a/src/dbus/dbus.pro b/src/dbus/dbus.pro index 2aae1f4135..cfc9768d61 100644 --- a/src/dbus/dbus.pro +++ b/src/dbus/dbus.pro @@ -5,6 +5,11 @@ QT = core-private CONFIG += link_pkgconfig MODULE_CONFIG = dbusadaptors dbusinterfaces +!isEmpty(DBUS_PATH) { + INCLUDEPATH += $$DBUS_PATH/include + QMAKE_LIBDIR += $$DBUS_PATH/lib +} + DEFINES += DBUS_API_SUBJECT_TO_CHANGE QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS contains(QT_CONFIG, dbus-linked) { diff --git a/src/network/ssl/ssl.pri b/src/network/ssl/ssl.pri index 517e7d541a..8ebb4b29af 100644 --- a/src/network/ssl/ssl.pri +++ b/src/network/ssl/ssl.pri @@ -41,4 +41,9 @@ contains(QT_CONFIG, openssl) | contains(QT_CONFIG, openssl-linked) { 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 1b9c3dd8ca..c9ec2575fa 100644 --- a/src/sql/drivers/mysql/qsql_mysql.pri +++ b/src/sql/drivers/mysql/qsql_mysql.pri @@ -1,6 +1,11 @@ HEADERS += $$PWD/qsql_mysql.h SOURCES += $$PWD/qsql_mysql.cpp +!isEmpty(MYSQL_PATH) { + INCLUDEPATH += $$MYSQL_PATH/include + QMAKE_LIBDIR += $$MYSQL_PATH/lib +} + unix { isEmpty(QT_LFLAGS_MYSQL) { !contains(LIBS, .*mysqlclient.*):!contains(LIBS, .*mysqld.*) { diff --git a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro index 6dc6699b9b..0fee3efbe4 100644 --- a/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro +++ b/src/tools/qdbuscpp2xml/qdbuscpp2xml.pro @@ -12,6 +12,8 @@ INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \ $$QT_SOURCE_TREE/src/dbus +!isEmpty(DBUS_PATH): INCLUDEPATH += $$DBUS_PATH/include + QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS SOURCES += qdbuscpp2xml.cpp \ diff --git a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro index aebdef50ad..1d5c4d2fc3 100644 --- a/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro +++ b/src/tools/qdbusxml2cpp/qdbusxml2cpp.pro @@ -12,6 +12,8 @@ INCLUDEPATH += $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtDBus/$$QT_VERSION/QtDBus \ $$QT_SOURCE_TREE/src/dbus +!isEmpty(DBUS_PATH): INCLUDEPATH += $$DBUS_PATH/include + QMAKE_CXXFLAGS += $$QT_CFLAGS_DBUS SOURCES = qdbusxml2cpp.cpp \ diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 5da2917c94..d0db503d90 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -953,12 +953,18 @@ void Configure::parseCmdLine() opensslLibsDebug = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("OPENSSL_LIBS_RELEASE=")) { opensslLibsRelease = configCmdLine.at(i); + } else if (configCmdLine.at(i).startsWith("OPENSSL_PATH=")) { + opensslPath = QDir::fromNativeSeparators(configCmdLine.at(i)); } else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) { psqlLibs = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("SYBASE=")) { sybase = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) { sybaseLibs = configCmdLine.at(i); + } else if (configCmdLine.at(i).startsWith("DBUS_PATH=")) { + dbusPath = QDir::fromNativeSeparators(configCmdLine.at(i)); + } else if (configCmdLine.at(i).startsWith("MYSQL_PATH=")) { + mysqlPath = QDir::fromNativeSeparators(configCmdLine.at(i)); } else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){ @@ -2544,7 +2550,14 @@ void Configure::generateOutputVars() } else if (opensslLibs.isEmpty()) { qmakeVars += QString("OPENSSL_LIBS = -lssleay32 -llibeay32"); } + if (!opensslPath.isEmpty()) + qmakeVars += opensslPath; } + if (dictionary[ "DBUS" ] != "no" && !dbusPath.isEmpty()) + qmakeVars += dbusPath; + if (dictionary[ "SQL_MYSQL" ] != "no" && !mysqlPath.isEmpty()) + qmakeVars += mysqlPath; + if (!psqlLibs.isEmpty()) qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1); diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index 7f4cbdb983..0ec4edebc7 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -143,6 +143,9 @@ private: QString opensslLibs; QString opensslLibsDebug; QString opensslLibsRelease; + QString opensslPath; + QString dbusPath; + QString mysqlPath; QString psqlLibs; QString sybase; QString sybaseLibs; |