From 4e5cafb84a28082090da75c4781930cc987c019b Mon Sep 17 00:00:00 2001 From: axis 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. --- qtbase/bin/syncqt.bat | 6 ++++-- qtbase/mkspecs/features/default_pre.prf | 3 ++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/qtbase/bin/syncqt.bat b/qtbase/bin/syncqt.bat index dd0da87..5167f3b 100755 --- a/qtbase/bin/syncqt.bat +++ b/qtbase/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/qtbase/mkspecs/features/default_pre.prf b/qtbase/mkspecs/features/default_pre.prf index b8779c8..adcdbb7 100644 --- a/qtbase/mkspecs/features/default_pre.prf +++ b/qtbase/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) } -- 1.7.3.2.343.g7d43d