diff --git a/.gitignore b/.gitignore index bb073b45dc2..6cbeb2503d5 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ ui_*.h wrapper.bat wrapper.sh debug_toolchain.cmake +CMakeUserPresets.json # qtcreator generated files *.creator.user* diff --git a/CMakePresets.json b/CMakePresets.json index b4b859933cd..0e4b60e22b7 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -5,6 +5,7 @@ "name": "cmake-plugin-minimal", "displayName": "CMake, C++, Git, Debug minimal Build", "generator": "Ninja", + "hidden" : true, "cacheVariables": { "BUILD_PLUGINS": "Core;Designer;DiffEditor;TextEditor;ProjectExplorer;CppEditor;CodePaster;Docker;Git;Help;QmakeProjectManager;CMakeProjectManager;ClangCodeModel;ClangTools;ClangFormat;Debugger;QtSupport;ResourceEditor;VcsBase;Welcome;LanguageClient;RemoteLinux", "BUILD_EXECUTABLES": "QtCreator;qtcreator_ctrlc_stub;qtcreator_process_stub;win64interrupt;qtcreator_processlauncher", diff --git a/README.md b/README.md index 151be8c678c..4bb9109cab0 100644 --- a/README.md +++ b/README.md @@ -164,6 +164,44 @@ Thus, if you want to work on Qt Creator using Qt Creator, you need a separate installation of it. We recommend using a separate, release-built version of Qt Creator to work on a debug-built version of Qt Creator. +Alternatively, take the following template of `CMakeUserPresets.json` for +reference. Write your own configurePreset inheriting `cmake-plugin-minimal` in +`CMakeUserPresets.json` to build with IDEs (such as QtCreator, VSCode, +CLion...etc) locally: + +```json +{ + "version": 4, + "cmakeMinimumRequired": { + "major": 3, + "minor": 23, + "patch": 0 + }, + "configurePresets": [ + { + "name": "custom", + "displayName": "custom", + "description": "custom", + "inherits": "cmake-plugin-minimal", + "binaryDir": "${sourceDir}/build/${presetName}", + "toolset": { + "value": "v142,host=x64", + "strategy": "external" + }, + "architecture": { + "value": "x64", + "strategy": "external" + }, + "cacheVariables": { + "CMAKE_CXX_COMPILER": "cl.exe", + "CMAKE_C_COMPILER": "cl.exe", + "CMAKE_PREFIX_PATH": "c:/Qt/6.2.4/msvc2019_64" + } + } + ] +} +``` + ### Options If you do not have Ninja installed and in the `PATH`, remove `-G Ninja` from diff --git a/cmake/QtCreatorIDEBranding.cmake b/cmake/QtCreatorIDEBranding.cmake index 8f985e5986b..42ad51bcfd6 100644 --- a/cmake/QtCreatorIDEBranding.cmake +++ b/cmake/QtCreatorIDEBranding.cmake @@ -1,6 +1,6 @@ -set(IDE_VERSION "10.0.84") # The IDE version. -set(IDE_VERSION_COMPAT "10.0.84") # The IDE Compatibility version. -set(IDE_VERSION_DISPLAY "11.0.0-rc1") # The IDE display version. +set(IDE_VERSION "11.0.0") # The IDE version. +set(IDE_VERSION_COMPAT "11.0.0") # The IDE Compatibility version. +set(IDE_VERSION_DISPLAY "11.0.0") # The IDE display version. set(IDE_COPYRIGHT_YEAR "2023") # The IDE current copyright year. set(IDE_SETTINGSVARIANT "QtProject") # The IDE settings variation. diff --git a/coin/instructions/common_environment.yaml b/coin/instructions/common_environment.yaml index bafbb59b058..1fec2c793a6 100644 --- a/coin/instructions/common_environment.yaml +++ b/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" diff --git a/coin/instructions/provision.yaml b/coin/instructions/provision.yaml index 14e6fb1a239..7b84c6e3baa 100644 --- a/coin/instructions/provision.yaml +++ b/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 diff --git a/dist/changelog/changes-11.0.0.md b/dist/changelog/changes-11.0.0.md index ebfc6584875..8b1330dae7a 100644 --- a/dist/changelog/changes-11.0.0.md +++ b/dist/changelog/changes-11.0.0.md @@ -26,7 +26,7 @@ What's new? You can open markdown (.md) files for editing or select `File > New File > General > Markdown File` to create a new file. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-markdown-editor.html)) +([Documentation](https://doc.qt.io/qtcreator/creator-markdown-editor.html)) ### Terminal @@ -38,7 +38,7 @@ shells, colors, and fonts. To use an external terminal, deselect the `Use internal terminal` check box in `Preferences > Terminal`. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-output-panes.html#terminal)) +([Documentation](https://doc.qt.io/qtcreator/creator-reference-terminal-view.html)) ### Copilot @@ -48,7 +48,7 @@ suggest code in the `Edit` mode. To set Copilot preferences, select `Preferences > Copilot`. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-copilot.html)) +([Documentation](https://doc.qt.io/qtcreator/creator-copilot.html)) ### vcpkg @@ -64,7 +64,7 @@ project. Edit manifest files in the manifest editor. To search for packages to add to the file, select the `Search Package` button on the manifest editor toolbar. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-vcpkg.html)) +([Documentation](https://doc.qt.io/qtcreator/creator-vcpkg.html)) ### Axivion @@ -73,7 +73,7 @@ and link a project to an Axivion project in the project settings, Qt Creator shows annotations of the latest run in the editors and allows you to view some details on the issues. -([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-axivion.html)) +([Documentation](https://doc.qt.io/qtcreator/creator-axivion.html)) General ------- @@ -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 @@ -161,7 +171,12 @@ Editing * Fixed that too many progress indicators could be created ([QTCREATORBUG-29224](https://bugreports.qt.io/browse/QTCREATORBUG-29224)) - ([Documentation](https://doc-snapshots.qt.io/qtcreator-11.0/creator-python-development.html)) + ([Documentation](https://doc.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://doc-snapshots.qt.io/qtcreator-11.0/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://doc.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 diff --git a/doc/qtcreator/config/style/qt5-sidebar.html b/doc/qtcreator/config/style/qt5-sidebar.html index 48111154eb8..9f272e3a7a8 100644 --- a/doc/qtcreator/config/style/qt5-sidebar.html +++ b/doc/qtcreator/config/style/qt5-sidebar.html @@ -101,7 +101,8 @@