Merge remote-tracking branch 'origin/7.0'

Change-Id: I3da1b663a570682201afbe644d6f9299019aae21

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  

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

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
 }

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"})
     {}
 };
 

src/plugins/projectexplorer/toolchain.cpp

@@ -412,7 +412,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);

src/plugins/qmldesigner/components/formeditor/formeditorview.cpp

@@ -467,7 +467,10 @@ void FormEditorView::bindingPropertiesChanged(const QList<BindingProperty> &prop
 
 void FormEditorView::documentMessagesChanged(const QList<DocumentMessage> &errors, const QList<DocumentMessage> &)
 {
-    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();

src/plugins/studiowelcome/studiowelcomeplugin.cpp

@@ -644,7 +644,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}});