forked from qt-creator/qt-creator
Squish: Remove workaround for fixed bug
Change-Id: Ib6a47fbab85835fd33424134fefca153a3595d6b Reviewed-by: Robert Loehning <robert.loehning@digia.com>
This commit is contained in:
@@ -94,8 +94,6 @@ def widgetContainsPoint(widget, point):
|
|||||||
# at the same position where the text cursor is located at
|
# at the same position where the text cursor is located at
|
||||||
def openContextMenuOnTextCursorPosition(editor):
|
def openContextMenuOnTextCursorPosition(editor):
|
||||||
rect = editor.cursorRect(editor.textCursor())
|
rect = editor.cursorRect(editor.textCursor())
|
||||||
if platform.system() == 'Darwin':
|
|
||||||
JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, editor)
|
|
||||||
openContextMenu(editor, rect.x+rect.width/2, rect.y+rect.height/2, 0)
|
openContextMenu(editor, rect.x+rect.width/2, rect.y+rect.height/2, 0)
|
||||||
menuInList = [None]
|
menuInList = [None]
|
||||||
waitFor("menuVisibleAtEditor(editor, menuInList)", 5000)
|
waitFor("menuVisibleAtEditor(editor, menuInList)", 5000)
|
||||||
|
@@ -216,7 +216,6 @@ class JIRA:
|
|||||||
def __initBugDict__(self):
|
def __initBugDict__(self):
|
||||||
self.__bugs__= {
|
self.__bugs__= {
|
||||||
'QTCREATORBUG-6853':self._workaroundCreator6853_,
|
'QTCREATORBUG-6853':self._workaroundCreator6853_,
|
||||||
'QTCREATORBUG-8735':self._workaroundCreator_MacEditorFocus_
|
|
||||||
}
|
}
|
||||||
# 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):
|
||||||
@@ -227,7 +226,3 @@ class JIRA:
|
|||||||
def _workaroundCreator6853_(self, *args):
|
def _workaroundCreator6853_(self, *args):
|
||||||
if "Release" in args[0] and platform.system() == "Linux":
|
if "Release" in args[0] and platform.system() == "Linux":
|
||||||
snooze(2)
|
snooze(2)
|
||||||
|
|
||||||
def _workaroundCreator_MacEditorFocus_(self, *args):
|
|
||||||
editor = args[0]
|
|
||||||
nativeMouseClick(editor.mapToGlobal(QPoint(50, 50)).x, editor.mapToGlobal(QPoint(50, 50)).y, Qt.LeftButton)
|
|
||||||
|
@@ -63,9 +63,6 @@ def main():
|
|||||||
# - Press F2 or select from the menu: Tools / C++ / Follow Symbol under Cursor
|
# - Press F2 or select from the menu: Tools / C++ / Follow Symbol under Cursor
|
||||||
# Creator will show you the declaration of the variable.
|
# Creator will show you the declaration of the variable.
|
||||||
|
|
||||||
if platform.system() == "Darwin":
|
|
||||||
JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, cppwindow)
|
|
||||||
|
|
||||||
type(cppwindow, "<Ctrl+F>")
|
type(cppwindow, "<Ctrl+F>")
|
||||||
type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), " xi")
|
type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), " xi")
|
||||||
type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), "<Return>")
|
type(waitForObject(":*Qt Creator.findEdit_Utils::FilterLineEdit"), "<Return>")
|
||||||
|
@@ -61,8 +61,6 @@ def main():
|
|||||||
"Skipping this file for now.")
|
"Skipping this file for now.")
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if platform.system() == 'Darwin':
|
|
||||||
JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, editor)
|
|
||||||
contentBefore = readFile(currentFile)
|
contentBefore = readFile(currentFile)
|
||||||
popupText = "The file %s was removed. Do you want to save it under a different name, or close the editor?"
|
popupText = "The file %s was removed. Do you want to save it under a different name, or close the editor?"
|
||||||
os.remove(currentFile)
|
os.remove(currentFile)
|
||||||
|
@@ -91,8 +91,6 @@ def __modifyProFile__():
|
|||||||
# re-order some stuff inside header
|
# re-order some stuff inside header
|
||||||
def __modifyHeader__():
|
def __modifyHeader__():
|
||||||
global cppEditorStr, homeShortCut, endShortCut
|
global cppEditorStr, homeShortCut, endShortCut
|
||||||
if platform.system() == "Darwin":
|
|
||||||
JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, waitForObject(cppEditorStr, 1000))
|
|
||||||
if placeCursorToLine(cppEditorStr, "class.+", True):
|
if placeCursorToLine(cppEditorStr, "class.+", True):
|
||||||
type(cppEditorStr, homeShortCut)
|
type(cppEditorStr, homeShortCut)
|
||||||
markText(cppEditorStr, "Down", 5)
|
markText(cppEditorStr, "Down", 5)
|
||||||
|
@@ -51,8 +51,6 @@ def main():
|
|||||||
test.fatal("Could not get the editor for '%s'" % currentFile,
|
test.fatal("Could not get the editor for '%s'" % currentFile,
|
||||||
"Skipping this file for now.")
|
"Skipping this file for now.")
|
||||||
continue
|
continue
|
||||||
if platform.system() == 'Darwin':
|
|
||||||
JIRA.performWorkaroundForBug(8735, JIRA.Bug.CREATOR, editor)
|
|
||||||
for key in ["<Up>", "<Down>", "<Left>", "<Right>"]:
|
for key in ["<Up>", "<Down>", "<Left>", "<Right>"]:
|
||||||
test.log("Selecting everything")
|
test.log("Selecting everything")
|
||||||
invokeMenuItem("Edit", "Select All")
|
invokeMenuItem("Edit", "Select All")
|
||||||
|
Reference in New Issue
Block a user