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,15 +160,18 @@ def __getMkspecFromQMakeConf__(qmakeConf): ...@@ -160,15 +160,18 @@ def __getMkspecFromQMakeConf__(qmakeConf):
return os.path.basename(mkspec) return os.path.basename(mkspec)
def __getMkspecFromQmake__(qmakeCall): def __getMkspecFromQmake__(qmakeCall):
QmakeConfPath = getOutputFromCmdline("%s -query QMAKE_MKSPECS" % qmakeCall).strip() if getOutputFromCmdline("%s -query QT_VERSION" % qmakeCall).strip().startswith("5."):
for tmpPath in QmakeConfPath.split(os.pathsep): return getOutputFromCmdline("%s -query QMAKE_XSPEC" % qmakeCall).strip()
tmpPath = tmpPath + os.sep + "default" + os.sep +"qmake.conf" else:
result = __getMkspecFromQMakeConf__(tmpPath) QmakeConfPath = getOutputFromCmdline("%s -query QMAKE_MKSPECS" % qmakeCall).strip()
if result != None: for tmpPath in QmakeConfPath.split(os.pathsep):
return result.strip() tmpPath = tmpPath + os.sep + "default" + os.sep +"qmake.conf"
test.warning("Could not find qmake.conf inside provided QMAKE_MKSPECS path", result = __getMkspecFromQMakeConf__(tmpPath)
"QMAKE_MKSPECS returned: '%s'" % QmakeConfPath) if result != None:
return None return result.strip()
test.warning("Could not find qmake.conf inside provided QMAKE_MKSPECS path",
"QMAKE_MKSPECS returned: '%s'" % QmakeConfPath)
return None
# helper that double clicks the table view at specified row and column # helper that double clicks the table view at specified row and column
# returns the QExpandingLineEdit (the editable table cell) # returns the QExpandingLineEdit (the editable table cell)
......
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