| State This property holds a list of states defined by the item.'
+ {'text':' | State This property holds the list of possible states for this item. '
+ 'To change the state of this item, set the state property to one of these states, or set the state property '
+ 'to an empty string to revert the item to its default state.'
' |  |
'},
- {'text':'| Transition This property holds a list of transitions defined by '
- 'the item. | |
'}
+ {'text':'| Transition This property holds the list of transitions for this item. '
+ 'These define the transitions to be applied to the item whenever it changes its state.'
+ ' | |
'}
]
- alternativeValues = [{"text":"boolean"}, {"text":"string"}, {"text":"State"}, {"text":"Transition"}]
+ alternativeValues = [{"text":"Rectangle" if JIRA.isBugStillOpen(20020) else "boolean"},
+ {"text":"string"}, {"text":"State"}, {"text":"Transition"}]
verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, expectedValues, alternativeValues)
test.log("Testing hovering expressions")
- openDocument("focus.QML.qml" + os.sep + "focus.focus\\.qml")
+ openDocument(focusDocumentPath % "focus\\.qml")
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
lines=['color:\s*"black"', 'color:\s*"#3E606F"']
additionalKeyPresses = [""]
@@ -157,7 +164,7 @@ def testHovering():
alternativeValues = [None, "#39616B"]
expectedTypes = ["ColorTip", "ColorTip"]
verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, expectedValues, alternativeValues)
- openDocument("focus.QML.qml" + os.sep + "focus.FocusCore.ListMenu\\.qml")
+ openDocument(focusDocumentPath % "Core.ListMenu\\.qml")
editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
lines=['Rectangle\s*\{.*color:\s*"#D1DBBD"', 'NumberAnimation\s*\{\s*.*Easing.OutQuint\s*\}']
additionalKeyPresses = ["", "", "", ""]
diff --git a/tests/system/suite_general/tst_opencreator_qbs/test.py b/tests/system/suite_general/tst_opencreator_qbs/test.py
index 60cc0d34444..9a11127df8f 100644
--- a/tests/system/suite_general/tst_opencreator_qbs/test.py
+++ b/tests/system/suite_general/tst_opencreator_qbs/test.py
@@ -26,9 +26,8 @@
source("../../shared/qtcreator.py")
def main():
- if platform.system() == 'Darwin':
- test.warning("This needs a Qt 5.4 kit. Skipping it.")
- return
+ test.warning("This needs a Qt 5.6.2 kit. Skipping it.")
+ return
pathCreator = os.path.join(srcPath, "creator", "qtcreator.qbs")
if not neededFilePresent(pathCreator):
return
diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py
index ee55e9c2b47..7bf2c882ea7 100644
--- a/tests/system/suite_general/tst_rename_file/test.py
+++ b/tests/system/suite_general/tst_rename_file/test.py
@@ -101,8 +101,12 @@ def renameFile(projectDir, proFile, branch, oldname, newname):
else:
menu = ":Qt Creator.Project.Menu.File_QMenu"
activateItem(waitForObjectItem(menu, "Rename..."))
- type(waitForObject(":Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit"), newname)
- type(waitForObject(":Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit"), "")
+ replaceEdit = waitForObject(":Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit")
+ if not (oldname.lower().endswith(".qrc") and JIRA.isBugStillOpen(20057)):
+ test.compare(replaceEdit.selectedText, oldname.rsplit(".", 1)[0],
+ "Only the filename without the extension is selected?")
+ replaceEditorContent(replaceEdit, newname)
+ type(replaceEdit, "")
test.verify(waitFor("os.path.exists(newFilePath)", 1000),
"Verify that file with new name exists: %s" % newFilePath)
test.compare(readFile(newFilePath), oldFileText,
diff --git a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
index 6338fdb94ec..b47da5d58d7 100644
--- a/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
+++ b/tests/system/suite_qtquick/tst_qtquick_creation3/test.py
@@ -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)
|