From 8e4fc361a55c54fbaf5c813a5f3f344fd394bcaa Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Fri, 28 Jan 2011 15:17:00 +0100
Subject: [PATCH] Made sure syncqt gets called correctly even if it is not in
 the PATH.

---
 bin/syncqt.bat                   | 6 ++++--
 mkspecs/features/default_pre.prf | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/bin/syncqt.bat b/bin/syncqt.bat
index dd0da87..5167f3b 100755
--- a/bin/syncqt.bat
+++ b/bin/syncqt.bat
@@ -38,5 +38,7 @@
 :: $QT_END_LICENSE$
 ::
 :::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
-@rem ***** This assumes PERL is in the PATH *****
-@perl.exe -S syncqt %*
+@echo off
+rem ***** This assumes PERL is in the PATH *****
+set scriptpath=%~dp0
+perl.exe %scriptpath%syncqt %*
diff --git a/mkspecs/features/default_pre.prf b/mkspecs/features/default_pre.prf
index b8779c8..adcdbb7 100644
--- a/mkspecs/features/default_pre.prf
+++ b/mkspecs/features/default_pre.prf
@@ -25,7 +25,8 @@ exists($$_PRO_FILE_PWD_/sync.profile) {
     else:QTFWD="-qtdir $$QTDIR"
 
     message("Running syncqt for $$PRO_BASENAME in $$OUT_PWD")
-    system("$$QTDIR/bin/syncqt $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_")
+    qtPrepareTool(QMAKE_SYNCQT, syncqt)
+    system("$$QMAKE_SYNCQT $$QTFWD -outdir $$OUT_PWD $$_PRO_FILE_PWD_")
     unset(QTFWD)
     unset(PRO_BASENAME)
 }
-- 
2.7.4