Commit f92b8486 authored by Robert Loehning's avatar Robert Loehning Committed by Robert Löhning
Browse files

Squish: Working around QTCREATORBUG-7002



Change-Id: If575398e4ea9f7dcd4b31ebdf49708f2b2dcbc15
Reviewed-by: default avatarBill King <bill.king@nokia.com>
parent 25decf20
...@@ -12,6 +12,7 @@ class QtQuickConstants: ...@@ -12,6 +12,7 @@ class QtQuickConstants:
SYMBIAN = 4 SYMBIAN = 4
MAEMO5 = 8 MAEMO5 = 8
HARMATTAN = 16 HARMATTAN = 16
EMBEDDED_LINUX = 32
@staticmethod @staticmethod
def getStringForComponents(components): def getStringForComponents(components):
...@@ -38,6 +39,8 @@ class QtQuickConstants: ...@@ -38,6 +39,8 @@ class QtQuickConstants:
return "Qt Simulator" return "Qt Simulator"
elif target==QtQuickConstants.Targets.HARMATTAN: elif target==QtQuickConstants.Targets.HARMATTAN:
return "Harmattan" return "Harmattan"
elif target==QtQuickConstants.Targets.EMBEDDED_LINUX:
return "Embedded Linux"
else: else:
return None return None
...@@ -45,7 +48,7 @@ class QtQuickConstants: ...@@ -45,7 +48,7 @@ class QtQuickConstants:
def getAllTargets(): def getAllTargets():
return [QtQuickConstants.Targets.DESKTOP, QtQuickConstants.Targets.HARMATTAN, return [QtQuickConstants.Targets.DESKTOP, QtQuickConstants.Targets.HARMATTAN,
QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR, QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR,
QtQuickConstants.Targets.SYMBIAN] QtQuickConstants.Targets.SYMBIAN, QtQuickConstants.Targets.EMBEDDED_LINUX]
@staticmethod @staticmethod
def getAllTargetStrings(): def getAllTargetStrings():
......
...@@ -436,6 +436,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False): ...@@ -436,6 +436,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
test.warning("Returning None (__getSupportedPlatforms__())", test.warning("Returning None (__getSupportedPlatforms__())",
"Parsed text: '%s'" % text) "Parsed text: '%s'" % text)
return None, None return None, None
JIRA.performWorkaroundIfStillOpen(7002, JIRA.Bug.CREATOR, result)
if getAsStrings: if getAsStrings:
result = QtQuickConstants.getTargetsAsStrings(result) result = QtQuickConstants.getTargetsAsStrings(result)
return result, version return result, version
...@@ -171,7 +171,8 @@ class JIRA: ...@@ -171,7 +171,8 @@ class JIRA:
'QTCREATORBUG-6853':self._workaroundCreator6853_, 'QTCREATORBUG-6853':self._workaroundCreator6853_,
'QTCREATORBUG-6918':self._workaroundCreator_MacEditorFocus_, 'QTCREATORBUG-6918':self._workaroundCreator_MacEditorFocus_,
'QTCREATORBUG-6953':self._workaroundCreator_MacEditorFocus_, 'QTCREATORBUG-6953':self._workaroundCreator_MacEditorFocus_,
'QTCREATORBUG-6994':self._workaroundCreator6994_ 'QTCREATORBUG-6994':self._workaroundCreator6994_,
'QTCREATORBUG-7002':self._workaroundCreator7002_
} }
# helper function - will be called if no workaround for the requested bug is deposited # helper function - will be called if no workaround for the requested bug is deposited
def _exitFatal_(self, bugType, number): def _exitFatal_(self, bugType, number):
...@@ -191,3 +192,8 @@ class JIRA: ...@@ -191,3 +192,8 @@ class JIRA:
def _workaroundCreator_MacEditorFocus_(self, *args): def _workaroundCreator_MacEditorFocus_(self, *args):
editor = args[0] editor = args[0]
nativeMouseClick(editor.mapToGlobal(QPoint(50, 50)).x, editor.mapToGlobal(QPoint(50, 50)).y, Qt.LeftButton) nativeMouseClick(editor.mapToGlobal(QPoint(50, 50)).x, editor.mapToGlobal(QPoint(50, 50)).y, Qt.LeftButton)
def _workaroundCreator7002_(self, *args):
if platform.system() in ("Linux", "Darwin"):
result = args[0]
result.append(QtQuickConstants.Targets.EMBEDDED_LINUX)
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