summaryrefslogtreecommitdiffstats
path: root/tools/configure
diff options
context:
space:
mode:
authorPeter Kümmel <syntheticpp@gmx.net>2012-09-17 08:33:04 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-09-17 20:56:04 (GMT)
commitc14694621aab2e7df13830f80621fb5680b432e4 (patch)
tree70e1affa7f208777e7a72559e173f47b0f554948 /tools/configure
parent9d74928189d990b24cfdd2350fe5a092951d670d (diff)
downloadQt-c14694621aab2e7df13830f80621fb5680b432e4.zip
Qt-c14694621aab2e7df13830f80621fb5680b432e4.tar.gz
Qt-c14694621aab2e7df13830f80621fb5680b432e4.tar.bz2
undo variable renaming in backport
backport in commit fc6569921d4bc06e3d526f18d4b4cd3ef05c2025 was incomplete and broke building of configure.exe Change-Id: I2c8b3b38beeca5629bec5bb2ca814242b12f0318 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools/configure')
-rw-r--r--tools/configure/configureapp.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index bc3ee6e..d805cde 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -2950,7 +2950,7 @@ void Configure::generateOutputVars()
qtConfig += "qpa";
if (dictionary["CROSS_COMPILE"] == "yes")
- configStream << " cross_compile";
+ qtConfig << " cross_compile";
if (dictionary["NIS"] == "yes")
qtConfig += "nis";