diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-07-29 12:56:06 +0200 |
| commit | ea9003268556154fdc305aa745890fdea92ac46b (patch) | |
| tree | a3ed6fc20fe4be0d7d07f752942cd5b7e2e3c7de /tools | |
| parent | c67f7c0f0fc34887a4922a269815c460cbe3ccf8 (diff) | |
| parent | 7e74f8f398deb8ed84f6c4613de6dab2066dc9de (diff) | |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
src/network/ssl/qsslsocket_openssl_symbols.cpp
Change-Id: Ic62419fa1fee5f4de6c372459d72e6e16f9a810b
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 14 | ||||
| -rw-r--r-- | tools/configure/configureapp.h | 1 |
2 files changed, 12 insertions, 3 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 33531252bf..4ed88939a1 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -995,6 +995,8 @@ void Configure::parseCmdLine() sybaseLibs = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("DBUS_PATH=")) { dbusPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1)); + } else if (configCmdLine.at(i).startsWith("DBUS_HOST_PATH=")) { + dbusHostPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1)); } else if (configCmdLine.at(i).startsWith("MYSQL_PATH=")) { mysqlPath = QDir::fromNativeSeparators(configCmdLine.at(i).section("=", 1)); } else if (configCmdLine.at(i).startsWith("ZLIB_LIBS=")) { @@ -2928,9 +2930,15 @@ void Configure::generateOutputVars() qmakeVars += QString("OPENSSL_LIBS += -L%1/lib").arg(opensslPath); } } - if (dictionary[ "DBUS" ] != "no" && !dbusPath.isEmpty()) { - qmakeVars += QString("QT_CFLAGS_DBUS = -I%1/include").arg(dbusPath); - qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib").arg(dbusPath); + if (dictionary[ "DBUS" ] != "no") { + if (!dbusPath.isEmpty()) { + qmakeVars += QString("QT_CFLAGS_DBUS = -I%1/include").arg(dbusPath); + qmakeVars += QString("QT_LIBS_DBUS = -L%1/lib").arg(dbusPath); + if (dbusHostPath.isEmpty()) + qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusPath); + } + if (!dbusHostPath.isEmpty()) + qmakeVars += QString("QT_HOST_CFLAGS_DBUS = -I%1/include").arg(dbusHostPath); } if (dictionary[ "SQL_MYSQL" ] != "no" && !mysqlPath.isEmpty()) { qmakeVars += QString("QT_CFLAGS_MYSQL = -I%1/include").arg(mysqlPath); diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index 9c14d5e63b..71ef210e89 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -133,6 +133,7 @@ private: QString opensslLibsRelease; QString opensslPath; QString dbusPath; + QString dbusHostPath; QString mysqlPath; QString psqlLibs; QString zlibLibs; |