blob: ea8983b1b4433076dba03c6d4aba38b1f2f5953b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From 97113c469f9f8903279c8c8da8e20ccad253e79d 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.
---
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.5.rc2.4.g4d8b3
|
