summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/configure/configureapp.cpp14
-rw-r--r--tools/configure/configureapp.h2
2 files changed, 11 insertions, 5 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 890f06a9a7..24f89318fa 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -201,7 +201,10 @@ void Configure::parseCmdLine()
if (configCmdLine.at(k) == "-redo") {
dictionary["REDO"] = "yes";
configCmdLine.removeAt(k);
- reloadCmdLine(k);
+ if (!reloadCmdLine(k)) {
+ dictionary["DONE"] = "error";
+ return;
+ }
argCount = configCmdLine.size();
break;
}
@@ -1175,20 +1178,23 @@ void Configure::readLicense()
}
}
-void Configure::reloadCmdLine(int idx)
+bool Configure::reloadCmdLine(int idx)
{
QFile inFile(buildPathMangled + "/config.opt");
if (!inFile.open(QFile::ReadOnly)) {
inFile.setFileName(buildPath + "/config.opt");
if (!inFile.open(QFile::ReadOnly)) {
inFile.setFileName(buildPath + "/configure.cache");
- if (!inFile.open(QFile::ReadOnly))
- return;
+ if (!inFile.open(QFile::ReadOnly)) {
+ cout << "No config.opt present - cannot redo configuration." << endl;
+ return false;
+ }
}
}
QTextStream inStream(&inFile);
while (!inStream.atEnd())
configCmdLine.insert(idx++, inStream.readLine().trimmed());
+ return true;
}
void Configure::saveCmdLine()
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index da7d8885ce..436c9307b1 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -85,7 +85,7 @@ private:
void addConfStr(int group, const QString &val);
QString formatPath(const QString &path);
- void reloadCmdLine(int idx);
+ bool reloadCmdLine(int idx);
void saveCmdLine();
void applySpecSpecifics();