From 0685a30ddee9e4c6832859d5c01d2e0c55795808 Mon Sep 17 00:00:00 2001
From: Cristian Adam <cristian.adam@qt.io>
Date: Mon, 9 Sep 2024 11:58:23 +0200
Subject: [PATCH 1/7] qtcreatorcdbext: Forward CMAKE_PREFIX_PATH to the
 subprojects

Otherwise find_package(Clang) will not find the LLVM installation and
lldb.exe will not be deployed in multi-arch configurations.

Change-Id: I7c067ea68cd047f45b7cca48f2d3798f04010586
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/libs/qtcreatorcdbext/CMakeLists.txt | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt
index 9f5e3f4ef49..4e21f5ab9d4 100644
--- a/src/libs/qtcreatorcdbext/CMakeLists.txt
+++ b/src/libs/qtcreatorcdbext/CMakeLists.txt
@@ -23,15 +23,19 @@ if (NOT QT_CREATOR_API_DEFINED)
       set(generator "Visual Studio 17 2022")
     endif()
 
+    string(REPLACE ";" "|" CMAKE_PREFIX_PATH_ALT_SEP "${CMAKE_PREFIX_PATH}")
+
     macro (setup_library arch)
       ExternalProject_Add(${arch}-bld
         SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}"
         CMAKE_GENERATOR "${generator}"
         CMAKE_GENERATOR_PLATFORM "${arch}"
+        LIST_SEPARATOR |
         CMAKE_ARGS
           -D${PROJECT_NAME}-MultiBuild=ON
           -DPythonTargetArchDll=${PythonTarget${arch}Dll}
           -DPython3_ROOT_DIR=${Python3_ROOT_DIR}
+          -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH_ALT_SEP}
         BUILD_COMMAND
           ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
         INSTALL_COMMAND
@@ -54,6 +58,12 @@ if (NOT QT_CREATOR_API_DEFINED)
         DESTINATION .
         COMPONENT qtcreatorcdbext
       )
+      install(CODE
+        "if (EXISTS \"${CMAKE_BINARY_DIR}/bin\")
+          file(COPY \"${CMAKE_BINARY_DIR}/bin\" DESTINATION \"${CMAKE_INSTALL_PREFIX}\")
+         endif()"
+        COMPONENT qtcreatorcdbext
+      )
     endif()
 
     return()

From eef8324f713ae61e7238b7143270dd6d2560a1e4 Mon Sep 17 00:00:00 2001
From: David Schulz <david.schulz@qt.io>
Date: Thu, 5 Sep 2024 13:46:49 +0200
Subject: [PATCH 2/7] TextEditor: Fix continue highlighting

The highlightStartBlock was incorrectly set to the block that was just
highlighted. This resulted in highlighting the same block over and over
again if it took longer than 20 ms to highlight. Fix this by setting the
highlightStartBlock after moving to the next block.

Additionally make sure that highlightStartBlock is set to INT_MAX after
the highlighting is done to ensure that the check of highlightStartBlock
in SyntaxHighlighterPrivate::reformatBlocks always uses the correct
start block.

Change-Id: I69ea0c7463913d55076601b6a545c127e5382685
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/texteditor/syntaxhighlighter.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/plugins/texteditor/syntaxhighlighter.cpp b/src/plugins/texteditor/syntaxhighlighter.cpp
index 0162cdeeff0..1c16870d7a6 100644
--- a/src/plugins/texteditor/syntaxhighlighter.cpp
+++ b/src/plugins/texteditor/syntaxhighlighter.cpp
@@ -228,6 +228,7 @@ void SyntaxHighlighterPrivate::reformatBlocks()
     QTC_ASSERT(endBlock.isValid(), endBlock = doc->lastBlock());
 
     while (block.isValid()) {
+        highlightStartBlock = block.blockNumber();
         if (et.elapsed() > 20)
             break;
 
@@ -239,7 +240,6 @@ void SyntaxHighlighterPrivate::reformatBlocks()
             forceRehighlightBlocks.remove(block.blockNumber());
             forceHighlightOfNextBlock = (block.userState() != stateBeforeHighlight);
         }
-        highlightStartBlock = block.blockNumber();
 
         if (block == endBlock && !forceHighlightOfNextBlock)
             break;
@@ -255,6 +255,7 @@ void SyntaxHighlighterPrivate::reformatBlocks()
             forceRehighlightBlocks << block.blockNumber();
     } else {
         highlightEndBlock = 0;
+        highlightStartBlock = INT_MAX;
         syntaxInfoUpToDate = true;
         emit q->finished();
     }

