Commit 09f0d1a2 authored by Robert Loehning's avatar Robert Loehning

Squish: Stabilize tst_HELP05

Change-Id: I9296dc577fac4ea06c7c8f482a44948ba327568f
Reviewed-by: Christian Stenger's avatarChristian Stenger <christian.stenger@qt.io>
parent edcce9c1
......@@ -544,13 +544,24 @@ def iterateKits(keepOptionsOpen=False, alreadyOnOptionsDialog=False,
else:
return result
# set "Always Start Full Help" in "Tools" -> "Options..." -> "Help" -> "General"
def setAlwaysStartFullHelp():
# set a help viewer that will always be used, regardless of Creator's width
class HelpViewer:
HELPMODE, SIDEBYSIDE, EXTERNALWINDOW = range(3)
def setFixedHelpViewer(helpViewer):
invokeMenuItem("Tools", "Options...")
waitForObjectItem(":Options_QListView", "Help")
clickItem(":Options_QListView", "Help", 5, 5, 0, Qt.LeftButton)
clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "General")
selectFromCombo(":Startup.contextHelpComboBox_QComboBox", "Always Show in Help Mode")
mode = "Always Show "
if helpViewer == HelpViewer.HELPMODE:
mode += "in Help Mode"
elif helpViewer == HelpViewer.SIDEBYSIDE:
mode += "Side-by-Side"
elif helpViewer == HelpViewer.EXTERNALWINDOW:
mode += "in External Window"
selectFromCombo(":Startup.contextHelpComboBox_QComboBox", mode)
clickButton(waitForObject(":Options.OK_QPushButton"))
def removePackagingDirectory(projectPath):
......
......@@ -52,6 +52,7 @@ def main():
for p in Qt5Path.getPaths(Qt5Path.DOCS):
qchs.append(os.path.join(p, "qtquick.qch"))
addHelpDocumentation(qchs)
setFixedHelpViewer(HelpViewer.SIDEBYSIDE)
# create qt quick application
createNewQtQuickApplication(tempDir(), "SampleApp")
editorArea = waitForObject(":Qt Creator_QmlJSEditor::QmlJSTextEditorWidget")
......
......@@ -79,7 +79,7 @@ def main():
if not startedWithoutPluginError():
return
setAlwaysStartFullHelp()
setFixedHelpViewer(HelpViewer.HELPMODE)
addCurrentCreatorDocumentation()
buttonsAndState = {'Projects':True, 'Examples':False, 'Tutorials':False}
......
......@@ -66,7 +66,7 @@ def main():
for p in Qt5Path.getPaths(Qt5Path.DOCS):
qchs.extend([os.path.join(p, "qtopengl.qch"), os.path.join(p, "qtwidgets.qch")])
addHelpDocumentation(qchs)
setAlwaysStartFullHelp()
setFixedHelpViewer(HelpViewer.HELPMODE)
wsButtonFrame, wsButtonLabel = getWelcomeScreenSideBarButton('Get Started Now')
if not test.verify(all((wsButtonFrame, wsButtonLabel)),
"Verifying: Qt Creator displays Welcome Page with Getting Started."):
......
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