AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make configure -redo and config.status able to handle spaces in arguments

Browse Source 
Change-Id: If6ffe381b03595885570ae431a9937c6fdce164b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2014-11-18 20:21:09 +01:00
parent 9c877bf6ed
commit 36160e8980
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -87,7 +87,13 @@ if [ x"$1" = x"-top-level" ]; then
fi
# later cache the command line in config.status
OPT_CMDLINE=`echo $@ | sed 's,-v ,,g; s,-v$,,g'`
OPT_CMDLINE=
for i in "$@"; do
if [ "x$i" != "x-v" ]; then
[ -z "${i##* *}" ] && i="'$i'"
OPT_CMDLINE="$OPT_CMDLINE $i"
fi
done
# initialize global variables
QMAKE_SWITCHES=

10
tools/configure/configureapp.cpp
View File

@ -4387,12 +4387,8 @@ void Configure::reloadCmdLine()
QFile inFile(buildPath + "/configure" + dictionary[ "CUSTOMCONFIG" ] + ".cache");
if (inFile.open(QFile::ReadOnly)) {
QTextStream inStream(&inFile);
QString buffer;
inStream >> buffer;
while (buffer.length()) {
configCmdLine += buffer;
inStream >> buffer;
}
while (!inStream.atEnd())
configCmdLine += inStream.readLine().trimmed();
inFile.close();
}
}
@ -4405,7 +4401,7 @@ void Configure::saveCmdLine()
if (outFile.open(QFile::WriteOnly | QFile::Text)) {
QTextStream outStream(&outFile);
for (QStringList::Iterator it = configCmdLine.begin(); it != configCmdLine.end(); ++it) {
outStream << (*it) << " " << endl;
outStream << (*it) << endl;
}
outStream.flush();
outFile.close();