Squish: Don't expect WebEngine or WebKit

Change-Id: Ib44d0c7671b016c27e33ffd66e4797be37523ca3 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-04-18 19:09:20 +02:00
parent d57ab7f6b9
commit 0e216fda3e
4 changed files with 12 additions and 37 deletions
@@ -683,20 +683,9 @@ def getChildByClass(parent, classToSearchFor, occurrence=1):
        return children[occurrence - 1]

 def getHelpViewer():
-    try:
-        return waitForObject(":Qt Creator_Help::Internal::HelpViewer", 3000)
-    except:
-        pass
-    try:
-        return waitForObject("{type='QWebEngineView' unnamed='1' "
-                             "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 1000)
-    except:
-        return waitForObject("{type='Help::Internal::TextBrowserHelpWidget' unnamed='1' "
-                             "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}", 1000)
+    return waitForObject("{type='Help::Internal::TextBrowserHelpWidget' unnamed='1' "
+                         "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}",
+                         1000)

 def getHelpTitle():
-    hv = getHelpViewer()
-    try:
-        return str(hv.title)
-    except:
-        return str(hv.documentTitle)
+    return str(getHelpViewer().documentTitle)