Commit 5aa0f068 authored by Robert Loehning's avatar Robert Loehning
Browse files

Squish: Make __getMkspecFromQmake__() ready for Qt 5



Change-Id: I9a2776ad30f718b6d201f738e1f1f158110c1f29
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent bf3ab4f0
......@@ -160,6 +160,9 @@ def __getMkspecFromQMakeConf__(qmakeConf):
return os.path.basename(mkspec)
def __getMkspecFromQmake__(qmakeCall):
if getOutputFromCmdline("%s -query QT_VERSION" % qmakeCall).strip().startswith("5."):
return getOutputFromCmdline("%s -query QMAKE_XSPEC" % qmakeCall).strip()
else:
QmakeConfPath = getOutputFromCmdline("%s -query QMAKE_MKSPECS" % qmakeCall).strip()
for tmpPath in QmakeConfPath.split(os.pathsep):
tmpPath = tmpPath + os.sep + "default" + os.sep +"qmake.conf"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment