From 485469b5cd0a1f4bf9d51ad2ce615f5c3bc31e43 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Sat, 22 Aug 2015 15:44:15 -0700 Subject: [PATCH] #4978 Auto-detect Qt libraries location. --- ext/toolchain/commands1.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/ext/toolchain/commands1.py b/ext/toolchain/commands1.py index 503b05f1..5f85a3e3 100644 --- a/ext/toolchain/commands1.py +++ b/ext/toolchain/commands1.py @@ -769,12 +769,7 @@ class InternalCommands: if err != 0: raise Exception(bin + " failed with error: " + str(err)) - (qMajor, qMinor, qRev) = self.getQmakeVersion() - if qMajor <= 4: - frameworkRootDir = "/Library/Frameworks" - else: - # TODO: auto-detect, qt can now be installed anywhere. - frameworkRootDir = "/Developer/Qt5.2.1/5.2.1/clang_64/lib" + frameworkRootDir = commands.getoutput("qmake -query QT_INSTALL_LIBS") target = bundleTargetDir + "/Contents/Frameworks"