diff options
Diffstat (limited to 'tools/configure/configureapp.cpp')
| -rw-r--r-- | tools/configure/configureapp.cpp | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index cc46fb99cb..bf2d7aa8a7 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1015,35 +1015,21 @@ void Configure::configure() QStringList args; args << buildPath + "/bin/qmake" - << "-o" << "Makefile.cfg" - << sourcePath + "/configure.pri" + << sourcePathMangled << "--" << configCmdLine; + QString pwd = QDir::currentPath(); + QDir::setCurrent(buildPathMangled); if (int exitCode = Environment::execute(args, QStringList(), QStringList())) { cout << "Qmake failed, return code " << exitCode << endl << endl; dictionary[ "DONE" ] = "error"; } + QDir::setCurrent(pwd); if ((dictionary["REDO"] != "yes") && (dictionary["DONE"] != "error")) saveCmdLine(); } -void Configure::generateMakefiles() -{ - QString pwd = QDir::currentPath(); - { - QStringList args; - args << buildPath + "/bin/qmake" << sourcePathMangled; - - QDir::setCurrent(buildPathMangled); - if (int exitCode = Environment::execute(args, QStringList(), QStringList())) { - cout << "Qmake failed, return code " << exitCode << endl << endl; - dictionary[ "DONE" ] = "error"; - } - } - QDir::setCurrent(pwd); -} - bool Configure::showLicense(QString orgLicenseFile) { if (dictionary["LICENSE_CONFIRMED"] == "yes") { |