From 6228e190ec2e154404f5c3d0d6b88b8ab1049d37 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Wed, 20 Apr 2022 14:37:18 +0200 Subject: [PATCH 1/7] Add change log for 7.0.1 Change-Id: I573ca9ca154fc48c3e27bf959764c53f43c09bd2 Reviewed-by: Reviewed-by: Leena Miettinen --- dist/changes-7.0.1.md | 111 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 dist/changes-7.0.1.md diff --git a/dist/changes-7.0.1.md b/dist/changes-7.0.1.md new file mode 100644 index 00000000000..59d3c998dc1 --- /dev/null +++ b/dist/changes-7.0.1.md @@ -0,0 +1,111 @@ +Qt Creator 7.0.1 +================ + +Qt Creator version 7.0.1 contains bug fixes. + +The most important changes are listed in this document. For a complete list of +changes, see the Git log for the Qt Creator sources that you can check out from +the public Git repository. For example: + + git clone git://code.qt.io/qt-creator/qt-creator.git + git log --cherry-pick --pretty=oneline origin/v7.0.0..v7.0.1 + +General +------- + +* Fixed update notification + +Editing +------- + +* Fixed that double-clicking in navigation view no longer opened file in + separate editor window (QTCREATORBUG-26773) +* Fixed selection after indenting multiple lines (QTCREATORBUG-27365) +* Fixed issues with `Ctrl+Click` for following symbol (QTCREATORBUG-26595) + +### C++ + +* Fixed crash with Doxygen comment (QTCREATORBUG-27207) +* Fixed cursor visibility after refactoring (QTCREATORBUG-27210) +* Fixed that `Auto-Indent Selection` indented raw unicode string literals + (QTCREATORBUG-27244) +* Fixed indentation after structured binding (QTCREATORBUG-27183) +* Fixed moving function definition with exception specification, reference + qualifiers, or trailing return type (QTCREATORBUG-27132) +* Fixed `Generate Getter/Setter` with function types (QTCREATORBUG-27133) +* Clangd + * Fixed local symbol renaming (QTCREATORBUG-27249) + * Fixed more output parameter syntax highlighting issues + (QTCREATORBUG-27352, QTCREATORBUG-27367, QTCREATORBUG-27368) + * Fixed crash when navigating (QTCREATORBUG-27323) + * Fixed semantic highlighting in some cases (QTCREATORBUG-27384) + +### QML + +* Fixed handling of JavaScript string templates (QTCREATORBUG-21869) +* Fixed wrong M325 warnings (QTCREATORBUG-27380) + +Projects +-------- + +* Fixed default build device (QTCREATORBUG-27242) + +### CMake + +* Fixed empty `-D` parameter being passed to CMake (QTCREATORBUG-27237) +* Fixed that configuration errors could lead to hidden configuration widget +* Fixed sysroot configuration (QTCREATORBUG-27280) + +Platforms +--------- + +### macOS + +* Fixed `Open Terminal` and `Run in Terminal` on macOS 12.3 (QTCREATORBUG-27337) + +### Android + +* Fixed `Application Output` for Android 6 and earlier (QTCREATORBUG-26732) +* Fixed debugging on Linux with NDK 23 (QTCREATORBUG-27297) + +### QNX + +* Fixed progress bar for deploying libraries (QTCREATORBUG-27274) +* Fixed wrong `LD_LIBRARY_PATH` (QTCREATORBUG-27287) + +### WebAssembly + +* Fixed running `emrun --browser` with latest emsdk (QTCREATORBUG-27239) + +Credits for these changes go to: +-------------------------------- +Aaron Barany +Aleksei German +Alesandro Portale +Alessandro Portale +André Pönitz +Assam Boudjelthia +Christian Kandeler +Christian Stenger +Cristian Adam +David Schulz +Eike Ziller +Fawzi Mohamed +GPery +Henning Gruendl +Jaroslaw Kobus +Knud Dollereder +Leena Miettinen +Marco Bubke +Mats Honkamaa +Miikka Heikkinen +Orgad Shaneh +Rafael Roquetto +Robert Löhning +Samuel Ghinet +Samuli Piippo +Tapani Mattila +Tasuku Suzuki +Thomas Hartmann +Tim Jenssen +Vikas Pachdha From da16d778d57e16d15d6445509543994ce7f65bc1 Mon Sep 17 00:00:00 2001 From: Aleksei German Date: Thu, 31 Mar 2022 18:20:28 +0200 Subject: [PATCH 2/7] QmlDesigner: Fix for builds in default MCU project Task-number: QDS-6599 Change-Id: I77d7f6f8a0df8a9992956d5d23d2e219c1e4f077 Reviewed-by: Reviewed-by: Thomas Hartmann --- .../projects/application-mcu/CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt index c776d4f8a54..fa5be381289 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt +++ b/share/qtcreator/qmldesigner/studio_templates/projects/application-mcu/CMakeLists.txt @@ -40,12 +40,14 @@ qul_add_qml_module(ConstantsModule imports/Constants/Constants.qml ) -# Using recurse search to find all qml files in project directory -# Excluding Constants folder because it is part of another qml module -# Excluding MCUDefaultStyle because it exists for compatibility purposes with QDS +message(WARNING "It is recommended to replace the recursive search with the actual list of .qml files in your project.") file(GLOB_RECURSE qmlSources "*.qml") +# Excluding Constants folder because it is part of another qml module list(FILTER qmlSources EXCLUDE REGEX ".*/imports/Constants/.*") +# Excluding MCUDefaultStyle because it exists for compatibility purposes with QDS list(FILTER qmlSources EXCLUDE REGEX ".*/MCUDefaultStyle/.*") +# Excluding binary directory because it can break builds in source dir +list(FILTER qmlSources EXCLUDE REGEX "${CMAKE_CURRENT_BINARY_DIR}/.*") qul_target_qml_sources(%{ProjectName} ${qmlSources}) if (Qul_VERSION VERSION_GREATER_EQUAL "2.0") From 48f01f503fbc75bb1d05b24b730df086b89add3c Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 25 Apr 2022 12:02:56 +0300 Subject: [PATCH 3/7] ProjectExplorer: Only strip L from cplusplus macro if it exists Old GCC versions have #define __cplusplus 1 Change-Id: I71286656df8f9925c2e0ccc46d32546037423268 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/toolchain.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index bf3412cfe64..945835fa4ff 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -411,7 +411,8 @@ const ToolChain::MacrosCache &ToolChain::predefinedMacrosCache() const static long toLanguageVersionAsLong(QByteArray dateAsByteArray) { - dateAsByteArray.chop(1); // Strip 'L'. + if (dateAsByteArray.endsWith('L')) + dateAsByteArray.chop(1); // Strip 'L'. bool success = false; const int result = dateAsByteArray.toLong(&success); From 5e75673dde7b5d2384c4180b38681c16f58f67eb Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Apr 2022 09:20:50 +0200 Subject: [PATCH 4/7] QmlJsCheck: Add more ids to negative lists Since those are QML keywords those ids can create all kind of unexpected side effects. Change-Id: I9ecb9b0559c57d59104aacedfca505b559de9685 Reviewed-by: Tim Jenssen --- src/libs/qmljs/qmljscheck.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/libs/qmljs/qmljscheck.cpp b/src/libs/qmljs/qmljscheck.cpp index a0ce17eac03..d7f96f92a42 100644 --- a/src/libs/qmljs/qmljscheck.cpp +++ b/src/libs/qmljs/qmljscheck.cpp @@ -571,7 +571,9 @@ public: "color", "margin", "padding", "print", "border", "font", "text", "source", "state", "visible", "focus", "data", "clip", "layer", "scale", "enabled", "anchors", - "texture", "shaderInfo", "sprite", "spriteSequence", "baseState"}) + "texture", "shaderInfo", "sprite", "spriteSequence", "baseState" + "vector", "string", "url", "var", "point", "date", "size", "list", + "enumeration"}) {} }; From 8e8491e32cd7be9168bd1c837449bec2339a1a23 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Apr 2022 11:43:53 +0200 Subject: [PATCH 5/7] StudioWelcome: Use Welcome as display name Task-number: QDS-6788 Change-Id: I4a9400af6ce98be82826b1301aef7c383615e771 Reviewed-by: Reviewed-by: Tim Jenssen --- src/plugins/studiowelcome/studiowelcomeplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index 0ca852725cf..8c933829731 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -645,7 +645,7 @@ QString StudioWelcomePlugin::examplesPathSetting() WelcomeMode::WelcomeMode() { - setDisplayName(tr("Studio")); + setDisplayName(tr("Welcome")); const Utils::Icon FLAT({{":/studiowelcome/images/mode_welcome_mask.png", Utils::Theme::IconsBaseColor}}); From 1f5ede1543be82cfd014d77a7baffe82092cdf4e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Apr 2022 10:32:48 +0200 Subject: [PATCH 6/7] QmlDesigner: Do not show error while type information is incomplete Task-number: QDS-6546 Change-Id: I1c295fc3417f7bb83d8cc0e751e1893cd74d8d4f Reviewed-by: Reviewed-by: Tim Jenssen --- .../qmldesigner/components/formeditor/formeditorview.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp index e07c17cb04e..9fc14da9992 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorview.cpp @@ -467,7 +467,10 @@ void FormEditorView::bindingPropertiesChanged(const QList &prop void FormEditorView::documentMessagesChanged(const QList &errors, const QList &) { - if (!errors.isEmpty()) + QTC_ASSERT(model(), return); + QTC_ASSERT(model()->rewriterView(), return); + + if (!errors.isEmpty() && !model()->rewriterView()->hasIncompleteTypeInformation()) m_formEditorWidget->showErrorMessageBox(errors); else m_formEditorWidget->hideErrorMessageBox(); From 099f02b5db2b4256b9238c3a27173c458da6f95e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Tue, 26 Apr 2022 09:22:15 +0200 Subject: [PATCH 7/7] QmlDesigner: Add new way to load fonts to template StudioApplication will load the correct font in time. This only works for Qt 6. Task-number: QDS-3286 Change-Id: I2d97ca19bace8e13c7a4df355d1addb7267e117c Reviewed-by: Tim Jenssen --- .../projects/shared-plugin/name/Constants.qml.tpl | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl index 98c1927f2ea..6fcae14ea65 100644 --- a/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl +++ b/share/qtcreator/qmldesigner/studio_templates/projects/shared-plugin/name/Constants.qml.tpl @@ -1,12 +1,15 @@ pragma Singleton import QtQuick %{QtQuickVersion} +@if %{IsQt6Project} +import QtQuick.Studio.Application +@else +@endif QtObject { readonly property int width: %{ScreenWidth} readonly property int height: %{ScreenHeight} - property alias fontDirectory: directoryFontLoader.fontDirectory - property alias relativeFontDirectory: directoryFontLoader.relativeFontDirectory + property string relativeFontDirectory: "fonts" /* Edit this comment to add your custom font */ readonly property font font: Qt.font({ @@ -20,7 +23,14 @@ QtObject { readonly property color backgroundColor: "#c2c2c2" + +@if %{IsQt6Project} + property StudioApplication application: StudioApplication { + fontPath: Qt.resolvedUrl("../../content/" + relativeFontDirectory) + } +@else property DirectoryFontLoader directoryFontLoader: DirectoryFontLoader { id: directoryFontLoader } +@endif }