clean up syncqt invocation

it needs no special env variables any more

Change-Id: I60a7ab6eabb9280b02cd510418c0842d05fc1306
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

diff --git a/configure b/configure
index 876dd07..c3c87ec 100755 (executable)
--- a/configure
+++ b/configure
@@ -3544,7 +3544,7 @@ if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then
     if [ "$OPT_SHADOW" = "yes" ]; then
         "$outpath/bin/syncqt" $SYNCQT_OPTS "$relpath" || exit 1
     elif [ "$CFG_DEV" = "yes" ] || [ ! -d $relpath/include ] || [ -d $relpath/.git ]; then
-        QTDIR="$relpath" perl "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1
+        "$outpath/bin/syncqt" $SYNCQT_OPTS || exit 1
     fi
 fi
 

diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 8396829..ac2d56d 100644 (file)
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3399,10 +3399,7 @@ void Configure::generateHeaders()
             QStringList args;
             args += buildPath + "/bin/syncqt.bat";
             args += sourcePath;
-            QStringList env;
-            env += QString("QTDIR=" + sourcePath);
-            env += QString("PATH=" + buildPath + "/bin/;" + qgetenv("PATH"));
-            int retc = Environment::execute(args, env, QStringList());
+            int retc = Environment::execute(args, QStringList(), QStringList());
             if (retc) {
                 cout << "syncqt failed, return code " << retc << endl << endl;
                 dictionary["DONE"] = "error";