summaryrefslogtreecommitdiffstats
path: root/tools/configure/configureapp.h
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-11-15 20:49:43 +0100
committerOswald Buddenhagen <oswald.buddenhagen@qt.io>2016-12-13 18:55:32 +0000
commit8ebc7e967c5d245ffab5dcbf666fc01a4df4fe6a (patch)
tree46fab2186cc4c6946fe3d9da8356a4f5b25a552d /tools/configure/configureapp.h
parent24cb1580e2bdb9eace8a419dcc44bffe13ed1550 (diff)
move configure -redo handling (mostly) to qmake-based system
the qmake bootstrap uses some of the options, so the configures still read config.opt for their own purposes, but the general handling is entirely in the new system now. Change-Id: I2c6c657d4da01c8d520ac74795454747bb224bdd Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tools/configure/configureapp.h')
-rw-r--r--tools/configure/configureapp.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 8d11f07457..755a2e2696 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -63,7 +63,7 @@ private:
// Our variable dictionaries
QMap<QString,QString> dictionary;
- QStringList configCmdLine;
+ QStringList configCmdLine, qmakeCmdLine;
QString outputLine;
@@ -80,7 +80,6 @@ private:
QString formatPath(const QString &path);
bool reloadCmdLine(int idx);
- void saveCmdLine();
};
class FileWriter : public QTextStream