rename the -redo status file to config.opt
configure.cache is really kinda misleading. the old name is still recognized for backwards compat. Change-Id: I5ca461e99a0f9336ad70adfa5b8f6bb81ad73bbb Reviewed-by: Lars Knoll <lars.knoll@qt.io>
This commit is contained in:
parent
2d83e28f08
commit
2b31f47098
1
.gitignore
vendored
1
.gitignore
vendored
@ -116,6 +116,7 @@ bin/qt.conf
|
||||
bin/servicefw*
|
||||
bin/sfwlisten*
|
||||
configure.cache
|
||||
config.opt
|
||||
config.status
|
||||
config.summary
|
||||
config.log
|
||||
|
@ -4240,20 +4240,22 @@ void Configure::readLicense()
|
||||
void Configure::reloadCmdLine(int idx)
|
||||
{
|
||||
if (dictionary[ "REDO" ] == "yes") {
|
||||
QFile inFile(buildPath + "/configure.cache");
|
||||
if (inFile.open(QFile::ReadOnly)) {
|
||||
QTextStream inStream(&inFile);
|
||||
while (!inStream.atEnd())
|
||||
configCmdLine.insert(idx++, inStream.readLine().trimmed());
|
||||
inFile.close();
|
||||
QFile inFile(buildPath + "/config.opt");
|
||||
if (!inFile.open(QFile::ReadOnly)) {
|
||||
inFile.setFileName(buildPath + "/configure.cache");
|
||||
if (!inFile.open(QFile::ReadOnly))
|
||||
return;
|
||||
}
|
||||
QTextStream inStream(&inFile);
|
||||
while (!inStream.atEnd())
|
||||
configCmdLine.insert(idx++, inStream.readLine().trimmed());
|
||||
}
|
||||
}
|
||||
|
||||
void Configure::saveCmdLine()
|
||||
{
|
||||
if (dictionary[ "REDO" ] != "yes") {
|
||||
QFile outFile(buildPath + "/configure.cache");
|
||||
QFile outFile(buildPath + "/config.opt");
|
||||
if (outFile.open(QFile::WriteOnly | QFile::Text)) {
|
||||
QTextStream outStream(&outFile);
|
||||
for (QStringList::Iterator it = configCmdLine.begin(); it != configCmdLine.end(); ++it) {
|
||||
|
Loading…
Reference in New Issue
Block a user