Commit 02143685 authored by Robert Loehning's avatar Robert Loehning

Squish: Removed workaround for QTCREATORBUG-6994

Change-Id: Id4e5ee4f9235b768a3145e6c562e29e1662ac72d
Reviewed-by: default avatarChristian Stenger <christian.stenger@digia.com>
parent 471f44aa
......@@ -151,7 +151,6 @@ def __verifyFileCreation__(path, expectedFiles):
def createProject_Qt_GUI(path, projectName, checks = True):
template = "Qt Gui Application"
available = __createProjectSelectType__(" Applications", template)
JIRA.performWorkaroundIfStillOpen(6994, JIRA.Bug.CREATOR, template, available)
__createProjectSetNameAndPath__(path, projectName, checks)
__selectQtVersionDesktop__(checks, available)
......
......@@ -209,8 +209,7 @@ class JIRA:
def __initBugDict__(self):
self.__bugs__= {
'QTCREATORBUG-6853':self._workaroundCreator6853_,
'QTCREATORBUG-6918':self._workaroundCreator_MacEditorFocus_,
'QTCREATORBUG-6994':self._workaroundCreator6994_
'QTCREATORBUG-6918':self._workaroundCreator_MacEditorFocus_
}
# helper function - will be called if no workaround for the requested bug is deposited
def _exitFatal_(self, bugType, number):
......@@ -218,16 +217,6 @@ class JIRA:
############### functions that hold workarounds #################################
def _workaroundCreator6994_(self, *args):
if args[0] in ('Mobile Qt Application', 'Qt Gui Application', 'Qt Custom Designer Widget'):
if QtQuickConstants.Targets.HARMATTAN in args[1]:
args[1].remove(QtQuickConstants.Targets.HARMATTAN)
elif QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.HARMATTAN) in args[1]:
args[1].remove(QtQuickConstants.getStringForTarget(QtQuickConstants.Targets.HARMATTAN))
else:
test.warning('Expected Harmattan in targets, failed to find, but bug still marked as open')
test.xverify(False, "Removed Harmattan from expected targets.")
def _workaroundCreator6853_(self, *args):
if "Release" in args[0] and platform.system() == "Linux":
snooze(2)
......
......@@ -71,7 +71,6 @@ def main():
pass
waitForObject("{type='QLabel' unnamed='1' visible='1' text='Kit Selection'}")
availableCheckboxes = filter(visibleCheckBoxExists, kits.keys())
JIRA.performWorkaroundIfStillOpen(6994, JIRA.Bug.CREATOR, template, displayedPlatforms)
# verification whether expected, found and configured match
for t in kits:
if requiredVersion:
......
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