diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2012-08-20 19:54:58 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-21 11:05:20 +0200 |
| commit | 17c89d157a0df2ed9fd0585c8ded21b04278ccf7 (patch) | |
| tree | ab49e6722ceb51523d78f2d7d244486e645df37d | |
| parent | 07a978d3d4b41739eff1061dc45dbfa737bf78b9 (diff) | |
make it possible to pass configure zlib lib name
Change-Id: I82fde11436261dab51393b35dfbf2a753df58ec9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/3rdparty/zlib_dependency.pri | 5 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 5 | ||||
| -rw-r--r-- | tools/configure/configureapp.h | 1 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/3rdparty/zlib_dependency.pri b/src/3rdparty/zlib_dependency.pri index 75dd2396f2..029bb9e637 100644 --- a/src/3rdparty/zlib_dependency.pri +++ b/src/3rdparty/zlib_dependency.pri @@ -1,7 +1,10 @@ # zlib dependency satisfied by bundled 3rd party zlib or system zlib contains(QT_CONFIG, system-zlib) { if(unix|win32-g++*):LIBS_PRIVATE += -lz - else: LIBS += zdll.lib + else { + isEmpty(ZLIB_LIBS): LIBS += zdll.lib + else: LIBS += $$ZLIB_LIBS + } } else { INCLUDEPATH += $$PWD/zlib } 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; |