whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make it possible to pass configure zlib lib name 

Change-Id: I82fde11436261dab51393b35dfbf2a753df58ec9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
bb10
Andreas Holzammer 2012-08-20 19:54:58 +02:00 committed by Qt by Nokia
parent 07a978d3d4
commit 17c89d157a
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/3rdparty/zlib_dependency.pri vendored
View File

@ -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
}

5
tools/configure/configureapp.cpp
View File

@ -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;

1
tools/configure/configureapp.h
View File

@ -147,6 +147,7 @@ private:
QString dbusPath;
QString mysqlPath;
QString psqlLibs;
QString zlibLibs;
QString sybase;
QString sybaseLibs;