feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Squish: Working around QTCREATORBUG-7002

Browse Source 
Change-Id: If575398e4ea9f7dcd4b31ebdf49708f2b2dcbc15
Reviewed-by: Bill King <bill.king@nokia.com>
This commit is contained in:
Robert Loehning
2012-02-27 20:36:13 +01:00
committed by Robert Löhning
parent 25decf2052
commit f92b8486af
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/system/shared/classes.py
+4 -1
View File
@@ -12,6 +12,7 @@ class QtQuickConstants:
SYMBIAN = 4
MAEMO5 = 8
HARMATTAN = 16
EMBEDDED_LINUX = 32
@staticmethod
def getStringForComponents(components):
@@ -38,6 +39,8 @@ class QtQuickConstants:
return "Qt Simulator"
elif target==QtQuickConstants.Targets.HARMATTAN:
return "Harmattan"
elif target==QtQuickConstants.Targets.EMBEDDED_LINUX:
return "Embedded Linux"
else:
return None
@@ -45,7 +48,7 @@ class QtQuickConstants:
def getAllTargets():
return [QtQuickConstants.Targets.DESKTOP, QtQuickConstants.Targets.HARMATTAN,
QtQuickConstants.Targets.MAEMO5, QtQuickConstants.Targets.SIMULATOR,
QtQuickConstants.Targets.SYMBIAN]
QtQuickConstants.Targets.SYMBIAN, QtQuickConstants.Targets.EMBEDDED_LINUX]
@staticmethod
def getAllTargetStrings():
tests/system/shared/project.py
+1
View File
@@ -436,6 +436,7 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
test.warning("Returning None (__getSupportedPlatforms__())",
"Parsed text: '%s'" % text)
return None, None
JIRA.performWorkaroundIfStillOpen(7002, JIRA.Bug.CREATOR, result)
if getAsStrings:
result = QtQuickConstants.getTargetsAsStrings(result)
return result, version
tests/system/shared/workarounds.py
+7 -1
View File
@@ -171,7 +171,8 @@ class JIRA:
'QTCREATORBUG-6853':self._workaroundCreator6853_,
'QTCREATORBUG-6918':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
def _exitFatal_(self, bugType, number):
@@ -191,3 +192,8 @@ class JIRA:
def _workaroundCreator_MacEditorFocus_(self, *args):
editor = args[0]
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)