%2") diff --git a/src/plugins/studiowelcome/StudioWelcome.json.in b/src/plugins/studiowelcome/StudioWelcome.json.in index 5a4173de12f..6f029910334 100644 --- a/src/plugins/studiowelcome/StudioWelcome.json.in +++ b/src/plugins/studiowelcome/StudioWelcome.json.in @@ -2,7 +2,6 @@ \"Name\" : \"StudioWelcome\", \"Version\" : \"$$QTCREATOR_VERSION\", \"CompatVersion\" : \"$$QTCREATOR_COMPAT_VERSION\", - \"Revision\" : \"$$QTC_PLUGIN_REVISION\", \"DisabledByDefault\" : true, \"Vendor\" : \"The Qt Company Ltd\", \"Copyright\" : \"(C) $$QTCREATOR_COPYRIGHT_YEAR The Qt Company Ltd\", diff --git a/src/plugins/texteditor/basehoverhandler.cpp b/src/plugins/texteditor/basehoverhandler.cpp index 8d7fcad5173..34eb326b812 100644 --- a/src/plugins/texteditor/basehoverhandler.cpp +++ b/src/plugins/texteditor/basehoverhandler.cpp @@ -163,10 +163,13 @@ void BaseHoverHandler::operateTooltip(TextEditorWidget *editorWidget, const QPoi auto layout = new QVBoxLayout; layout->setContentsMargins(0, 0, 0, 0); auto label = new QLabel; + label->setObjectName("qcWidgetTipTopLabel"); label->setTextFormat(m_textFormat); label->setText(m_toolTip); layout->addWidget(label); - layout->addWidget(new QLabel("
" + helpContents)); + auto helpContentLabel = new QLabel("
" + helpContents); + helpContentLabel->setObjectName("qcWidgetTipHelpLabel"); + layout->addWidget(helpContentLabel); Utils::ToolTip::show(point, layout, editorWidget, helpItem); } } diff --git a/src/shared/qbs b/src/shared/qbs index 77541d68c13..846fc574f38 160000 --- a/src/shared/qbs +++ b/src/shared/qbs @@ -1 +1 @@ -Subproject commit 77541d68c135039a7ad3431ec1b2f00753e1028e +Subproject commit 846fc574f38395af24a9e60726372cb56075cff4 diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py index 8410e986ef9..52430e70214 100644 --- a/tests/system/shared/editor_utils.py +++ b/tests/system/shared/editor_utils.py @@ -159,8 +159,8 @@ def verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, e elif expectedType == "TextTip": __handleTextTips__(tip, expectedVals, altVal) elif expectedType == "WidgetTip": - test.warning("Sorry - WidgetTip checks aren't implemented yet.") - sendEvent("QMouseEvent", editor, QEvent.MouseMove, 0, -50, Qt.NoButton, 0) + __handleWidgetTips__(tip, expectedVals) + sendEvent("QMouseEvent", editor, QEvent.MouseMove, 0, 0, Qt.NoButton, 0) waitFor("isNull(tip)", 10000) # helper function that handles verification of TextTip hoverings @@ -228,6 +228,19 @@ def __handleColorTips__(colTip, expectedColor, alternativeColor): test.fail("ColorTip does not match - expected color '%X'%s got '%X'" % (uint(cmp.rgb()), altColorText, uint(rgb.rgb()))) +# helper function that handles verification of WidgetTip hoverings +# param widgetTip the WidgetTip object +# param expectedVals a dict holding property value pairs that must match +def __handleWidgetTips__(widgetTip, expectedVals): + toplabel = waitForObject("{type='QLabel' objectName='qcWidgetTipTopLabel' visible='1'}") + foundText = str(toplabel.text) + try: + helplabel = waitForObject("{type='QLabel' objectName='qcWidgetTipHelpLabel' visible='1'}", 1000) + foundText += str(helplabel.text) + except: + pass + test.compare(foundText, expectedVals["text"]) + # function that checks whether all expected properties (including their values) # match the given properties # param properties a dict holding the properties to check diff --git a/tests/system/suite_CSUP/tst_CSUP01/test.py b/tests/system/suite_CSUP/tst_CSUP01/test.py index d7d556721ce..8cac9bbfb0f 100644 --- a/tests/system/suite_CSUP/tst_CSUP01/test.py +++ b/tests/system/suite_CSUP/tst_CSUP01/test.py @@ -77,7 +77,7 @@ def main(): "possible to select one of the suggestions.") # Step 4: Insert text "voi" to new line and press Tab. resetLine(editorWidget) - type(editorWidget, "unsi") + type(editorWidget, "unsig") try: proposalListView = waitForObject(":popupFrame_Proposal_QListView") waitForObjectItem(proposalListView, "unsigned") diff --git a/tests/system/suite_editors/tst_qml_editor/test.py b/tests/system/suite_editors/tst_qml_editor/test.py index ecd9ab008e6..c26207ea6ec 100644 --- a/tests/system/suite_editors/tst_qml_editor/test.py +++ b/tests/system/suite_editors/tst_qml_editor/test.py @@ -122,35 +122,26 @@ def testHovering(): else: home = "
FocusScope \n Explicitly ' - 'creates a focus scope |  |
Rectangle \n Paints a filled rectangle with an ' - 'optional border | |
\n
Explicitly creates a focus scope.
'}, + {'text':'Rectangle\n
Paints a filled rectangle with an optional border.
'} ] - alternativeValues = [{"text":"FocusScope
"}, {"text":"Rectangle
"}] - verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, expectedValues, alternativeValues) + verifyHoveringOnEditor(editor, lines, additionalKeyPresses, expectedTypes, expectedValues) test.log("Testing hovering properties") openDocument(focusDocumentPath % "focus\\.qml") editor = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget") lines = ['focus:\s*true', 'color:\s*"black"', 'states:\s*State\s*\{', 'transitions:\s*Transition\s*\{'] - expectedTypes = ["TextTip", "TextTip", "TextTip", "TextTip"] + expectedTypes = ["TextTip", "WidgetTip", "WidgetTip", "WidgetTip"] expectedValues = [ {'text':'boolean This property indicates whether the item has focus ' 'within the enclosing focus scope. If true, this item will gain active focus when the enclosing ' 'focus scope gains active focus. In the following example, input will be given active focus ' 'when scope gains active focus. | |
string This property holds the color used to fill the rectangle.' - ' | |
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.' - ' | |
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.' - ' | |
boolean
"}, {"text":"string
"}, {"text":"State
"}, {"text":"Transition
"}] diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py index c39bdda57a2..5f867f1f983 100644 --- a/tests/system/suite_general/tst_rename_file/test.py +++ b/tests/system/suite_general/tst_rename_file/test.py @@ -53,16 +53,15 @@ def main(): ["Resources", "adding.qrc"], ["QML", "example.qml"]]: filenames = ["ABCD" + filename.upper(), "abcd" + filename.lower(), "test", "TEST", filename] + if filename.endswith(".h"): + filenames.remove("TEST") if filename.endswith(".qrc"): filenames = ["ABCD" + filename.lower(), "abcd" + filename.lower(), filename] previous = filenames[-1] for filename in filenames: tempFiletype = filetype - if (filetype == "Resources" and previous in ("test", "TEST") - or filetype == "QML" and not previous.endswith(".qml")): + if filetype == "QML" and not previous.endswith(".qml"): tempFiletype = "Other files" - elif filetype == "Sources" and previous in ("test", "TEST"): - tempFiletype = "Headers" renameFile(templateDir, usedProFile, projectName + "." + tempFiletype, previous, filename) # QTCREATORBUG-13176 does update the navigator async @@ -114,7 +113,7 @@ def renameFile(projectDir, proFile, branch, oldname, newname): "Verify that file with new name exists: %s" % newFilePath) test.compare(readFile(newFilePath), oldFileText, "Comparing content of file before and after renaming") - test.verify(waitFor("newname in safeReadFile(proFile)", 2000), + test.verify(waitFor("' ' + newname in safeReadFile(proFile)", 2000), "Verify that new filename '%s' was added to pro-file." % newname) if oldname not in newname: test.verify(oldname not in readFile(proFile),