From 9706252fb9df7b3a52624b99963e43e30a9515c7 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Sat, 21 Mar 2015 22:01:49 +0000 Subject: [PATCH] Only trust errors for macdeployqt 5+ #4464 --- ext/toolchain/commands1.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 3b234161..9f4cb4a5 100644 --- 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"