From d4260dab855d8d52fbd04f5be400fe30bd302415 Mon Sep 17 00:00:00 2001 From: Alexis Jeandet Date: Mon, 10 Jul 2023 13:05:52 +0200 Subject: [PATCH 01/12] Ensure that target name is relative to build dir and without leading '/' Fixes: QTCREATORBUG-29349 Change-Id: I7471242cd422a68a2652ff23741d0615380e2e8d Reviewed-by: hjk Reviewed-by: Eike Ziller --- .../mesonprojectmanager/mesonprojectparser.cpp | 6 +++--- src/plugins/mesonprojectmanager/target.h | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp index c84b5e4b3d6..528865f3d37 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp +++ b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp @@ -183,7 +183,7 @@ QList MesonProjectParser::appsTargets() const if (target.type == Target::Type::executable) { ProjectExplorer::BuildTargetInfo bti; bti.displayName = target.name; - bti.buildKey = Target::fullName(m_srcDir, target); + bti.buildKey = Target::fullName(m_buildDir, target); bti.displayNameUniquifier = bti.buildKey; bti.targetFilePath = Utils::FilePath::fromString(target.fileName.first()); bti.workingDirectory = Utils::FilePath::fromString(target.fileName.first()).absolutePath(); @@ -237,7 +237,7 @@ void MesonProjectParser::update(const QFuture m_rootNode = std::move(parserData->rootNode); m_targetsNames.clear(); for (const Target &target : m_parserResult.targets) { - m_targetsNames.push_back(Target::fullName(m_srcDir, target)); + m_targetsNames.push_back(Target::fullName(m_buildDir, target)); } addMissingTargets(m_targetsNames); m_targetsNames.sort(); @@ -253,7 +253,7 @@ ProjectExplorer::RawProjectPart MesonProjectParser::buildRawPart( { ProjectExplorer::RawProjectPart part; part.setDisplayName(target.name); - part.setBuildSystemTarget(Target::fullName(m_srcDir, target)); + part.setBuildSystemTarget(Target::fullName(m_buildDir, target)); part.setFiles(sources.sources + sources.generatedSources); auto flags = splitArgs(sources.parameters); part.setMacros(flags.macros); diff --git a/src/plugins/mesonprojectmanager/target.h b/src/plugins/mesonprojectmanager/target.h index 1efa3669490..b48c79e7c70 100644 --- a/src/plugins/mesonprojectmanager/target.h +++ b/src/plugins/mesonprojectmanager/target.h @@ -60,15 +60,17 @@ struct Target const std::optional subproject; const SourceGroupList sources; - static inline QString fullName(const Utils::FilePath &srcDir, const Target &target) + static inline QString fullName(const Utils::FilePath &buildDir, const Target &target) { using namespace Utils; - if (FilePath::fromString((target.fileName.first())).isAbsolutePath()) { - const auto fname = target.fileName.first().split('/').last(); - QString definedIn = FilePath::fromString(target.definedIn).absolutePath().toString(); - return definedIn.remove(srcDir.toString()) + '/' + fname; + auto fname = target.fileName.first(); + if (FilePath::fromString(fname).isAbsolutePath()) { + fname.remove(buildDir.toString()); + if (fname.startsWith('/')) + fname.removeFirst(); + return fname; } else { - return target.fileName.first(); + return fname; } } From fdf79f0234792c3225779ef0bbed8fe4866266d3 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 10 Jul 2023 15:53:38 +0200 Subject: [PATCH 02/12] AutoTest: Avoid crash on concurrent access Partially reverts 91bdbb61eccdde5e1c228281f7335685b22aa7f6 as the symbol lookup will update the snapshot's cache. As there are concurrent threads accessing the snapshot we may end up in a crash. Change-Id: I2aaf5e403b10cba2b26915cbe7b4712c43c4957b Reviewed-by: Marcus Tillmanns --- src/plugins/autotest/qtest/qttestvisitors.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/autotest/qtest/qttestvisitors.h b/src/plugins/autotest/qtest/qttestvisitors.h index 756ba17b9e2..dc18914b544 100644 --- a/src/plugins/autotest/qtest/qttestvisitors.h +++ b/src/plugins/autotest/qtest/qttestvisitors.h @@ -34,7 +34,7 @@ public: private: CppEditor::SymbolFinder m_symbolFinder; QString m_className; - const CPlusPlus::Snapshot &m_snapshot; + CPlusPlus::Snapshot m_snapshot; QMap m_privSlots; bool m_valid = false; bool m_inherited = false; From f2c96b4c4c94f438c5f9353fe43e27c79a9bfbfd Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 11 Jul 2023 07:34:24 +0200 Subject: [PATCH 03/12] MesonPM: Fix compile before Qt6.5 Amends d4260dab855. Change-Id: Ifa5976002d8bdd39f3742e24be20b40b04067e7f Reviewed-by: Eike Ziller --- src/plugins/mesonprojectmanager/target.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/mesonprojectmanager/target.h b/src/plugins/mesonprojectmanager/target.h index b48c79e7c70..bc137eee90a 100644 --- a/src/plugins/mesonprojectmanager/target.h +++ b/src/plugins/mesonprojectmanager/target.h @@ -67,7 +67,7 @@ struct Target if (FilePath::fromString(fname).isAbsolutePath()) { fname.remove(buildDir.toString()); if (fname.startsWith('/')) - fname.removeFirst(); + fname.remove(0, 1); return fname; } else { return fname; From 31386c3fa0ae6b8fc7afef9a35049d6af42b2889 Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 7 Jul 2023 12:17:51 +0200 Subject: [PATCH 04/12] Doc: Add a Reference topic For listing reference topics. Task-number: QTCREATORBUG-29361 Change-Id: I1d0463c4bfcd826464535a377da533509d838435 Reviewed-by: Eike Ziller --- doc/qtcreator/config/style/qt5-sidebar.html | 3 +- .../src/howto/creator-how-to-macos.qdoc | 2 +- .../creator-how-to-set-high-dpi-scaling.qdoc | 2 +- .../creator-how-to-switch-ui-themes.qdoc | 2 +- .../src/howto/creator-how-to-view-images.qdoc | 4 +-- .../src/howto/creator-keyboard-shortcuts.qdoc | 6 ++-- .../creator-how-to-enable-plugins.qdoc | 2 +- .../creator-how-to-find-settings-files.qdoc | 2 +- .../creator-how-to-install-plugins.qdoc | 2 +- .../howto/creator-only/creator-how-tos.qdoc | 36 +++++++++---------- .../creator-only/creator-reference.qdoc | 22 ++++++++++++ doc/qtcreator/src/qtcreator-toc.qdoc | 1 + doc/qtcreator/src/qtcreator.qdoc | 1 + .../creator-file-system-view.qdoc | 2 +- .../creator-how-to-view-output.qdoc | 6 ++-- ...creator-how-to-show-and-hide-sidebars.qdoc | 10 ++---- .../creator-how-to-switch-between-modes.qdoc | 2 +- .../creator-reference-sidebar-views.qdoc | 10 +++--- .../creator-reference-terminal-view.qdoc | 2 +- .../creator-reference-to-do-entries-view.qdoc | 2 +- .../creator-open-documents-view.qdoc | 2 +- .../user-interface/creator-projects-view.qdoc | 2 +- .../creator-reference-output-views.qdoc | 8 ++--- .../src/user-interface/creator-ui.qdoc | 2 +- 24 files changed, 77 insertions(+), 56 deletions(-) create mode 100644 doc/qtcreator/src/overview/creator-only/creator-reference.qdoc 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 @@
  • Using the Help Mode
  • FAQ
    • -
  • How-tos
    • +
  • How-to
    • +
  • Reference
  • Known Issues
  • Glossary
  • Technical Support
    • diff --git a/doc/qtcreator/src/howto/creator-how-to-macos.qdoc b/doc/qtcreator/src/howto/creator-how-to-macos.qdoc index 166fb4517af..639fb08f27f 100644 --- a/doc/qtcreator/src/howto/creator-how-to-macos.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-macos.qdoc @@ -5,7 +5,7 @@ \page creator-how-to-macos.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui \ingroup studio-how-to diff --git a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc index 849a4dbff52..a52be5210fb 100644 --- a/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-set-high-dpi-scaling.qdoc @@ -5,7 +5,7 @@ \page creator-how-to-set-high-dpi-scaling.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui \ingroup studio-how-to diff --git a/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc b/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc index c03a50cf930..69fd7efef26 100644 --- a/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-switch-ui-themes.qdoc @@ -5,7 +5,7 @@ \page creator-how-to-switch-ui-themes.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui \ingroup studio-how-to diff --git a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc index 0671ed9980c..c6532aa8029 100644 --- a/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc +++ b/doc/qtcreator/src/howto/creator-how-to-view-images.qdoc @@ -5,7 +5,7 @@ \page creator-how-to-view-images.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-design \ingroup studio-how-to-image-viewer @@ -47,7 +47,7 @@ \page creator-how-to-export-svg-images.html \if defined(qtcreator) \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-design \ingroup studio-how-to-image-viewer diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc index e16644c430d..8efe6c1324b 100644 --- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc @@ -793,7 +793,7 @@ \nextpage studio-projects.html \else \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui @@ -854,7 +854,7 @@ \nextpage studio-projects.html \else \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \ingroup creator-how-to-ui @@ -888,7 +888,7 @@ \nextpage studio-projects.html \else \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \endif \title Import and export keyboard shortcuts diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc index f47ccc30c34..6cf11eff11f 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-enable-plugins.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-enable-plugins.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-use \title Enable and disable plugins diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc index 42cb4759648..8bfb773a402 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-find-settings-files.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-find-settings-files.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-use \title Find settings files diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc index 10eb5e36c45..711e036c519 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-to-install-plugins.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-install-plugins.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-use \title Install plugins diff --git a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc index c59902f3b04..9e2dc2afc40 100644 --- a/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc +++ b/doc/qtcreator/src/howto/creator-only/creator-how-tos.qdoc @@ -10,7 +10,7 @@ /*! \previouspage creator-faq.html \page creator-how-tos.html - \nextpage creator-known-issues.html + \nextpage creator-reference.html \title How-to @@ -76,7 +76,7 @@ /*! \page creator-how-to-move-between-open-files.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Move between open files @@ -96,7 +96,7 @@ /*! \page creator-how-to-switch-to-edit-mode.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Switch to Edit mode @@ -118,7 +118,7 @@ /*! \page creator-how-to-find-preferences.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-ui \title Find a particular preference @@ -132,7 +132,7 @@ /*! \page creator-how-to-run-from-cli.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-use \title Run \QC from the command line @@ -150,7 +150,7 @@ /*! \page creator-how-to-move-to-symbols.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Move to symbols @@ -173,7 +173,7 @@ /*! \page creator-how-to-locate-files-using-keyboard.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Locate files using the keyboard @@ -198,7 +198,7 @@ /*! \page creator-how-to-perform-calculations.html \previouspage creator-how-to-move-between-open-files.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Perform calculations @@ -215,7 +215,7 @@ /*! \page creator-how-to-jump-to-functions-in-qml-code.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Jump to a function in QML code @@ -227,7 +227,7 @@ /*! \page creator-how-to-add-license-header-templates.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-projects \title Add a license header template for C++ code @@ -258,7 +258,7 @@ /*! \page creator-how-to-paste-text-from-clipboard-history.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Paste text from clipboard history @@ -271,7 +271,7 @@ /*! \page creator-how-to-sort-lines-alphabetically.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Sort lines alphabetically @@ -284,7 +284,7 @@ /*! \page creator-enclose-code-in-characters.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Enclose selected code in curly braces, parentheses, or double quotes @@ -309,7 +309,7 @@ /*! \page creator-how-to-select-enclosing-block.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Select the enclosing block in C++ @@ -320,7 +320,7 @@ /*! \page creator-how-to-add-code-snippets.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Add code snippets to the auto-complete menu @@ -337,7 +337,7 @@ /*! \page creator-how-to-write-notes.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Write down notes @@ -366,7 +366,7 @@ /*! \page creator-how-to-set-recent-files.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-ui \title Set the number of recent files shown @@ -386,7 +386,7 @@ /*! \page creator-how-to-search-and-replace-using-regexp.html \previouspage creator-how-to-move-between-open-files.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-edit \title Search and replace across files using a regular expression diff --git a/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc new file mode 100644 index 00000000000..22dfff65739 --- /dev/null +++ b/doc/qtcreator/src/overview/creator-only/creator-reference.qdoc @@ -0,0 +1,22 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only + +/*! + \page creator-reference.html + \previouspage creator-how-tos.html + \nextpage creator-known-issues.html + + \title Reference + + The following topics describe the different parts of the UI in detail. + + \section1 Sidebar Views + + \annotatedlist creator-reference-sidebar-views + + \section1 Output Views + + \annotatedlist creator-reference-output-views + + \sa {User Interface}, {Show and hide sidebars}, {View output} +*/ diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index da6f5444c50..3874d687a91 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -239,6 +239,7 @@ \li \l{Using the Help Mode} \li \l{FAQ} \li \l{How-to} + \li \l{Reference} \li \l{Known Issues} \li \l{Glossary} \li \l{Technical Support} diff --git a/doc/qtcreator/src/qtcreator.qdoc b/doc/qtcreator/src/qtcreator.qdoc index 60f61a9561c..d1aba95665d 100644 --- a/doc/qtcreator/src/qtcreator.qdoc +++ b/doc/qtcreator/src/qtcreator.qdoc @@ -104,6 +104,7 @@ \li \l{Using the Help Mode} \li \l{FAQ} \li \l{How-to} + \li \l{Reference} \li \l{Known Issues} \li \l{Glossary} \endlist diff --git a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc index 26a7472500c..b2a9f0dfe1d 100644 --- a/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-file-system-view.qdoc @@ -7,7 +7,7 @@ \previouspage creator-projects-view.html \nextpage creator-open-documents-view.html \else - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \endif \ingroup creator-reference-sidebar-views diff --git a/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc index 2121bd247a2..db90bb39f0b 100644 --- a/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc +++ b/doc/qtcreator/src/user-interface/creator-how-to-view-output.qdoc @@ -73,13 +73,13 @@ Some output views do not support finding and filtering. + \if defined(qtcreator) + \sa {Output Views} + \else \section1 Output views The following views show output: - \if defined(qtcreator) - \annotatedlist creator-reference-output-views - \else \annotatedlist studio-reference-output-views \endif */ diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc index 71105caadf9..52ecb03c011 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-show-and-hide-sidebars.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-show-and-hide-sidebars.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-ui \title Show and hide sidebars @@ -32,12 +32,8 @@ (\uicontrol {Close}). \endlist - \section1 Sidebar views - - Manage projects and files in the following views: - - \annotatedlist creator-reference-sidebar-views - In some views, right-clicking opens a context menu that has functions for managing the objects listed in the view. + + \sa {Sidebar Views} */ diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc index a43cffc4f04..fb023f1f3c1 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-how-to-switch-between-modes.qdoc @@ -4,7 +4,7 @@ /*! \page creator-how-to-switch-between-modes.html \previouspage creator-how-tos.html - \nextpage creator-known-issues.html + \ingroup creator-how-to-ui \title Switch between modes diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc index ca147e76dcf..ef50387b4fc 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-sidebar-views.qdoc @@ -3,7 +3,7 @@ /*! \page creator-outline-view.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Outline @@ -31,7 +31,7 @@ /*! \page creator-class-view.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Class View @@ -51,7 +51,7 @@ /*! \page creator-call-hierarchy-view.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Call Hierarchy @@ -73,7 +73,7 @@ /*! \page creator-type-hierarchy.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Type Hierarchy @@ -105,7 +105,7 @@ /*! \page creator-include-hierarchy-view.html - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \ingroup creator-reference-sidebar-views \title Include Hierarchy diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc index a87ec969c80..abfae8ba8b2 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-terminal-view.qdoc @@ -3,7 +3,7 @@ /*! \page creator-reference-terminal-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views diff --git a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc index f8547ac3e1f..fb1b40f2633 100644 --- a/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-only/creator-reference-to-do-entries-view.qdoc @@ -3,7 +3,7 @@ /*! \page creator-reference-to-do-entries-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views diff --git a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc index 72ac21121ed..0ad0967dc0c 100644 --- a/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-open-documents-view.qdoc @@ -8,7 +8,7 @@ \previouspage creator-file-system-view.html \nextpage studio-content-library.html \else - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \endif \ingroup creator-reference-sidebar-views diff --git a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc index be07f7f1580..529abfed348 100644 --- a/doc/qtcreator/src/user-interface/creator-projects-view.qdoc +++ b/doc/qtcreator/src/user-interface/creator-projects-view.qdoc @@ -7,7 +7,7 @@ \previouspage qtquick-curve-editor.html \nextpage creator-file-system-view.html \else - \previouspage creator-how-to-show-and-hide-sidebars.html + \previouspage creator-reference.html \endif \ingroup creator-reference-sidebar-views diff --git a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc index 42df7eb4d18..60387532f7e 100644 --- a/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc +++ b/doc/qtcreator/src/user-interface/creator-reference-output-views.qdoc @@ -9,7 +9,7 @@ /*! \page creator-reference-issues-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views \ingroup studio-reference-output-views @@ -117,7 +117,7 @@ /*! \page creator-reference-search-results-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views \ingroup studio-reference-output-views @@ -143,7 +143,7 @@ /*! \page creator-reference-application-output-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views \ingroup studio-reference-output-views @@ -185,7 +185,7 @@ /*! \page creator-reference-compile-output-view.html - \previouspage creator-how-to-view-output.html + \previouspage creator-reference.html \ingroup creator-reference-output-views \ingroup studio-reference-output-views diff --git a/doc/qtcreator/src/user-interface/creator-ui.qdoc b/doc/qtcreator/src/user-interface/creator-ui.qdoc index b37c1c4e0f7..220d9af132a 100644 --- a/doc/qtcreator/src/user-interface/creator-ui.qdoc +++ b/doc/qtcreator/src/user-interface/creator-ui.qdoc @@ -76,7 +76,7 @@ For information about new features and bug fixes in each \QC release, select \uicontrol Help > \uicontrol {Change Log}. - \sa {Use the UI}{How-to: Use the UI} + \sa {Use the UI}{How-to: Use the UI}, {Reference} \else From 4f50b6b791e1988bfb10f113baf0d94cc7e046cb Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Mon, 10 Jul 2023 12:59:00 +0200 Subject: [PATCH 05/12] AutoTest: Postpone removal of root node If a root node should get removed while scanning we may end up crashing when still getting results. As there is currently no mechanism to stop a certain parser postpone the removal of the root node until the parsing is done. Change-Id: I3766f9e67780e241801166339fa67f39536314b4 Reviewed-by: Marcus Tillmanns --- src/plugins/autotest/testprojectsettings.cpp | 6 +++++- src/plugins/autotest/testtreeitem.cpp | 11 ++++++++--- src/plugins/autotest/testtreeitem.h | 1 + src/plugins/autotest/testtreemodel.cpp | 4 ++++ 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/plugins/autotest/testprojectsettings.cpp b/src/plugins/autotest/testprojectsettings.cpp index 5f745637db8..dd0c05079cc 100644 --- a/src/plugins/autotest/testprojectsettings.cpp +++ b/src/plugins/autotest/testprojectsettings.cpp @@ -4,7 +4,9 @@ #include "testprojectsettings.h" #include "autotestconstants.h" +#include "testcodeparser.h" #include "testframeworkmanager.h" +#include "testtreemodel.h" #include #include @@ -49,7 +51,9 @@ void TestProjectSettings::activateFramework(const Id &id, bool activate) { ITestFramework *framework = TestFrameworkManager::frameworkForId(id); m_activeTestFrameworks[framework] = activate; - if (!activate) + if (TestTreeModel::instance()->parser()->isParsing()) + framework->rootNode()->markForRemoval(!activate); + else if (!activate) framework->resetRootNode(); } diff --git a/src/plugins/autotest/testtreeitem.cpp b/src/plugins/autotest/testtreeitem.cpp index f18adb812d4..69481b60cad 100644 --- a/src/plugins/autotest/testtreeitem.cpp +++ b/src/plugins/autotest/testtreeitem.cpp @@ -214,12 +214,16 @@ bool TestTreeItem::modifyLineAndColumn(const TestParseResult *result) void TestTreeItem::markForRemoval(bool mark) { - m_status = mark ? MarkedForRemoval : Cleared; + if (type() == Root) + m_status = mark ? ForcedRootRemoval : NewlyAdded; + else + m_status = mark ? MarkedForRemoval : Cleared; } void TestTreeItem::markForRemovalRecursively(bool mark) { - markForRemoval(mark); + if (type() != Root) + markForRemoval(mark); for (int row = 0, count = childCount(); row < count; ++row) childItem(row)->markForRemovalRecursively(mark); } @@ -231,7 +235,8 @@ void TestTreeItem::markForRemovalRecursively(const QSet &filePaths) child->markForRemovalRecursively(filePaths); mark &= child->markedForRemoval(); }); - markForRemoval(mark); + if (type() != Root) + markForRemoval(mark); } TestTreeItem *TestTreeItem::childItem(int at) const diff --git a/src/plugins/autotest/testtreeitem.h b/src/plugins/autotest/testtreeitem.h index 3737d2a3607..4f4065c62d8 100644 --- a/src/plugins/autotest/testtreeitem.h +++ b/src/plugins/autotest/testtreeitem.h @@ -167,6 +167,7 @@ private: { NewlyAdded, MarkedForRemoval, + ForcedRootRemoval, // only valid on rootNode Cleared }; diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp index 5e7fcb85a86..7d0dd3954d0 100644 --- a/src/plugins/autotest/testtreemodel.cpp +++ b/src/plugins/autotest/testtreemodel.cpp @@ -485,6 +485,10 @@ void TestTreeModel::markForRemoval(const QSet &filePaths) void TestTreeModel::sweep() { for (TestTreeItem *frameworkRoot : frameworkRootNodes()) { + if (frameworkRoot->m_status == TestTreeItem::ForcedRootRemoval) { + frameworkRoot->framework()->resetRootNode(); + continue; + } sweepChildren(frameworkRoot); revalidateCheckState(frameworkRoot); } From b5fa6be3624ee79eb9e4f30dec729c5e8455c5dc Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 11 Jul 2023 11:03:15 +0200 Subject: [PATCH 06/12] AutoTest: Retrigger scan if active frameworks change ...if the code parser is scanning for tests. Otherwise we have the canceled state of the running scan. Change-Id: Ief493c0bf66825e57c44c79193d5e8085ee98acd Reviewed-by: Marcus Tillmanns --- src/plugins/autotest/testcodeparser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/autotest/testcodeparser.cpp b/src/plugins/autotest/testcodeparser.cpp index e78be579651..dc76520dd3a 100644 --- a/src/plugins/autotest/testcodeparser.cpp +++ b/src/plugins/autotest/testcodeparser.cpp @@ -92,7 +92,7 @@ void TestCodeParser::syncTestFrameworks(const QList &parsers) { if (m_parserState != Idle) { // there's a running parse - m_postponedUpdateType = UpdateType::NoUpdate; + m_postponedUpdateType = UpdateType::FullUpdate; m_postponedFiles.clear(); ProgressManager::cancelTasks(Constants::TASK_PARSE); } From 409591e6f9accd837bbd13898636cc7b51468713 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Tue, 11 Jul 2023 11:08:34 +0200 Subject: [PATCH 07/12] MCU: Fix missing files in list of project files MCU projects contain subnodes for the contents of QmlProject files, which get populated after the project tree was already added to the tree. To make sure that the added files are also listed in `Project::files(...)`, and therefore be considered for e.g. Locator and project searches, the code must trigger `Project::handleSubTreeChanged`, so the cached list of nodes is updated. This doesn't happen with `addNode` (which is for construction before the tree is added to the `ProjectTree`), and forcing the `ProjectTree::emitSubtreeChanged` signal is also not sufficient. Use `FolderNode::replaceSubtree` which was made for this usecase and triggers all the relevant code. Fixes: QTCREATORBUG-29297 Change-Id: I3a1c4c1aebf978e2788de905231b83355db75030 Reviewed-by: Reviewed-by: Yasser Grimes Reviewed-by: Christian Kandeler --- src/plugins/mcusupport/mcusupportplugin.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/mcusupport/mcusupportplugin.cpp b/src/plugins/mcusupport/mcusupportplugin.cpp index f0726e3895f..05f457689d8 100644 --- a/src/plugins/mcusupport/mcusupportplugin.cpp +++ b/src/plugins/mcusupport/mcusupportplugin.cpp @@ -89,9 +89,7 @@ void updateMCUProjectTree(ProjectExplorer::Project *p) auto qmlProjectNode = std::make_unique(FilePath(node->filePath()), inputsJsonFile); - auto qmlProjectNodePtr = qmlProjectNode.get(); - const_cast(node)->addNode(std::move(qmlProjectNode)); - ProjectExplorer::ProjectTree::emitSubtreeChanged(qmlProjectNodePtr); + const_cast(node)->replaceSubtree(nullptr, std::move(qmlProjectNode)); }); }; From 3224743a1c09107652fc916a2fdf227076647a9b Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Tue, 11 Jul 2023 16:09:24 +0200 Subject: [PATCH 08/12] Doc: Move Qt Designer keyboard shortcuts to their own section They were mixed with Editor shortcuts. Fixes: QTCREATORBUG-29399 Change-Id: I5f81e1c32cabd7f94bb0d2adef29ff8a0d5ca748 Reviewed-by: Reviewed-by: Eike Ziller --- .../src/howto/creator-keyboard-shortcuts.qdoc | 44 +++++++++++-------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc index 8efe6c1324b..878a0f6cca6 100644 --- a/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc +++ b/doc/qtcreator/src/howto/creator-keyboard-shortcuts.qdoc @@ -344,25 +344,7 @@ \row \li Visualize whitespace \li Ctrl+E, Ctrl+V - \row - \li Adjust size - \li Ctrl+J - \row - \li Lay out in a grid - \li Ctrl+G - \row - \li Lay out horizontally - \li Ctrl+H - \row - \li Lay out vertically - \li Ctrl+L - \row - \li Preview - \li Alt+Shift+R \if defined(qtcreator) - \row - \li Edit signals and slots - \li F4 \row \li Toggle bookmark \li Ctrl+M @@ -498,6 +480,32 @@ \li Yank \endlist + \section1 \QD Shortcuts + + \table + \header + \li Action + \li Keyboard shortcut + \row + \li Adjust size + \li Ctrl+J + \row + \li Lay out in a grid + \li Ctrl+G + \row + \li Lay out horizontally + \li Ctrl+H + \row + \li Lay out vertically + \li Ctrl+L + \row + \li Preview + \li Alt+Shift+R + \row + \li Edit signals and slots + \li F4 + \endtable + \section1 Image Viewer Shortcuts \table From 9e8bdc983645700d7140f30df87aaca1c3143e2a Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 12 Jul 2023 10:03:31 +0200 Subject: [PATCH 09/12] Fix order of session vs recent files/projects menu Got mixed up when moving the session manager to Core Change-Id: I729dd505c0b58bbbe46ddee423c76ab21c6f1b25 Reviewed-by: Christian Kandeler --- src/plugins/coreplugin/coreconstants.h | 1 + src/plugins/coreplugin/mainwindow.cpp | 1 + src/plugins/coreplugin/session.cpp | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/plugins/coreplugin/coreconstants.h b/src/plugins/coreplugin/coreconstants.h index 513d02eb6ee..2606628d266 100644 --- a/src/plugins/coreplugin/coreconstants.h +++ b/src/plugins/coreplugin/coreconstants.h @@ -143,6 +143,7 @@ const char G_HELP[] = "QtCreator.Group.Help"; // File menu groups const char G_FILE_NEW[] = "QtCreator.Group.File.New"; const char G_FILE_OPEN[] = "QtCreator.Group.File.Open"; +const char G_FILE_SESSION[] = "QtCreator.Group.File.Recent"; const char G_FILE_PROJECT[] = "QtCreator.Group.File.Project"; const char G_FILE_SAVE[] = "QtCreator.Group.File.Save"; const char G_FILE_EXPORT[] = "QtCreator.Group.File.Export"; diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index 846b5d9dea2..ee5138f62e8 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/src/plugins/coreplugin/mainwindow.cpp @@ -475,6 +475,7 @@ void MainWindow::registerDefaultContainers() filemenu->menu()->setTitle(Tr::tr("&File")); filemenu->appendGroup(Constants::G_FILE_NEW); filemenu->appendGroup(Constants::G_FILE_OPEN); + filemenu->appendGroup(Constants::G_FILE_SESSION); filemenu->appendGroup(Constants::G_FILE_PROJECT); filemenu->appendGroup(Constants::G_FILE_SAVE); filemenu->appendGroup(Constants::G_FILE_EXPORT); diff --git a/src/plugins/coreplugin/session.cpp b/src/plugins/coreplugin/session.cpp index 6b1723cf1e1..7954b50e341 100644 --- a/src/plugins/coreplugin/session.cpp +++ b/src/plugins/coreplugin/session.cpp @@ -100,7 +100,7 @@ SessionManager::SessionManager() ActionContainer *msession = ActionManager::createMenu(M_SESSION); msession->menu()->setTitle(PE::Tr::tr("S&essions")); msession->setOnAllDisabledBehavior(ActionContainer::Show); - mfile->addMenu(msession, Core::Constants::G_FILE_OPEN); + mfile->addMenu(msession, Core::Constants::G_FILE_SESSION); sb_d->m_sessionMenu = msession->menu(); connect(mfile->menu(), &QMenu::aboutToShow, this, [] { sb_d->updateSessionMenu(); }); From 6ef4bd0a65572715f79231c4e1fa0ad2b43fd437 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 11 Jul 2023 14:51:53 +0200 Subject: [PATCH 10/12] Revert "SquishTests: Adapt test for Qml debugging" This patch had been valid when there had been another different issue of using qmlpuppet instead of qmlviewer or qmlscene. The other issue is fixed, so this patch is obsolete and now wrong. Change-Id: I291651256db2da1763d918c34811f03950cdb322 Reviewed-by: Marcus Tillmanns --- .../suite_debugger/tst_qml_locals/test.py | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tests/system/suite_debugger/tst_qml_locals/test.py b/tests/system/suite_debugger/tst_qml_locals/test.py index 525f45f95fa..37ecb515cc6 100644 --- a/tests/system/suite_debugger/tst_qml_locals/test.py +++ b/tests/system/suite_debugger/tst_qml_locals/test.py @@ -48,9 +48,13 @@ def main(): earlyExit("Could not find expected Inspector tree inside Locals and Expressions.") return # reduce items to outer Rectangle object - items = items.getChild("QQmlApplicationEngine") + items = items.getChild("QQuickView") if items == None: - earlyExit("Could not find expected QQmlApplicationEngine tree inside Locals and Expressions.") + earlyExit("Could not find expected QQuickView tree inside Locals and Expressions.") + return + items = items.getChild("QQuickRootItem") + if items == None: + earlyExit("Could not find expected QQuickRootItem tree inside Locals and Expressions.") return items = items.getChild("Rectangle") if items == None: @@ -72,14 +76,13 @@ def main(): invokeMenuItem("File", "Exit") def __unfoldTree__(): - view = waitForObject(':Locals and Expressions_Debugger::Internal::WatchTreeView') # TODO inspect the qmlengine as well? - rootIndex = getQModelIndexStr("text='QQmlApplicationEngine'", + rootIndex = getQModelIndexStr("text='QQuickView'", ':Locals and Expressions_Debugger::Internal::WatchTreeView') - if not test.verify(view.isExpanded(waitForObject(rootIndex)), - "QQmlApplicationEngine should be expanded already."): - unfoldQModelIndex(rootIndex, False) - mainRect = getQModelIndexStr("text='Rectangle'", rootIndex) + unfoldQModelIndex(rootIndex, False) + quickRootItem = getQModelIndexStr("text='QQuickRootItem'", rootIndex) + unfoldQModelIndex(quickRootItem, False) + mainRect = getQModelIndexStr("text='Rectangle'", quickRootItem) unfoldQModelIndex(mainRect) subItems = ["text='Rectangle'", "text='Rectangle' occurrence='2'", "text='Text'"] for item in subItems: From ba755e50a364c350be8a5b9c1752b333d761da0b Mon Sep 17 00:00:00 2001 From: Cristian Adam Date: Tue, 11 Jul 2023 14:57:41 +0200 Subject: [PATCH 11/12] Utils: Fix inverted logic for checkableDecider (continued) Amends 6b6b1198dd5050a7a896ac9c7505ebcf2c9bce17 The commit above made sure that the display of the dialog was in sync with the checkbox in the settings dialog. Now also the "Do not show again" checkbox in the messagebox will be reflected in the settings dialog. Change-Id: Ieb186b134adac09c9846a64144056b3b89d297d8 Reviewed-by: hjk --- src/libs/utils/aspects.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/utils/aspects.cpp b/src/libs/utils/aspects.cpp index 9bc51c7f530..b11e149c0d5 100644 --- a/src/libs/utils/aspects.cpp +++ b/src/libs/utils/aspects.cpp @@ -1611,7 +1611,7 @@ CheckableDecider BoolAspect::askAgainCheckableDecider() { return CheckableDecider( [this] { return value(); }, - [this] { setValue(true); } + [this] { setValue(false); } ); } From e11073aea6df6f925d76e496ca4186b979369212 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 12 Jul 2023 15:47:29 +0200 Subject: [PATCH 12/12] Change log: Exchange doc snapshot links with "real" links for the release. Also fix the link to terminal documentation, which changed in the meantime. Change-Id: Ieb1a14248d9569c7b46abf9d8554d41a604e0767 Reviewed-by: Reviewed-by: Leena Miettinen --- dist/changelog/changes-11.0.0.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/changelog/changes-11.0.0.md b/dist/changelog/changes-11.0.0.md index ebfc6584875..d26e8b2d60c 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://docs.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://docs.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://docs.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://docs.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://docs.qt.io/qtcreator/creator-axivion.html)) General ------- @@ -161,7 +161,7 @@ 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://docs.qt.io/qtcreator/creator-python-development.html)) Projects -------- @@ -189,7 +189,7 @@ Projects ([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)) + ([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