From 89d36b418ae980e1db766c54d9b444b4932472c2 Mon Sep 17 00:00:00 2001
From: Robert Loehning <robert.loehning@qt.io>
Date: Mon, 12 Oct 2020 21:19:44 +0200
Subject: Make Help mode Squish-testable again

Change-Id: I09bcdb63c44c4728cce63d5a5c2b29bf9fc96ac1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 tests/system/shared/utils.py               |  6 +++---
 tests/system/suite_HELP/tst_HELP04/test.py | 16 +++-------------
 2 files changed, 6 insertions(+), 16 deletions(-)

(limited to 'tests')

diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index 26afa78c8a..e3adb5c49d 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -670,9 +670,9 @@ def getChildByClass(parent, classToSearchFor, occurrence=1):
         return children[occurrence - 1]
 
 def getHelpViewer():
-    return waitForObject("{type='Help::Internal::TextBrowserHelpWidget' unnamed='1' "
-                         "visible='1' window=':Qt Creator_Core::Internal::MainWindow'}",
+    return waitForObject("{type='QLiteHtmlWidget' unnamed='1' visible='1' "
+                         "window=':Qt Creator_Core::Internal::MainWindow'}",
                          1000)
 
 def getHelpTitle():
-    return str(getHelpViewer().documentTitle)
+    return str(getHelpViewer().title())
diff --git a/tests/system/suite_HELP/tst_HELP04/test.py b/tests/system/suite_HELP/tst_HELP04/test.py
index 8a3049c173..18e3ee4563 100644
--- a/tests/system/suite_HELP/tst_HELP04/test.py
+++ b/tests/system/suite_HELP/tst_HELP04/test.py
@@ -32,27 +32,17 @@ urlDictionary = { "abundance":"qthelp://com.trolltech.qt.487/qdoc/gettingstarted
 
 
 def __getSelectedText__():
-    hv = getHelpViewer()
     try:
-        return hv.textCursor().selectedText()
-    except:
-        pass
-    try:
-        test.log("Falling back to searching for selection in HTML.")
-        return getHighlightsInHtml(str(hv.toHtml()))
+        return str(getHelpViewer().selectedText())
     except:
         test.warning("Could not get highlighted text.")
         return str("")
 
 def __getUrl__():
-    helpViewer = getHelpViewer()
     try:
-        url = helpViewer.url
+        url = getHelpViewer().url()
     except:
-        try:
-            url = helpViewer.source
-        except:
-            return ""
+        return ""
     return str(url.scheme) + "://" + str(url.host) + str(url.path)
 
 def getHighlightsInHtml(htmlCode):
-- 
cgit v1.2.3