Merge remote-tracking branch 'origin/14.0'

Change-Id: I8a266c5c9a8e68e1cdec4e7a750e71dae628d619

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.

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]
 */

share/qtcreator/translations/qtcreator_fr.ts

@@ -17224,7 +17224,7 @@ Assurez-vous que la variable CMAKE_BUILD_TYPE contient le champ « 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>

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()

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();
     }

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."):