From 2b3055f7dc3d32664ff8932994ad17fa839c6b6c Mon Sep 17 00:00:00 2001
From: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Date: Fri, 10 May 2013 19:07:58 +0200
Subject: [PATCH] remove qtPrepareTool()'s ability to run batch files
it was only meant to automatically support syncqt.bat, which is gone
now.
fwiw, invoking batch files from within msys Makefiles was broken to
start with, as sh cannot directly run them.
Change-Id: I435568c578ce79e46f4e230e985ca9a04b34ffff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
---
mkspecs/features/qt_functions.prf | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index a5285068ed3..9ec22d57db9 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -197,11 +197,7 @@ defineTest(qtPrepareTool) {
exists($$eval($$1).pl) {
$$1 = perl -w $$eval($$1).pl
} else: contains(QMAKE_HOST.os, Windows) {
- exists($$eval($$1).bat) {
- $$1 = $$eval($$1).bat
- } else {
- $$1 = $$eval($$1).exe
- }
+ $$1 = $$eval($$1).exe
} else:contains(QMAKE_HOST.os, Darwin) {
BUNDLENAME = $$eval($$1).app/Contents/MacOS/$$2
exists($$BUNDLENAME) {
--
GitLab