summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp5
-rw-r--r--tools/configure/configureapp.h1
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 792bdc47fb..f031cfcf11 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -968,6 +968,8 @@ void Configure::parseCmdLine()
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).startsWith("ZLIB_LIBS=")) {
+ zlibLibs = QDir::fromNativeSeparators(configCmdLine.at(i));
}
else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){
@@ -2563,9 +2565,10 @@ void Configure::generateOutputVars()
qmakeVars += dbusPath;
if (dictionary[ "SQL_MYSQL" ] != "no" && !mysqlPath.isEmpty())
qmakeVars += mysqlPath;
-
if (!psqlLibs.isEmpty())
qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1);
+ if (!zlibLibs.isEmpty())
+ qmakeVars += zlibLibs;
{
QStringList lflagsTDS;
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 0ec4edebc7..e6b15e0305 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -147,6 +147,7 @@ private:
QString dbusPath;
QString mysqlPath;
QString psqlLibs;
+ QString zlibLibs;
QString sybase;
QString sybaseLibs;