Merge "Merge remote-tracking branch 'origin/11.0'"

coin/instructions/common_environment.yaml

@@ -7,7 +7,7 @@ instructions:
         variableValue: "RelWithDebInfo"
       - type: EnvironmentVariable
         variableName: LLVM_BASE_URL
-        variableValue: https://master.qt.io/development_releases/prebuilt/libclang/libclang-release_16.0.2-based
+        variableValue: https://ci-files02-hki.ci.qt.io/packages/jenkins/qtcreator_libclang/libclang-release_16.0.2-based
       - type: EnvironmentVariable
         variableName: QTC_QT_BASE_URL
         variableValue: "https://ci-files02-hki.ci.qt.io/packages/jenkins/archive/qt/6.5/6.5.1-released/Qt"

coin/instructions/provision.yaml

@@ -52,7 +52,7 @@ instructions:
   - type: ChangeDirectory
     directory: "{{.BuildDir}}/tqtc-qtsdk/packaging_tools"
   - type: ExecuteCommand
-    command: "python3 -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z https://master.qt.io/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
+    command: "python3 -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --icu7z https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/icu/prebuilt/56.1/icu-linux-g++-Rhel7.2-x64.7z {{.Env.QTC_QT_MODULES}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 3600
     maxTimeBetweenOutput: 360
@@ -72,7 +72,7 @@ instructions:
       property: host.os
       equals_value: MacOS
   - type: ExecuteCommand
-    command: "python -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --opengl32sw7z https://master.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z https://master.qt.io/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z https://ci-files02-hki.ci.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}"
+    command: "python -m pipenv run python -u install_qt.py --qt-path {{.BuildDir}}/qt_install_dir --base-url {{.Env.QTC_QT_BASE_URL}} --base-url-postfix={{.Env.QTC_QT_POSTFIX}} --opengl32sw7z https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64.7z --d3dcompiler7z https://ci-files02-hki.ci.qt.io/packages/jenkins/development_releases/prebuilt/d3dcompiler/msvc2013/d3dcompiler_47-x64.7z --openssl7z https://ci-files02-hki.ci.qt.io/packages/jenkins/openssl/openssl_1.1.1d_prebuild_x64.7z {{.Env.QTC_QT_MODULES}}"
     executeCommandArgumentSplitingBehavior: SplitAfterVariableSubstitution
     maxTimeInSeconds: 3600
     maxTimeBetweenOutput: 360

dist/changelog/changes-11.0.0.md

