Merge remote-tracking branch 'origin/9.0' into qds/dev

Change-Id: I5f72661f1fc54ff861e2cbbaa4cb32f867924c3b

5 files changed, 19 insertions, 15 deletions

diff --git a/tests/manual/cmakepresets/CMakePresets.json b/tests/manual/cmakepresets/CMakePresets.json
index f4eb2283263..90e2df58369 100644
--- a/tests/manual/cmakepresets/CMakePresets.json
+++ b/tests/manual/cmakepresets/CMakePresets.json
@@ -12,7 +12,7 @@
       "generator": "Ninja",
       "installDir": "../inst-${presetName}",
       "cacheVariables": {
-        "CMAKE_PREFIX_PATH": "c:/Qt/6.3.2/mingw_64"
+        "CMAKE_PREFIX_PATH": "$env{SYSTEMDRIVE}/Qt/6.3.2/mingw_64"
       },
       "condition": {
         "type": "equals",
@@ -20,7 +20,7 @@
         "rhs": "Windows"
       },
       "environment": {
-        "PATH": "c:/Qt/Tools/mingw1120_64/bin;$penv{PATH}"
+        "PATH": "$env{SYSTEMDRIVE}/Qt/Tools/mingw1120_64/bin;$penv{PATH}"
       },
       "debug" : {
         "find" : true
@@ -34,7 +34,7 @@
       "inherits" : "mingw",
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Release",
-        "CMAKE_PREFIX_PATH": "c:/Qt/6.3.2/mingw_64"
+        "CMAKE_PREFIX_PATH": "$env{SystemDrive}/Qt/6.3.2/mingw_64"
       }
     },
     {
@@ -45,7 +45,7 @@
       "architecture" : {
         "value": "x64"
       },
-      "toolchainFile" : "c:/Qt/6.3.2/msvc2019_64/lib/cmake/Qt6/qt.toolchain.cmake",
+      "toolchainFile" : "../cmakepresets/msvc-toolchain.cmake",
       "condition" : {
         "type": "not",
         "condition": {
@@ -55,7 +55,8 @@
         }
       },
       "environment" : {
-        "HOST_SYSTEM_NAME": "Windows"
+        "HOST_SYSTEM_NAME": "Windows",
+        "QT_VERSION": "6.3.2"
       }
     },
     {
diff --git a/tests/manual/cmakepresets/msvc-toolchain.cmake b/tests/manual/cmakepresets/msvc-toolchain.cmake
new file mode 100644
index 00000000000..ae5b6fc9283
--- /dev/null
+++ b/tests/manual/cmakepresets/msvc-toolchain.cmake
@@ -0,0 +1 @@
+include($ENV{SYSTEMDRIVE}/Qt/$ENV{QT_VERSION}/msvc2019_64/lib/cmake/Qt6/qt.toolchain.cmake)
diff --git a/tests/system/objects.map b/tests/system/objects.map
index 6d7a96a03fa..ab349732385 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -14,12 +14,12 @@
 :*Qt Creator_Utils::FilterLineEdit	{type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Utils::IconButton	{occurrence='4' type='Utils::IconButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :About Qt Creator_Core::Internal::VersionDialog	{type='Core::Internal::VersionDialog' unnamed='1' visible='1' windowTitle='About Qt Creator'}
-:Add Bookmark.ExpandBookmarksList_QToolButton	{name='toolButton' text='+' type='QToolButton' visible='1' window=':Add Bookmark_BookmarkDialog'}
-:Add Bookmark.New Folder_QPushButton	{name='newFolderButton' text='New Folder' type='QPushButton' visible='1' window=':Add Bookmark_BookmarkDialog'}
+:Add Bookmark.ExpandBookmarksList_QToolButton	{text='+' type='QToolButton' unnamed='1' visible='1' window=':Add Bookmark_BookmarkDialog'}
+:Add Bookmark.New Folder_QPushButton	{text='New Folder' type='QPushButton' unnamed='1' visible='1' window=':Add Bookmark_BookmarkDialog'}
 :Add Bookmark.OK_QPushButton	{text='OK' type='QPushButton' unnamed='1' visible='1' window=':Add Bookmark_BookmarkDialog'}
 :Add Bookmark.treeView_QExpandingLineEdit	{container=':Add Bookmark.treeView_QTreeView' type='QExpandingLineEdit' unnamed='1' visible='1'}
-:Add Bookmark.treeView_QTreeView	{name='treeView' type='QTreeView' visible='1' window=':Add Bookmark_BookmarkDialog'}
-:Add Bookmark_BookmarkDialog	{name='BookmarkDialog' type='BookmarkDialog' visible='1' windowTitle='Add Bookmark'}
+:Add Bookmark.treeView_QTreeView	{type='QTreeView' unnamed='1' visible='1' window=':Add Bookmark_BookmarkDialog'}
+:Add Bookmark_BookmarkDialog	{type='BookmarkDialog' unnamed='1' visible='1' windowTitle='Add Bookmark'}
 :Add to Version Control.No_QPushButton	{text='No' type='QPushButton' unnamed='1' visible='1' window=':Add to Version Control_QMessageBox'}
 :Add to Version Control_QMessageBox	{type='QMessageBox' unnamed='1' visible='1' windowTitle='Add to Version Control'}
 :Analyzer Toolbar.AnalyzerManagerToolBox_QComboBox	{container=':DebugModeWidget.Toolbar_QDockWidget' name='PerspectiveChooser' type='QComboBox' visible='1'}
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index aa39725745b..4e26d3913fc 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -280,11 +280,12 @@ def addCurrentCreatorDocumentation():
     clickButton(waitForObject("{type='QPushButton' name='addButton' visible='1' text='Add...'}"))
     selectFromFileDialog(docPath)
     try:
-        waitForObject("{type='QMessageBox' unnamed='1' visible='1' "
-                      "text~='Unable to register documentation.*'}", 3000)
+        windowStr = ("{type='QMessageBox' unnamed='1' visible='1' "
+                      "text~='Unable to register documentation.*'}")
+        waitForObject(windowStr, 3000)
         test.passes("Qt Creator's documentation found already registered.")
         clickButton(waitForObject("{type='QPushButton' text='OK' unnamed='1' visible='1' "
-                                  "container={name='groupBox' type='QGroupBox' visible='1'}}"))
+                                  "window=%s}" % windowStr))
     except:
         test.fail("Added Qt Creator's documentation explicitly.")
     clickButton(waitForObject(":Options.OK_QPushButton"))
diff --git a/tests/system/suite_HELP/tst_HELP06/test.py b/tests/system/suite_HELP/tst_HELP06/test.py
index 6b9e1c57246..96c3cc8b46f 100644
--- a/tests/system/suite_HELP/tst_HELP06/test.py
+++ b/tests/system/suite_HELP/tst_HELP06/test.py
@@ -11,11 +11,10 @@ def renameBookmarkFolder(view, item, newName):
     return
 
 def invokeContextMenuItemOnBookmarkFolder(view, item, menuItem):
-    aboveWidget = "{name='line' type='QFrame' visible='1' window=':Add Bookmark_BookmarkDialog'}"
     mouseClick(waitForObjectItem(view, item))
     openItemContextMenu(view, item, 5, 5, 0)
-    activateItem(waitForObject("{aboveWidget=%s type='QMenu' unnamed='1' visible='1' "
-                               "window=':Add Bookmark_BookmarkDialog'}" % aboveWidget), menuItem)
+    activateItem(waitForObjectItem("{type='QMenu' unnamed='1' visible='1' "
+                                   "window=':Add Bookmark_BookmarkDialog'}", menuItem))
 
 def textForQtVersion(text):
     suffix = "Qt Creator Manual"
@@ -51,6 +50,8 @@ def main():
     # create root bookmark directory
     clickButton(waitForObject(":Add Bookmark.New Folder_QPushButton"))
     # rename root bookmark directory
+    bookmarkDialog = waitForObject(":Add Bookmark_BookmarkDialog")
+    waitFor("bookmarkDialog.isActiveWindow")
     bookmarkView = waitForObject(":Add Bookmark.treeView_QTreeView")
     renameBookmarkFolder(bookmarkView, "New Folder*", "Sample")
     # create two more subfolders