Only trust errors for macdeployqt 5+ #4464

2015-03-21 22:01:49 +00:00 · 2015-03-21 22:01:49 +00:00 · 9706252fb9
parent 162ed1fef5
commit 9706252fb9
1 changed files with 4 additions and 1 deletions
--- a/ext/toolchain/commands1.py
+++ b/ext/toolchain/commands1.py
@ -788,7 +788,10 @@ class InternalCommands:

 		print output[1]
 		if "ERROR" in output[1]:
-			raise Exception("macdeployqt failed")
+			(qMajor, qMinor, qRev) = self.getQmakeVersion()
+			if qMajor >= 5:
+				# only listen to errors in qt 5+
+				raise Exception("macdeployqt failed")

 	def signmac(self):
 		print "signmac is now obsolete"