@@ -121,10 +121,17 @@ Editing
 * Fixed that the locator showed both the declaration and the definition of symbols
   ([QTCREATORBUG-13894](https://bugreports.qt.io/browse/QTCREATORBUG-13894))
 * Fixed the handling of C++20 keywords and concepts
+* Fixed that the automatic Doxygen comment generation did not work when
+  initializer lists `{}` were present
+  ([QTCREATORBUG-29198](https://bugreports.qt.io/browse/QTCREATORBUG-29198))
+* Fixed an issue when matching braces
+  ([QTCREATORBUG-29339](https://bugreports.qt.io/browse/QTCREATORBUG-29339))
 * Clangd
     * Fixed that the index could be outdated after VCS operations
     * Fixed the highlighting of labels
       ([QTCREATORBUG-27338](https://bugreports.qt.io/browse/QTCREATORBUG-27338))
+    * Fixed freezes when showing tool tips
+      ([QTCREATORBUG-29356](https://bugreports.qt.io/browse/QTCREATORBUG-29356))
 * Built-in
     * Fixed support for `if`-statements with initializer
       ([QTCREATORBUG-29182](https://bugreports.qt.io/browse/QTCREATORBUG-29182))
@@ -150,7 +157,10 @@ Editing
 * Fixed the completion for Qt Quick Controls
   ([QTCREATORBUG-28648](https://bugreports.qt.io/browse/QTCREATORBUG-28648))
 * Fixed that `qmllint` issues were not shown in the `Issues` view
-  ([QTCREATORBUG-28720](https://bugreports.qt.io/browse/QTCREATORBUG-28720))
+  ([QTCREATORBUG-28720](https://bugreports.qt.io/browse/QTCREATORBUG-28720),
+   [QTCREATORBUG-27762](https://bugreports.qt.io/browse/QTCREATORBUG-27762))
+* Fixed a wrong `M16` warning
+  ([QTCREATORBUG-28468](https://bugreports.qt.io/browse/QTCREATORBUG-28468))
 
 ### Python
 
@@ -163,6 +173,11 @@ Editing
 
   ([Documentation](https://docs.qt.io/qtcreator/creator-python-development.html))
 
+### Meson
+
+* Fixed the file targets
+  ([QTCREATORBUG-29349](https://bugreports.qt.io/browse/QTCREATORBUG-29349))
+
 Projects
 --------
 
@@ -187,15 +202,28 @@ Projects
    [QTCREATORBUG-28985](https://bugreports.qt.io/browse/QTCREATORBUG-28985),
    [QTCREATORBUG-29006](https://bugreports.qt.io/browse/QTCREATORBUG-29006))
   ([Documentation](https://doc.qt.io/qtcreator/creator-project-cmake.html))
-* Added `Build > Reload CMake Presets` to reload CMake presets after making
-  changes to them
-  ([Documentation](https://docs.qt.io/qtcreator/creator-build-settings-cmake-presets.html))
 * Added support for the `block()` and `endblock()` CMake commands
   ([CMake documentation](https://cmake.org/cmake/help/latest/command/block.html#command:block))
-* Fixed that CMake Presets were not visible in the `Projects` view
-  ([QTCREATORBUG-28966](https://bugreports.qt.io/browse/QTCREATORBUG-28966))
 * Fixed issues with detecting a configured Qt version when importing a build
   ([QTCREATORBUG-29075](https://bugreports.qt.io/browse/QTCREATORBUG-29075))
+* Fixed the project wizards for Qt 6.3 and earlier
+  ([QTCREATORBUG-29067](https://bugreports.qt.io/browse/QTCREATORBUG-29067))
+* Presets
+    * Added `Build > Reload CMake Presets` to reload CMake presets after making
+      changes to them
+      ([Documentation](https://docs.qt.io/qtcreator/creator-build-settings-cmake-presets.html))
+    * Fixed that presets were not visible in the `Projects` view
+      ([QTCREATORBUG-28966](https://bugreports.qt.io/browse/QTCREATORBUG-28966))
+    * Fixed the type handling of the `architecture` and `toolset` fields
+      ([QTCREATORBUG-28693](https://bugreports.qt.io/browse/QTCREATORBUG-28693))
+    * Fixed the setting for QML debugging when creating build configurations
+      ([QTCREATORBUG-29311](https://bugreports.qt.io/browse/QTCREATORBUG-29311))
+
+
+### Qmake
+
+* Fixed an infinite loop when the Qt ABI changed
+  ([QTCREATORBUG-29204](https://bugreports.qt.io/browse/QTCREATORBUG-29204))
 
 ### Python
 
@@ -214,6 +242,10 @@ Debugging
   ([QTCREATORBUG-28950](https://bugreports.qt.io/browse/QTCREATORBUG-28950))
 * Fixed pretty printer for `std::string` for recent `libc++`
   ([QTCREATORBUG-29230](https://bugreports.qt.io/browse/QTCREATORBUG-29230))
+* Fixed the pretty printers on Fedora 37
+  ([QTCREATORBUG-28659](https://bugreports.qt.io/browse/QTCREATORBUG-28659))
+* Fixed the display of arrays with `Array of 10,000 items`
+  ([QTCREATORBUG-29196](https://bugreports.qt.io/browse/QTCREATORBUG-29196))
 
 ### C++
 
@@ -266,6 +298,11 @@ Platforms
 * Fixed an issue with building library targets
   ([QTCREATORBUG-26980](https://bugreports.qt.io/browse/QTCREATORBUG-26980))
 
+### iOS
+
+* Improved the bundle ID that the project wizards create
+  ([QTCREATORBUG-29340](https://bugreports.qt.io/browse/QTCREATORBUG-29340))
+
 ### Remote Linux
 
 * Removed the automatic sourcing of target-side shell profiles
@@ -277,6 +314,14 @@ Platforms
 * Fixed issues after deleting the Docker image for a registered Docker device
   ([QTCREATORBUG-28880](https://bugreports.qt.io/browse/QTCREATORBUG-28880))
 
+### MCU
+
+* Fixed that errors were shown for valid QML code
+  ([QTCREATORBUG-26655](https://bugreports.qt.io/browse/QTCREATORBUG-26655),
+   [QTCREATORBUG-29155](https://bugreports.qt.io/browse/QTCREATORBUG-29155))
+* Fixed that files were missing from locator and project search
+  ([QTCREATORBUG-29297](https://bugreports.qt.io/browse/QTCREATORBUG-29297))
+
 ### QNX
 
 * Added `slog2info` as a requirement for devices
@@ -289,6 +334,8 @@ Aleksei German
 Alessandro Portale  
 Alexander Drozdov  
 Alexander Pershin  
+Alexey Edelev  
+Alexis Jeandet  
 Ali Kianian  
 Alibek Omarov  
 Amr Essam  
@@ -309,8 +356,10 @@ Esa Törmänen
 Fabian Kosmale  
 Filippo Gentile  
 Friedemann Kleint  
+Haowei Hsu  
 Henning Gruendl  
 Jaroslaw Kobus  
+Joni Poikelin  
 Jussi Witick  
 Kai Köhne  
 Knud Dollereder  
@@ -324,6 +373,7 @@ Mats Honkamaa
 Miikka Heikkinen  
 Mitch Curtis  
 Niels Weber  
+Olivier Delaune  
 Orgad Shaneh  
 Pranta Dastider  
 Robert Löhning  
@@ -333,8 +383,8 @@ Tasuku Suzuki
 Thiago Macieira  
 Thomas Hartmann  
 Tim Jenssen  
-Tim Jenßen  
 Ulf Hermann  
 Vikas Pachdha  
+Wladimir Leuschner  
 Yasser Grimes  
 Yixue Wang  

doc/qtcreator/src/overview/creator-only/creator-help-overview.qdoc

@@ -34,6 +34,10 @@
 
             Lists useful \QC features.
 
+        \li \l{Reference}
+
+            Lists the sidebar views and the output views.
+
         \li \l{Known Issues}
 
             Lists known issues in \QC version \qtcversion. The development team

doc/qtcreator/src/qtcreator-toc.qdoc

@@ -239,7 +239,76 @@
             \li \l{Using the Help Mode}
             \li \l{FAQ}
             \li \l{How-to}
+                \list
+                    \li Use the UI
+                        \list
+                            \li \l {Assign keyboard shortcuts}
+                            \li \l {Find a particular preference}
+                            \li \l {Find keyboard shortcuts}
+                            \li \l {Find menu items on \macos}
+                            \li \l {Import and export keyboard shortcuts}
+                            \li \l {Set high DPI scaling}
+                            \li \l {Set the number of recent files shown}
+                            \li \l {Show and hide sidebars}
+                            \li \l {Switch between modes}
+                            \li \l {Switch UI themes}
+                            \li \l {View output}
+                        \endlist
+                    \li Edit Code
+                        \list
+                            \li \l {Add code snippets to the auto-complete menu}
+                            \li \l {Enclose selected code in curly braces, parentheses, or double quotes}
+                            \li \l {Jump to a function in QML code}
+                            \li \l {Locate files using the keyboard}
+                            \li \l {Move between open files}
+                            \li \l {Move to symbols}
+                            \li \l {Paste text from clipboard history}
+                            \li \l {Perform calculations}
+                            \li \l {Search and replace across files using a regular expression}
+                            \li \l {Select the enclosing block in C++}
+                            \li \l {Sort lines alphabetically}
+                            \li \l {Switch to Edit mode}
+                            \li \l {Write down notes}
+                        \endlist
+                    \li Design UIs
+                         \list
+                            \li \l {Export SVG images}
+                            \li \l {View images}
+                        \endlist
+                    \li Manage Projects
+                        \list
+                            \li \l {Add a license header template for C++ code}
+                        \endlist
+                    \li Use \QC
+                        \list
+                            \li \l {Enable and disable plugins}
+                            \li \l {Find settings files}
+                            \li \l {Install plugins}
+                            \li \l {Run \QC from the command line}
+                        \endlist
+                \endlist
             \li \l{Reference}
+                \list
+                    \li Sidebar Views
+                        \list
+                            \li \l {Call Hierarchy}
+                            \li \l {Class View}
+                            \li \l {File System}
+                            \li \l {Include Hierarchy}
+                            \li \l {Open Documents}
+                            \li \l {Outline}
+                            \li \l {Projects}
+                            \li \l {Type Hierarchy}
+                        \endlist
+                    \li Output Views
+                        \list
+                            \li \l {Application Output}
+                            \li \l {Compile Output}
+                            \li \l {Issues}
+                            \li \l {Search Results}
+                            \li \l {To-Do Entries}
+                        \endlist
+                \endlist
             \li \l{Known Issues}
             \li \l{Glossary}
             \li \l{Technical Support}

src/libs/solutions/tasking/tasktree.cpp

@@ -1614,7 +1614,7 @@ void TaskNode::invokeEndHandler(bool success)
     \endcode
 
     The task tree above has a top level element of the Group type that contains
-    tasks of the type ProcessTask, FileTransferTask, and ConcurrentCallTask<int>.
+    tasks of the ProcessTask, FileTransferTask, and ConcurrentCallTask<int> type.
     After taskTree->start() is called, the tasks are run in a chain, starting
     with ProcessTask. When the ProcessTask finishes successfully, the ConcurrentCallTask<int>
     task is started. Finally, when the asynchronous task finishes successfully, the
@@ -1765,7 +1765,7 @@ void TaskNode::invokeEndHandler(bool success)
     \section2 Task's Start Handler
 
     When a corresponding task class object is created and before it's started,
-    the task tree invokes a mandatory user-provided setup handler. The setup
+    the task tree invokes an optionally user-provided setup handler. The setup
     handler should always take a \e reference to the associated task class object:
 
     \code
@@ -2150,7 +2150,7 @@ void TaskNode::invokeEndHandler(bool success)
 
     \section1 Task Adapters
 
-    To extend a TaskTree with new a task type, implement a simple adapter class
+    To extend a TaskTree with a new task type, implement a simple adapter class
     derived from the TaskAdapter class template. The following class is an
     adapter for a single shot timer, which may be considered as a new
     asynchronous task:
@@ -2164,10 +2164,11 @@ void TaskNode::invokeEndHandler(bool success)
                 task()->setInterval(1000);
                 connect(task(), &QTimer::timeout, this, [this] { emit done(true); });
             }
+        private:
             void start() final { task()->start(); }
         };
 
-        QTC_DECLARE_CUSTOM_TASK(TimeoutTask, TimeoutTaskAdapter);
+        TASKING_DECLARE_TASK(TimeoutTask, TimeoutTaskAdapter);
     \endcode
 
     You must derive the custom adapter from the TaskAdapter class template
@@ -2178,12 +2179,12 @@ void TaskNode::invokeEndHandler(bool success)
     accessible through the TaskAdapter::task() method. The constructor
     of TimeoutTaskAdapter initially configures the QTimer object and connects
     to the QTimer::timeout signal. When the signal is triggered, TimeoutTaskAdapter
-    emits the done(true) signal to inform the task tree that the task finished
+    emits the \c done(true) signal to inform the task tree that the task finished
-    successfully. If it emits done(false), the task finished with an error.
+    successfully. If it emits \c done(false), the task finished with an error.
     The TaskAdapter::start() method starts the timer.
 
     To make QTimer accessible inside TaskTree under the \e TimeoutTask name,
-    register it with QTC_DECLARE_CUSTOM_TASK(TimeoutTask, TimeoutTaskAdapter).
+    register it with TASKING_DECLARE_TASK(TimeoutTask, TimeoutTaskAdapter).
     TimeoutTask becomes a new task type inside Tasking namespace, using TimeoutTaskAdapter.
 
     The new task type is now registered, and you can use it in TaskTree:

src/plugins/cmakeprojectmanager/cmakebuildstep.cpp

@@ -16,6 +16,8 @@
 
 #include <ios/iosconstants.h>
 
+#include <webassembly/webassemblyconstants.h>
+
 #include <coreplugin/find/itemviewfind.h>
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/devicesupport/idevice.h>
@@ -202,7 +204,8 @@ static bool supportsStageForInstallation(const Kit *kit)
     QTC_ASSERT(buildDevice, return false);
     return runDevice->id() != buildDevice->id()
            && runDevice->type() != Android::Constants::ANDROID_DEVICE_TYPE
-           && runDevice->type() != Ios::Constants::IOS_DEVICE_TYPE;
+           && runDevice->type() != Ios::Constants::IOS_DEVICE_TYPE
+           && runDevice->type() != WebAssembly::Constants::WEBASSEMBLY_DEVICE_TYPE;
 }
 
 CMakeBuildStep::CMakeBuildStep(BuildStepList *bsl, Id id) :

src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp

@@ -244,6 +244,8 @@ void CMakeManager::reloadCMakePresets()
             {QMessageBox::Yes, Tr::tr("Reload")},
         });
 
+    settings().writeSettings();
+
     if (clickedButton == QMessageBox::Cancel)
         return;
 

tests/system/shared/qtcreator.py

@@ -45,8 +45,9 @@ def __closeInfoBarEntry__(leftButtonText):
     leftWidget = "leftWidget={%s}" % (toolButton % leftButtonText)
     test.log("closing %s" % leftButtonText)
     buttonObjStr = "{%s %s}" % (doNotShowAgain, leftWidget)
+    checkIfObjectExists(buttonObjStr, verboseOnFail=True)
     clickButton(waitForObject(buttonObjStr))
-    waitFor('object.exists(buttonObjStr) == False', 2000)
+    checkIfObjectExists(buttonObjStr, False, 2000, True)
 
 # additionalParameters must be a list or tuple of strings or None
 def startQC(additionalParameters=None, withPreparedSettingsPath=True, closeLinkToQt=True, cancelTour=True):