summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorMarkku Heikkila <markku.heikkila@digia.com>2011-09-07 18:08:34 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-09-07 18:14:18 (GMT)
commitb3de52be29a54aa23a446c7689a48f73206a7cbc (patch)
tree8df56da57423748017ea4408d5d8468e3db1c975 /tools
parent38b4b059e83bca2fe82a0826bdf69fd8b02b2827 (diff)
downloadQt-b3de52be29a54aa23a446c7689a48f73206a7cbc.zip
Qt-b3de52be29a54aa23a446c7689a48f73206a7cbc.tar.gz
Qt-b3de52be29a54aa23a446c7689a48f73206a7cbc.tar.bz2
Perl check for windows configure.
Works for Windows, *nix check is done by bash shell. Task-number: QTBUG-5710 Merge-request: 1362 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools')
-rw-r--r--tools/configure/configureapp.cpp26
1 files changed, 15 insertions, 11 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 31c359e..e6d8526 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3599,17 +3599,21 @@ void Configure::displayConfig()
#if !defined(EVAL)
void Configure::generateHeaders()
{
- if (dictionary["SYNCQT"] == "yes"
- && findFile("perl.exe")) {
- cout << "Running syncqt..." << endl;
- QStringList args;
- args += buildPath + "/bin/syncqt.bat";
- QStringList env;
- env += QString("QTDIR=" + sourcePath);
- env += QString("PATH=" + buildPath + "/bin/;" + qgetenv("PATH"));
- int retc = Environment::execute(args, env, QStringList());
- if (retc) {
- cout << "syncqt failed, return code " << retc << endl << endl;
+ if (dictionary["SYNCQT"] == "yes") {
+ if (findFile("perl.exe")) {
+ cout << "Running syncqt..." << endl;
+ QStringList args;
+ args += buildPath + "/bin/syncqt.bat";
+ QStringList env;
+ env += QString("QTDIR=" + sourcePath);
+ env += QString("PATH=" + buildPath + "/bin/;" + qgetenv("PATH"));
+ int retc = Environment::execute(args, env, QStringList());
+ if (retc) {
+ cout << "syncqt failed, return code " << retc << endl << endl;
+ dictionary["DONE"] = "error";
+ }
+ } else {
+ cout << "Perl not found in environment - cannot run syncqt." << endl;
dictionary["DONE"] = "error";
}
}