diff options
| author | Markku Heikkila <markku.heikkila@digia.com> | 2012-01-27 14:11:05 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-01 18:19:09 (GMT) |
| commit | f8139a07533e912b24173ed24a041d861043dcfb (patch) | |
| tree | 6440b325ea3def374291424f3b6820845b03fa8d /tools/configure | |
| parent | 4c4466d84cee48624e1016e588d3eaada57c9541 (diff) | |
| download | Qt-f8139a07533e912b24173ed24a041d861043dcfb.zip Qt-f8139a07533e912b24173ed24a041d861043dcfb.tar.gz Qt-f8139a07533e912b24173ed24a041d861043dcfb.tar.bz2 | |
Make configure not complain about missing perl for non-dev. builds.
Fixed so that configure.exe is consistent with unix configure.
Task-number: QTBUG-5710
Change-Id: I74f35ea269e9ca6648866542a2bd1a15cda09ac0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 01dadae..514ba3e 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2076,11 +2076,17 @@ QString Configure::defaultTo(const QString &option) && option == "SQL_OCI") return "no"; - if (option == "SYNCQT" - && (!QFile::exists(sourcePath + "/bin/syncqt") || - !QFile::exists(sourcePath + "/bin/syncqt.bat"))) - return "no"; - + //Run syncqt for shadow build and developer build and sources from git + if (option == "SYNCQT") { + if ((buildPath != sourcePath) + || (dictionary["BUILDDEV"] == "yes") + || QDir(sourcePath + "/.git").exists()) + return "yes"; + if (!QFile::exists(sourcePath + "/bin/syncqt") + || !QFile::exists(sourcePath + "/bin/syncqt.bat") + || QDir(buildPath + "/include").exists()) + return "no"; + } return "yes"; } |