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

Change-Id: If6ffe381b03595885570ae431a9937c6fdce164b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

1 files changed, 3 insertions, 7 deletions

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 3226e52279..adab4b7a9a 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -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();