From f8139a07533e912b24173ed24a041d861043dcfb Mon Sep 17 00:00:00 2001 From: Markku Heikkila Date: Fri, 27 Jan 2012 16:11:05 +0200 Subject: 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 --- tools/configure/configureapp.cpp | 16 +++++++++++----- 1 file 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"; } -- cgit v0.12