From c0adb7886f50c5418e075556578b458d39ca0202 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Brooke?= <aurelien@bahiasoft.fr>
Date: Thu, 5 Sep 2024 16:58:15 +0200
Subject: [PATCH 3/7] French translation: "Diagnostiques" -> "Diagnostics"

"Diagnostiques" doesn't exist in French, the correct spelling is "Diagnostics".

Change-Id: I8cb912f5ecabdf5a24abd24789a16b389cb429e5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Olivier Delaune <olivier+qt@delaune.info>
Reviewed-by: Alexandre Laurent <littlewhite.dev@gmail.com>
Reviewed-by: Johnny Jazeix <jazeix@gmail.com>
---
 share/qtcreator/translations/qtcreator_fr.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 19ae1e26c62..7b728df9070 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -17224,7 +17224,7 @@ Assurez-vous que la variable CMAKE_BUILD_TYPE contient le champ «&#xa0;Build ty
     </message>
     <message>
         <source>Diagnostics</source>
-        <translation>Diagnostiques</translation>
+        <translation>Diagnostics</translation>
     </message>
     <message>
         <source>Release</source>
@@ -35745,7 +35745,7 @@ Date d&apos;expiration&#xa0;: %3</translation>
     </message>
     <message>
         <source>Language Server Diagnostics</source>
-        <translation>Diagnostiques du serveur de langage</translation>
+        <translation>Diagnostics du serveur de langage</translation>
     </message>
     <message>
         <source>Issues provided by the Language Server in the current document.</source>

From 2f403042e83491f92c552c32b2697bd1bfb449ef Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Fri, 6 Sep 2024 12:20:12 +0200
Subject: [PATCH 4/7] Fix missing label in Qt Quick Application wizard

The label was too long in the german translation.

Use the shorter label that is used in the "compat" wizard, instead. This
unifies these two wizards and fixes a missing colon at the end too.

Fixes: QTCREATORBUG-31521
Change-Id: I16b148eb4ec6853b59935ce9c796f21160f61e6e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
(cherry picked from commit a061cebaa8b94edb569278517c3cb7ee301f2490)
---
 .../templates/wizards/projects/qtquickapplication/wizard.json   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
