forked from qt-creator/qt-creator
Squish: Revert workarounds for fixed bug
This reverts commits47355608dband6cc61be23b. Task-number: QTCREATORBUG-19717 Change-Id: I052ff84ab33a5c483c11b66eaf55a175cc34c28d Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -255,18 +255,9 @@ class JIRA:
|
||||
# for later lookup which function to call for which bug
|
||||
# ALWAYS update this dict when adding a new function for a workaround!
|
||||
def __initBugDict__(self):
|
||||
self.__bugs__= {
|
||||
'QTCREATORBUG-19717':self._workaroundCreator19717_,
|
||||
}
|
||||
self.__bugs__= {}
|
||||
# helper function - will be called if no workaround for the requested bug is deposited
|
||||
def _exitFatal_(self, bugType, number):
|
||||
test.fatal("No workaround found for bug %s-%d" % (bugType, number))
|
||||
|
||||
############### functions that hold workarounds #################################
|
||||
|
||||
def _workaroundCreator19717_(self, *args):
|
||||
targetname = Targets.getStringForTarget(Targets.DESKTOP_5_3_1_DEFAULT)
|
||||
switchViewTo(ViewConstants.PROJECTS)
|
||||
mouseClick(waitForObjectItem(":Projects.ProjectNavigationTreeView",
|
||||
"Build & Run." + targetname.replace(".", "\\.")))
|
||||
switchViewTo(ViewConstants.EDIT)
|
||||
|
||||
@@ -124,8 +124,6 @@ def main():
|
||||
if not startedWithoutPluginError():
|
||||
return
|
||||
|
||||
JIRA.performWorkaroundForBug(19717)
|
||||
|
||||
# if Debug is enabled - 1 valid kit is assigned - real check for this is done in tst_qml_locals
|
||||
fancyDebugButton = waitForObject(":*Qt Creator.Start Debugging_Core::Internal::FancyToolButton")
|
||||
if test.verify(waitFor('fancyDebugButton.enabled', 5000), "Start Debugging is enabled."):
|
||||
|
||||
@@ -43,7 +43,6 @@ def main():
|
||||
startApplication('qtcreator' + SettingsPath + ' "%s"' % qmlProjFile)
|
||||
if not startedWithoutPluginError():
|
||||
return
|
||||
JIRA.performWorkaroundForBug(19717)
|
||||
waitFor('object.exists(":Qt Creator_Utils::NavigationTreeView")', 10000)
|
||||
fancyConfButton = findObject(":*Qt Creator_Core::Internal::FancyToolButton")
|
||||
fancyRunButton = findObject(":*Qt Creator.Run_Core::Internal::FancyToolButton")
|
||||
|
||||
@@ -42,7 +42,7 @@ def main():
|
||||
test.fatal("Failed to activate kit %s" % kit)
|
||||
continue
|
||||
test.log("Running project Qt Quick UI Prototype (%s)" % kit)
|
||||
qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(1, 0, workingDir, projectName, 11223, quick)
|
||||
qmlViewer = modifyRunSettingsForHookIntoQtQuickUI(2, 1, workingDir, projectName, 11223, quick)
|
||||
if qmlViewer!=None:
|
||||
qmlViewerPath = os.path.dirname(qmlViewer)
|
||||
qmlViewer = os.path.basename(qmlViewer)
|
||||
|
||||
Reference in New Issue
Block a user