index 866350f8ac0..1b6dbd5aaab 100644
--- a/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
+++ b/share/qtcreator/templates/wizards/projects/qtquickapplication/wizard.json
@@ -50,7 +50,7 @@
                 },
                 {
                     "name": "MinimumSupportedQtVersion",
-                    "trDisplayName": "The minimum version of Qt you want to build the application for",
+                    "trDisplayName": "Minimum required Qt version:",
                     "type": "ComboBox",
                     "data":
                     {

From 25736b1ca8f9f6c94b6d803541c90812c2af99b4 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Mon, 9 Sep 2024 16:16:00 +0200
Subject: [PATCH 5/7] Doc: Remove obsolete options from Qt Quick App wizard

Change-Id: Id3391b54c63efd04421ab91c863376b8eb59ab40
Reviewed-by: Inkamari Harjula <inkamari.harjula@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 .../qtcreator-project-qt-quick-details.webp   | Bin 6194 -> 5598 bytes
 .../creator-only/qtquick-creating.qdoc        |  19 +++---------------
 ...uick-tutorial-create-empty-project.qdocinc |  11 +---------
 3 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/doc/qtcreator/images/qtcreator-project-qt-quick-details.webp b/doc/qtcreator/images/qtcreator-project-qt-quick-details.webp
index 56da58043722ca42cb49e308d6f768c9f85ebd0d..cfd0d752cef942e0643c8d283ed1c4fc2ba88bd7 100644
GIT binary patch
literal 5598
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

literal 6194
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
Qvn_k(PmPNYo_jC@0MXOh#sB~S

diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
index 6864010554e..d0c4e64970e 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-creating.qdoc
@@ -19,9 +19,6 @@
     Build the applications and deploy them to desktop, embedded, and mobile
     target platforms.
 
-    You can select an option to create a project that you can open in a separate
-    visual editor, \QDS.
-
     To create a Qt Quick Application project:
 
     \list 1
@@ -45,21 +42,11 @@
             box to create new projects in this folder by default. You can move
             project folders later without problems.
 
-        \li Select \uicontrol Next (or \uicontrol Continue on \macos) to open
-            the \uicontrol {Define Build System} dialog.
-
-            \image qtcreator-project-qt-quick-details.webp {Define Project Details dialog}
-
-            To create a project that you can develop with a visual editor in
-            \QDS, select \uicontrol {Create a project that you can open in \QDS}.
-
-        \li In the \uicontrol {Build system} field, select the build system to
-            use for building and running the project: \l {CMake}
-            {CMake} or \l {qbs-build-system}{Qbs}.
-
         \li Select \uicontrol Next to open the
             \uicontrol {Define Project Details} dialog.
 
+            \image qtcreator-project-qt-quick-details.webp {Define Project Details dialog}
+
         \li Select the Qt version to develop with in the
             \uicontrol {Minimum required Qt version} field.
             The Qt version determines the Qt Quick imports
@@ -71,7 +58,7 @@
             \note If you have not installed the Qt Virtual Keyboard module when
             you installed Qt, an error message will appear when you try to open
             \e Main.qml for editing. You can use \l {Installing Qt}
-            {\QMT} to install Qt Virtual Keyboard.
+            {\QOI} to install Qt Virtual Keyboard.
 
         \li Select \uicontrol Next to open the \uicontrol {Kit Selection}
             dialog.
diff --git a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
index 03abe50380a..e25719ffdfc 100644
--- a/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
+++ b/doc/qtcreator/src/qtquick/creator-only/qtquick-tutorial-create-empty-project.qdocinc
@@ -28,15 +28,9 @@
 
             \image qtcreator-project-qt-quick-details.webp {Define Project Details dialog}
 
-        \li Clear \uicontrol {Create a project that you can open in \QDS}.
-
-            \note This tutorial shows how to create the application in the
-            \uicontrol Edit mode. If you leave the checkbox selected, the
-            following instructions won't apply.
-
         \li Select \uicontrol Next to open the \uicontrol {Kit Selection} dialog.
 
-        \li Select Qt 6.4 or later \l{Kits}{kits} for the
+        \li Select Qt 6.5 or later \l{Kits}{kits} for the
             platforms that you want to build the application for. To build
             applications for mobile devices, select kits also for Android and
             iOS.
@@ -53,8 +47,5 @@
 
     \endlist
 
-    For more information about the settings that you skipped, see
-    \l{Create Qt Quick Applications}.
-
 //! [qtquick empty application]
 */

From 455497725bc3c5211b1a7d34717b53c56c654b43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20L=C3=B6hning?= <robert.loehning@qt.io>
Date: Wed, 24 Jul 2024 22:53:24 +0200
Subject: [PATCH 6/7] SquishTests: Make tst_designer_autocomplete pass on
 clangd

- Give GenericProposalWidget more time to appear because the precise
  clangd-based code model is not as quick as the built-in one.

- Don't search for button's name in list of proposals because clangd
  seems to generate too many proposals for this to work reliably. It's
  pointless anyway because it doesn't matter whether the button is being
  displayed somewhere deep down in the list. The following tests
  validate whether the button is available.

Change-Id: I8f59154c0ce5251d942665084e0e4a54626853bc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../system/suite_tools/tst_designer_autocomplete/test.py  | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/tests/system/suite_tools/tst_designer_autocomplete/test.py b/tests/system/suite_tools/tst_designer_autocomplete/test.py
index 1576e26e717..4e055d40735 100644
--- a/tests/system/suite_tools/tst_designer_autocomplete/test.py
+++ b/tests/system/suite_tools/tst_designer_autocomplete/test.py
@@ -64,16 +64,12 @@ def main():
                 snooze(1)
                 type(editor, ">")
 
-            if not test.verify(waitFor(proposalExists, 1500), "Proposal should be shown"):
+            if not test.verify(waitFor(proposalExists, 6000), "Proposal should be shown"):
                 type(editor, "<Shift+Delete>")
                 continue
 
             proposalListView = waitForObject(':popupFrame_Proposal_QListView')
-            items = dumpItems(proposalListView.model())
-            if test.verify(" %s" % buttonName in items, "Button present in proposal?"):
-                type(proposalListView, str(buttonName[0]))
-            else:
-                test.log(str(items))
+            type(proposalListView, str(buttonName[0]))
             snooze(1)
             if test.verify(waitFor(proposalExists, 4000),
                            "Verify that GenericProposalWidget is being shown."):

From 83f3e088f2e6e4cbc7b46769c9a53a1cae40bb43 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 13 Sep 2024 11:37:54 +0200
Subject: [PATCH 7/7] Update qbs submodule to HEAD of 2.4 branch

Change-Id: Ib9c5930117838cb601eef083917a6cb23940d890
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/shared/qbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/qbs b/src/shared/qbs
index f2906471ba3..130b3c2a8f1 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit f2906471ba374685347926432c2cbbca127cfb75
+Subproject commit 130b3c2a8f17c1ed18061d645e908a623f1e73b6