From 9d221706f48cfcc6aad17f8cd6730ae0c9107716 Mon Sep 17 00:00:00 2001
From: Assam Boudjelthia <assam.boudjelthia@qt.io>
Date: Fri, 17 Dec 2021 13:13:07 +0200
Subject: [PATCH 01/12] Android: Install both target and whole project
 artefacts with qmake

As a workaround for qmake projects with dependencies for shared
libraries, make sure to install both the current target and the whole
project artefacts, the latter was the default before QTCREATORBUG-25793.

Task-number: QTCREATORBUG-26550
Change-Id: I8f313652bb582b2512ebe3471933e53120baf020
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 src/plugins/android/androidpackageinstallationstep.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/plugins/android/androidpackageinstallationstep.cpp b/src/plugins/android/androidpackageinstallationstep.cpp
index 5fe710b6b7b..e635461e734 100644
--- a/src/plugins/android/androidpackageinstallationstep.cpp
+++ b/src/plugins/android/androidpackageinstallationstep.cpp
@@ -107,8 +107,12 @@ bool AndroidPackageInstallationStep::init()
     const QString innerQuoted = ProcessArgs::quoteArg(dirPath);
     const QString outerQuoted = ProcessArgs::quoteArg("INSTALL_ROOT=" + innerQuoted);
 
-    CommandLine cmd{tc->makeCommand(buildEnvironment())};
-    cmd.addArgs(outerQuoted + " install", CommandLine::Raw);
+    const FilePath makeCommand = tc->makeCommand(buildEnvironment());
+    CommandLine cmd{makeCommand};
+    // Run install on both the target and the whole project as a workaround for QTCREATORBUG-26550.
+    cmd.addArgs(QString("%1 install && cd %2 && %3 %1 install")
+                .arg(outerQuoted).arg(ProcessArgs::quoteArg(buildDirectory().toUserOutput()))
+                .arg(ProcessArgs::quoteArg(makeCommand.toUserOutput())), CommandLine::Raw);
 
     processParameters()->setCommandLine(cmd);
     // This is useful when running an example target from a Qt module project.

From a3d7cb300d080c673eb17be8d821e22dae04bf40 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Fri, 21 Jan 2022 12:32:13 +0100
Subject: [PATCH 02/12] Update qbs submodule

... to HEAD of 1.21 branch.

Change-Id: I9d0b5074e2afe6ae3e00bb5431c1db1adf1a5bb4
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
---
 src/shared/qbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/qbs b/src/shared/qbs
index e08c3eedcdd..768b6894a8d 160000
--- a/src/shared/qbs
+++ b/src/shared/qbs
@@ -1 +1 @@
-Subproject commit e08c3eedcddbc18b251f56f7158353d8cbec2c81
+Subproject commit 768b6894a8d189158fed83cbc79d92d5484cb2e4

From 533b2d3655598bb303a44d409fbdf6e53bfa8713 Mon Sep 17 00:00:00 2001
From: Thomas Hartmann <thomas.hartmann@qt.io>
Date: Fri, 21 Jan 2022 11:10:31 +0100
Subject: [PATCH 03/12] QmlDesigner: Remove check for QtQuick3D 5.15

The check can create false positives if multiple projects are opened.
By now not many old projects should be around anymore and therefore
we can remove this.

Change-Id: Iec46e584a5e806bb29374d92b8f1afb1e6393c86
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 .../designercore/model/texttomodelmerger.cpp         | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index 2874cc9c8d7..c3239054d19 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -2253,18 +2253,6 @@ void TextToModelMerger::collectSemanticErrorsAndWarnings(QList<DocumentMessage>
         if (message.severity == Severity::Warning)
             warnings->append(DocumentMessage(message.toDiagnosticMessage(), fileNameUrl));
     }
-
-    for (const Import &import : m_rewriterView->model()->imports()) {
-        if (import.isLibraryImport() && import.url() == "QtQuick3D") {
-            const QString version = getHighestPossibleImport(import.url());
-            if (!import.version().isEmpty() && Import::majorFromVersion(version) > import.majorVersion()) {
-                errors->append(DocumentMessage(
-                    QObject::tr(
-                        "The selected version of the Qt Quick 3D module is not supported with the selected Qt version.")
-                        .arg(version)));
-            }
-        }
-    }
 }
 
 void TextToModelMerger::populateQrcMapping(const QString &filePath)

From 2ac3704e76cd8c9cf7589e0078d128234b9faaf5 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Mon, 17 Jan 2022 17:29:01 +0100
Subject: [PATCH 04/12] Doc: Update links to video tutorials and talks

- Remove links to videos that describe using the Qt Quick Designer
  plugin that is disabled by default since Qt Creator 6.0 or Qt Design
  Studio.
- Replace links to old video tutorials with those to newer ones
  created by Qt support.
- Add the production year as a tag to help estimate the usefullness of
  the video.
- Remove link to the discontinued Qt for Automotive video.

Fixes: QTCREATORBUG-26868
Change-Id: I27f32f8b240747abca380d79119be9ce0862d4f9
Reviewed-by: Tero Pelkonen <tero.pelkonen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Andy Shaw <andy.shaw@qt.io>
---
 src/plugins/qtsupport/qtcreator_tutorials.xml | 144 ++++++++----------
 1 file changed, 62 insertions(+), 82 deletions(-)

diff --git a/src/plugins/qtsupport/qtcreator_tutorials.xml b/src/plugins/qtsupport/qtcreator_tutorials.xml
index 362d87fd77f..71227a53380 100644
--- a/src/plugins/qtsupport/qtcreator_tutorials.xml
+++ b/src/plugins/qtsupport/qtcreator_tutorials.xml
@@ -14,69 +14,21 @@
       <tags>qt,qt creator,qt designer,widgets,c++,help</tags>
     </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-transitions-example.html" projectPath="" name="Help: Creating a Qt Quick Application">
-      <description><![CDATA[Using basic QML elements and learning about basic concepts of Qt Quick.]]></description>
-      <tags>qt creator,qt quick designer,qt quick,qml,states,transitions,help</tags>
+      <description><![CDATA[Using basic QML types and learning about basic concepts of Qt Quick.]]></description>
+      <tags>qt creator,qt quick,qml,states,transitions,help</tags>
     </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtcreator/doc/qtcreator-accelbubble-example.html" projectPath="" name="Help: Creating a Mobile Qt Application">
-      <description><![CDATA[Developing Qt Quick applications for Android and iOS devices using Qt Quick Controls.]]></description>
-      <tags>qt creator,qt quick designer,qml,android,ios,controls,help</tags>
+      <description><![CDATA[Developing Qt Quick applications for Android and iOS devices.]]></description>
+      <tags>qt creator,qml,android,ios,controls,help</tags>
     </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/tutorialicon.png" difficulty="" docUrl="qthelp://org.qt-project.qtdoc/qtdoc/qtdoc-tutorials-alarms-example.html" projectPath="" name="Help: Getting Started Programming with Qt Quick">
       <description><![CDATA[Developing Qt Quick applications using Qt Quick and Qt Quick Controls.]]></description>
       <tags>qt quick,controls,tumbler,help</tags>
     </tutorial>
 
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Digital Instrument Cluster with Qt Quick Designer and Qt Safe Renderer" isVideo="true" videoUrl="https://www.youtube.com/watch?v=9RxxsOCeZHk" videoLength="4:06">
-      <description><![CDATA[Creating a digital instrument cluster with Qt Quick Designer and Qt Safe Renderer.]]></description>
-      <tags>qt creator,qt quick,automotive,safe renderer,controls,video</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt for Device Creation" isVideo="true" videoUrl="https://www.youtube.com/watch?v=PercN_GtVJA" videoLength="3:01">
-      <description><![CDATA[Creating a Qt widget based application.]]></description>
-      <tags>qt creator,embedded,device creation,video</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Getting Started - Qt for Device Creation" isVideo="true" videoUrl="https://www.youtube.com/watch?v=QFWPw4UWL9E" videoLength="8:30">
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to set up and deploy an application using Qt for Device Creation" isVideo="true" videoUrl="https://youtu.be/1tSpq5OLkYI" videoLength="5:48">
       <description><![CDATA[Using Qt Creator to deploy applications to an embedded device.]]></description>
-      <tags>qt creator,embedded,device creation,video</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Quick Designer - The Coffee Machine" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Ko3YPM_tStM" videoLength="3:06">
-      <description><![CDATA[Creating a UI for embedded devices.]]></description>
-      <tags>qt creator,qt quick,embedded,video,controls</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Getting Started - Hello Widget World " isVideo="true" videoUrl="https://www.youtube.com/watch?v=TIUTO8GjSGo" videoLength="9:10">
-      <description><![CDATA[Creating a Qt widget based application.]]></description>
-    <tags>qt creator,widgets,video</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Getting Started - Hello Quick World" isVideo="true" videoUrl="https://www.youtube.com/watch?v=nepoVgVvWEI" videoLength="13:28">
-      <description><![CDATA[Creating a Qt Quick application.]]></description>
-      <tags>qt creator,qt quick,video</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: UI Navigation" isVideo="true" videoUrl="https://www.youtube.com/watch?v=RfEYO-5Mw6s" videoLength="1:00">
-      <description><![CDATA[Navigating in Qt Quick Designer and using the different views.]]></description>
-      <tags>qt creator,qt quick,views,quick tip,video,2020</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Animated Image" isVideo="true" videoUrl="https://www.youtube.com/watch?v=DVWd_xMMgvg" videoLength="1:00">
-      <description><![CDATA[Using the basic AnimatedImage QML type to add GIF images to UIs.]]></description>
-      <tags>qt creator,qt quick,animated image,gif,quick tip,qml,video,2020</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Bindings" isVideo="true" videoUrl="https://www.youtube.com/watch?v=UfvA04CIXv0" videoLength="1:00">
-      <description><![CDATA[Using bindings to dynamically change the behavior of an object.]]></description>
-      <tags>qt creator,qt quick,bindings,quick tip,qml,video,2020</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Interactive 3D" isVideo="true" videoUrl="https://youtu.be/w1yhDl93YI0" videoLength="2:45">
-      <description><![CDATA[Incorporating 3D graphics into UIs in Qt Quick Designer.]]></description>
-      <tags>qt creator,qt quick,3D,FBX,quick tip,video,2020</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Slider" isVideo="true" videoUrl="https://www.youtube.com/watch?v=Ed8WS03C-Vk" videoLength="1:00">
-      <description><![CDATA[Using the Slider Qt Quick control to create a slider.]]></description>
-      <tags>qt creator,qt quick,slider,quick tip,controls,video,2020</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: States" isVideo="true" videoUrl="https://www.youtube.com/watch?v=FzmLuRHQXaw" videoLength="1:00">
-      <description><![CDATA[Using states in a UI.]]></description>
-      <tags>qt creator,qt quick,slider,quick tip,controls,video,2020</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Design Studio QuickTip: Text Element" isVideo="true" videoUrl="https://www.youtube.com/watch?v=yOUdg1o2KJM" videoLength="1:00">
-      <description><![CDATA[Using the basic Text QML type to create a text label with a custom font.]]></description>
-      <tags>qt creator,qt quick,quick tip,qml,test,video,2020</tags>
+      <tags>qt creator,embedded,device creation,video,2021</tags>
     </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt SCXML and State Machine Tooling in Qt Creator" isVideo="true" videoUrl="https://youtu.be/9xqhq9nDiOg" videoLength="4:53">
       <description><![CDATA[Creating state machines.]]></description>
@@ -92,19 +44,51 @@
     </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Creator - Examples" isVideo="true" videoUrl="https://www.youtube.com/watch?v=R6zWLfHIYJw" videoLength="9:29">
       <description><![CDATA[Using Qt Creator tutorials and examples to develop Qt applications.]]></description>
-      <tags>qt creator,video</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Creator - UI Design with Qt Quick Designer" isVideo="true" videoUrl="https://www.youtube.com/watch?v=0Po3tE9yUcU" videoLength="7:36">
-      <description><![CDATA[Using Qt Quick Designer to develop Qt Quick applications.]]></description>
-      <tags>qt creator,qt quick,video</tags>
-    </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: QML - Introduction" isVideo="true" videoUrl="https://www.youtube.com/watch?v=GkzncJ71mm0" videoLength="9:42">
-      <description><![CDATA[Using signals, slots, and property bindings Qt Quick applications.]]></description>
-      <tags>qt creator,qt quick,qml,video</tags>
+      <tags>qt creator,video,2018</tags>
     </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Creator - Introduction to Qt Quick Controls" isVideo="true" videoUrl="https://www.youtube.com/watch?v=uuhmSZxK1mk" videoLength="7:09">
       <description><![CDATA[Using Qt Quick Controls to develop Qt Quick applications.]]></description>
-      <tags>qt creator,qt quick,controls,video</tags>
+      <tags>qt creator,qt quick,controls,video,2018</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Debugging inside Qt Creator" isVideo="true" videoUrl="https://youtu.be/Y-MM-9FigTc" videoLength="21:54">
+      <description><![CDATA[Debugging applications in Qt Creator.]]></description>
+      <tags>qt creator,debugging,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to do translations with Qt Linguist" isVideo="true" videoUrl="https://youtu.be/xNIz78IPBu0" videoLength="9:14">
+      <description><![CDATA[Preparing applications for translation, translating them with Qt Linguist, and using the translations in apps.]]></description>
+      <tags>qt creator,qt linguist,translation,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Windows Online Installer walkthrough" isVideo="true" videoUrl="https://youtu.be/-xhiVA0P4yk" videoLength="6:17">
+      <description><![CDATA[Downloading and installing Qt with the options that you want.]]></description>
+      <tags>qt,installation,online installer,modules,video,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to install and set up Qt for Device Creation on Linux" isVideo="true" videoUrl="https://youtu.be/YJfFwDBOvqk" videoLength="6:52">
+      <description><![CDATA[Downloading and installing Qt Device Creation with the options that you want.]]></description>
+      <tags>embedded,installation,device creation,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Creating a simple widget app" isVideo="true" videoUrl="https://youtu.be/jbx3Oq1Q4gY" videoLength="6:08">
+      <description><![CDATA[Creating a simple widget-based application and running it on your development machine using Qt Creator 5.0.]]></description>
+      <tags>qt creator,widgets,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Creating a simple Qt Quick app" isVideo="true" videoUrl="https://youtu.be/mAhwHsGdJuI" videoLength="8:21">
+      <description><![CDATA[Creating a simple Qt Quick application and running it on your development machine using Qt Creator 5.0.]]></description>
+      <tags>qt creator,qt quick,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Qt Widgets or Qt Quick" isVideo="true" videoUrl="https://youtu.be/2RvhhEAZQxM" videoLength="5:00">
+      <description><![CDATA[Learning the differences between Qt Widgets and Qt Quick and making the right choice for your application needs.]]></description>
+      <tags>qt quick,widgets,ui,video,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to install and set up Qt for MCUs" isVideo="true" videoUrl="https://youtu.be/DRFz0Tll4G8" videoLength="8:29">
+      <description><![CDATA[Downloading and installing Qt for MCUs with the options that you want.]]></description>
+      <tags>qt,mcus,video,STM32H750B-DISCOVERY,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to build your first 'Qt for MCUs' application" isVideo="true" videoUrl="https://youtu.be/BkgjJfxYN20" videoLength="21:54">
+      <description><![CDATA[Building your first application for the NXP IMXRT1050 device.]]></description>
+      <tags>qtformcus,mcus,qt,video,NXP IMXRT1050-EVKB,2020</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to create a simple application with Qt for MCUs" isVideo="true" videoUrl="https://youtu.be/mn-JmXIMCqk" videoLength="5:16">
+      <description><![CDATA[Creating a simple Qt for MCUs application and running it on your development machine using Qt Creator 5.0.]]></description>
+      <tags>qtformcus,mcus,qt,video,2021</tags>
     </tutorial>
 
     <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Introduction to Qt Creator IDE" isVideo="true" videoUrl="https://www.youtube.com/watch?v=nGFmjOiT22Y" videoLength="1:06:32">
@@ -139,10 +123,6 @@
       <description><![CDATA[Using Qt Creator, Qbs, and QEMU for application development.]]></description>
       <tags>qt creator,qbs,qemu,talk,2015</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: All About Qt on Android" isVideo="true" videoUrl="https://youtu.be/dmKNxyi_YNk" videoLength="31:20">
-      <description><![CDATA[Developing Qt applications for Android devices.]]></description>
-      <tags>qt creator,android,talk,2016</tags>
-    </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt for iOS - A to Z" isVideo="true" videoUrl="https://youtu.be/T_13aX5NTPk" videoLength="1:00:13">
       <description><![CDATA[Developing Qt applications for iOS.]]></description>
       <tags>qt creator,ios,talk,2016</tags>
@@ -151,10 +131,6 @@
       <description><![CDATA[Developing Qt Applications for Bare Metal devices.]]></description>
       <tags>qt creator,baremetal,talk,2013</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Developing User Interfaces with Qt Quick Controls 2" isVideo="true" videoUrl="https://youtu.be/ozpSl7WbVt4" videoLength="23:13">
-      <description><![CDATA[Using Qt Quick Controls 2 to create UIs.]]></description>
-      <tags>ui,qt quick designer,controls,ui,talk,2016</tags>
-    </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: The Curse of Choice - An Overview of GUI Technologies in Qt" isVideo="true" videoUrl="https://youtu.be/WIRRoPxIerc" videoLength="40:45">
       <description><![CDATA[Overview of UI technologies that can be used with Qt.]]></description>
       <tags>qt quick,ui,widgets,talk,2016</tags>
@@ -179,10 +155,6 @@
       <description><![CDATA[Making Android and iOS apps smaller.]]></description>
       <tags>android,ios,talk,2017</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Under the Hood of Qt Automotive Suite After One Year of Hacking" isVideo="true" videoUrl="https://www.youtube.com/watch?v=7FqG2lpJ1KE" videoLength="23:38">
-      <description><![CDATA[Introducing Qt Application Manager plugin in Qt Creator.]]></description>
-      <tags>automotive,application manager,talk,2017</tags>
-    </tutorial>
     <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: LTTng for full stack tracing" isVideo="true" videoUrl="https://youtu.be/v_ynSET9FHU" videoLength="25:46">
       <description><![CDATA[Using tracing and profiling to optimize the startup time of apps.]]></description>
       <tags>qt creator,qml profiler,ctf viewer,lttng,talk,2019</tags>
@@ -195,13 +167,21 @@
       <description><![CDATA[Using Qt Creator kits and Yocto when developing for embedded devices.]]></description>
       <tags>qt creator,kits,yocto,embedded,talk,2019</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: How to build your first 'Qt for MCUs' application" isVideo="true" videoUrl="https://youtu.be/BkgjJfxYN20" videoLength="21:54">
-      <description><![CDATA[Building your first application for the NXP IMXRT1050 device.]]></description>
-      <tags>qtformcus,mcus,qt,video,NXP IMXRT1050-EVKB,2020</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Qt Creator in Space" isVideo="true" videoUrl="https://youtu.be/1w0ak9RNNWY" videoLength="28:05">
+      <description><![CDATA[Creating and maintaining a portfolio of Qt Creator plugins.]]></description>
+      <tags>qt creator,plugins,video,2021</tags>
     </tutorial>
-    <tutorial imageUrl=":qtsupport/images/icons/videotutorialicon.png" difficulty="" projectPath="" name="Online: Creating dynamic UIs for a 'Qt for MCUs' application using Qt Design Studio and Photoshop" isVideo="true" videoUrl="https://youtu.be/USrLl6tRc00" videoLength="1:00:19">
-      <description><![CDATA[A step-by-step walkthrough showcasing how to create dynamic UIs using Qt Design Studio and Photoshop on MCUs.]]></description>
-      <tags>qtformcus,mcus,qt,video,2020</tags>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: All You Need to Get Your App Done with Qt for Android" isVideo="true" videoUrl="https://youtu.be/nmvurCcsWos" videoLength="24:11">
+      <description><![CDATA[Developing an Android app using Qt for Android.]]></description>
+      <tags>android,talk,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: Styling a Qt Quick Controls Desktop Application" isVideo="true" videoUrl="https://youtu.be/tnZo9umrPtg" videoLength="29:40">
+      <description><![CDATA[Styling Qt Quick Controls using the styling API.]]></description>
+      <tags>qt quick,controls,styling,ui,talk,2021</tags>
+    </tutorial>
+    <tutorial imageUrl=":qtsupport/images/icons/qteventicon.png" difficulty="" projectPath="" name="Talk: The New Property Bindings: Making C++ more QMLish" isVideo="true" videoUrl="https://youtu.be/pN0pRBUqrrc" videoLength="29:54">
+      <description><![CDATA[Using the Qt 6 property system in pure C++ and mixed C++/QML applications.]]></description>
+      <tags>qt,c++,qml,talk,2021</tags>
     </tutorial>
     </tutorials>
 </instructionals>

From c7c774790687b15b9bfed5a9a1568a769aab4697 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Mon, 24 Jan 2022 16:56:06 +0100
Subject: [PATCH 05/12] QmlDesigner: Adapt theme colors to welcome screen

Change-Id: I566a692c05f9799e4f44718a426d9536d5e2b9cd
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 share/qtcreator/themes/dark.creatortheme      | 40 +++++++++---------
 share/qtcreator/themes/default.creatortheme   | 19 +++++----
 .../themes/design-light.creatortheme          | 16 +++----
 share/qtcreator/themes/design.creatortheme    | 38 ++++++++---------
 share/qtcreator/themes/flat-dark.creatortheme | 40 +++++++++---------
 .../qtcreator/themes/flat-light.creatortheme  | 16 +++----
 share/qtcreator/themes/flat.creatortheme      | 42 +++++++++----------
 7 files changed, 106 insertions(+), 105 deletions(-)

diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme
index 5d62a28a00d..a74630ccb2b 100644
--- a/share/qtcreator/themes/dark.creatortheme
+++ b/share/qtcreator/themes/dark.creatortheme
@@ -23,23 +23,23 @@ qmlDesignerButtonColor=ff3c3e40
 
 [Colors]
 ;DS controls theme START
-DSpanelBackground=ff323232
+DSpanelBackground=ff2E2F30
 
 DSwelcomeScreenBackground=ff242424
-DSsubPanelBackground=ff040404
-DSthumbnailBackground=ff292929
-DSthumbnailLabelBackground=ff3D3D3D
+DSsubPanelBackground=ff1c1c1c
+DSthumbnailBackground=ff232323
+DSthumbnailLabelBackground=ff2b2a2a
 
 DSinteraction=ff2aafd3
 DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff707070
 
-DScontrolBackground=ff323232
-DScontrolBackgroundInteraction=ff595959
-DScontrolBackgroundDisabled=ff323232
-DScontrolBackgroundGlobalHover=ff474747
-DScontrolBackgroundHover=ff666666
+DScontrolBackground=ff2e2f30
+DScontrolBackgroundInteraction=ff3d3d3d
+DScontrolBackgroundDisabled=ff2e2f30
+DScontrolBackgroundGlobalHover=ff333333
+DScontrolBackgroundHover=ff333333
 
 DScontrolOutline=ff1f1f1f
 DScontrolOutlineInteraction=ff2aafd3
@@ -54,9 +54,9 @@ DSplaceholderTextColor=ffffffff
 DSplaceholderTextColorInteraction=ffababab
 
 DSiconColor=ffffffff
-DSiconColorHover=ff262626
+DSiconColorHover=ffffffff
 DSiconColorInteraction=ff707070
-DSiconColorDisabled=ff707070
+DSiconColorDisabled=ffC7C7C7
 DSiconColorSelected=ff2aafd3
 
 DSlinkIndicatorColor=ff808080
@@ -102,7 +102,7 @@ DSactionJIT=ff2db543
 DStableHeaderBackground=ffff0000
 DStableHeaderText=ff00ff00
 
-DSdockContainerBackground=ff323232
+DSdockContainerBackground=ff242424
 DSdockContainerSplitter=ff323232
 DSdockAreaBackground=ff262728
 
@@ -138,15 +138,15 @@ DStabFocusButtonPress=ff2aafd3
 
 DSnavigatorBranch=ff7c7b7b
 DSnavigatorBranchIndicator=ff7c7b7b
-DSnavigatorItemBackground=ff262626
-DSnavigatorItemBackgroundHover=ff666666
-DSnavigatorItemBackgroundSelected=ff1f1f1f
+DSnavigatorItemBackground=ff2E2F30
+DSnavigatorItemBackgroundHover=ff333333
+DSnavigatorItemBackgroundSelected=ff3D3D3D
 DSnavigatorText=ffffffff
-DSnavigatorTextHover=ff1f1f1f
+DSnavigatorTextHover=ffffffff
 DSnavigatorTextSelected=ff2aafd3
 DSnavigatorIcon=ffffffff
-DSnavigatorIconHover=ff1f1f1f
-DSnavigatorIconSelected=ff7c7b7b
+DSnavigatorIconHover=ffa1a1a1
+DSnavigatorIconSelected=ffffffff
 DSnavigatorAliasIconChecked=ffff0000
 DSnavigatorDropIndicatorBackground=ff2aafd3
 DSnavigatorDropIndicatorOutline=ff2aafd3
@@ -160,8 +160,8 @@ DStoolTipText=ffdadada
 
 DSUnimportedModuleColor=ffe33c2e
 
-DSBackgroundColorAlternate=ff323232
-DSBackgroundColorNormal=ff1f1f1f
+DSBackgroundColorAlternate=alternateBackground
+DSBackgroundColorNormal=normalBackground
 
 ;DS controls theme END
 
diff --git a/share/qtcreator/themes/default.creatortheme b/share/qtcreator/themes/default.creatortheme
index 1fe39754d33..ee047a8bc3a 100644
--- a/share/qtcreator/themes/default.creatortheme
+++ b/share/qtcreator/themes/default.creatortheme
@@ -18,8 +18,9 @@ DSpanelBackground=ffeaeaea
 
 DSwelcomeScreenBackground=ffEAEAEA
 DSsubPanelBackground=ffEFEFEF
-DSthumbnailBackground=ffF2F2F2
-DSthumbnailLabelBackground=ffEBEBEB
+DSthumbnailBackground=ffE8E8E8
+DSthumbnailLabelBackground=ffDDDDDD
+
 DSinteraction=ff2aafd3
 DSerrorColor=ffdf3a3a
 DSwarningColor=warning
@@ -28,8 +29,8 @@ DSdisabledColor=ff8e8e8e
 DScontrolBackground=ffeaeaea
 DScontrolBackgroundInteraction=ffc9c9c9
 DScontrolBackgroundDisabled=ffeaeaea
-DScontrolBackgroundGlobalHover=ffe5e5e5
-DScontrolBackgroundHover=ffd1d1d1
+DScontrolBackgroundGlobalHover=ffdedddd
+DScontrolBackgroundHover=ffdedddd
 
 DScontrolOutline=ffcecccc
 DScontrolOutlineInteraction=ff2aafd3
@@ -105,7 +106,7 @@ DStitleBarIcon=ff4f5052
 DStitleBarButtonHover=40ffffff
 DStitleBarButtonPress=60ffffff
 
-DStabContainerBackground=ff999999
+DStabContainerBackground=ffdadada
 DStabSplitter=ff595959
 
 DStabInactiveBackground=ff999999
@@ -128,15 +129,15 @@ DStabFocusButtonPress=ff2aafd3
 
 DSnavigatorBranch=ff7c7b7b
 DSnavigatorBranchIndicator=ff7c7b7b
-DSnavigatorItemBackground=ffd8d8d8
-DSnavigatorItemBackgroundHover=ffc2c2c2
+DSnavigatorItemBackground=ffeaeaea
+DSnavigatorItemBackgroundHover=ffdedddd
 DSnavigatorItemBackgroundSelected=ffffffff
 DSnavigatorText=ff262626
 DSnavigatorTextHover=ff1f1f1f
 DSnavigatorTextSelected=ff2aafd3
 DSnavigatorIcon=ff1f1f1f
-DSnavigatorIconHover=ff1f1f1f
-DSnavigatorIconSelected=ff7c7b7b
+DSnavigatorIconHover=ff7c7b7b
+DSnavigatorIconSelected=ff1f1f1f
 DSnavigatorAliasIconChecked=ffff0000
 DSnavigatorDropIndicatorBackground=ff2aafd3
 DSnavigatorDropIndicatorOutline=ff2aafd3
diff --git a/share/qtcreator/themes/design-light.creatortheme b/share/qtcreator/themes/design-light.creatortheme
index 25b83f151d8..b7ff806bf20 100644
--- a/share/qtcreator/themes/design-light.creatortheme
+++ b/share/qtcreator/themes/design-light.creatortheme
@@ -32,8 +32,8 @@ DSpanelBackground=ffeaeaea
 
 DSwelcomeScreenBackground=ffEAEAEA
 DSsubPanelBackground=ffEFEFEF
-DSthumbnailBackground=ffF2F2F2
-DSthumbnailLabelBackground=ffEBEBEB
+DSthumbnailBackground=ffE8E8E8
+DSthumbnailLabelBackground=ffDDDDDD
 
 DSinteraction=ff2aafd3
 DSerrorColor=ffdf3a3a
@@ -43,8 +43,8 @@ DSdisabledColor=ff8e8e8e
 DScontrolBackground=ffeaeaea
 DScontrolBackgroundInteraction=ffc9c9c9
 DScontrolBackgroundDisabled=ffeaeaea
-DScontrolBackgroundGlobalHover=ffe5e5e5
-DScontrolBackgroundHover=ffd1d1d1
+DScontrolBackgroundGlobalHover=ffdedddd
+DScontrolBackgroundHover=ffdedddd
 
 DScontrolOutline=ffcecccc
 DScontrolOutlineInteraction=ff2aafd3
@@ -143,15 +143,15 @@ DStabFocusButtonPress=ff2aafd3
 
 DSnavigatorBranch=ff7c7b7b
 DSnavigatorBranchIndicator=ff7c7b7b
-DSnavigatorItemBackground=ffd8d8d8
-DSnavigatorItemBackgroundHover=ffc2c2c2
+DSnavigatorItemBackground=ffeaeaea
+DSnavigatorItemBackgroundHover=ffdedddd
 DSnavigatorItemBackgroundSelected=ffffffff
 DSnavigatorText=ff262626
 DSnavigatorTextHover=ff1f1f1f
 DSnavigatorTextSelected=ff2aafd3
 DSnavigatorIcon=ff1f1f1f
-DSnavigatorIconHover=ff1f1f1f
-DSnavigatorIconSelected=ff7c7b7b
+DSnavigatorIconHover=ff7c7b7b
+DSnavigatorIconSelected=ff1f1f1f
 DSnavigatorAliasIconChecked=ffff0000
 DSnavigatorDropIndicatorBackground=ff2aafd3
 DSnavigatorDropIndicatorOutline=ff2aafd3
diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index 882b69fd369..6c862ff4dd0 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -25,23 +25,23 @@ backgroundColorDisabled=ff444444
 
 [Colors]
 ;DS controls theme START
-DSpanelBackground=ff323232
+DSpanelBackground=ff2E2F30
 
 DSwelcomeScreenBackground=ff242424
-DSsubPanelBackground=ff040404
-DSthumbnailBackground=ff292929
-DSthumbnailLabelBackground=ff3D3D3D
+DSsubPanelBackground=ff1c1c1c
+DSthumbnailBackground=ff232323
+DSthumbnailLabelBackground=ff2b2a2a
 
 DSinteraction=ff2aafd3
 DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff707070
 
-DScontrolBackground=ff323232
-DScontrolBackgroundInteraction=ff595959
-DScontrolBackgroundDisabled=ff323232
-DScontrolBackgroundGlobalHover=ff474747
-DScontrolBackgroundHover=ff666666
+DScontrolBackground=ff2e2f30
+DScontrolBackgroundInteraction=ff3d3d3d
+DScontrolBackgroundDisabled=ff2e2f30
+DScontrolBackgroundGlobalHover=ff333333
+DScontrolBackgroundHover=ff333333
 
 DScontrolOutline=ff1f1f1f
 DScontrolOutlineInteraction=ff2aafd3
@@ -56,9 +56,9 @@ DSplaceholderTextColor=ffffffff
 DSplaceholderTextColorInteraction=ffababab
 
 DSiconColor=ffffffff
-DSiconColorHover=ff262626
+DSiconColorHover=ffffffff
 DSiconColorInteraction=ff707070
-DSiconColorDisabled=ff707070
+DSiconColorDisabled=ffC7C7C7
 DSiconColorSelected=ff2aafd3
 
 DSlinkIndicatorColor=ff808080
@@ -104,7 +104,7 @@ DSactionJIT=ff2db543
 DStableHeaderBackground=ffff0000
 DStableHeaderText=ff00ff00
 
-DSdockContainerBackground=ff323232
+DSdockContainerBackground=ff242424
 DSdockContainerSplitter=ff323232
 DSdockAreaBackground=ff262728
 
@@ -140,15 +140,15 @@ DStabFocusButtonPress=ff2aafd3
 
 DSnavigatorBranch=ff7c7b7b
 DSnavigatorBranchIndicator=ff7c7b7b
-DSnavigatorItemBackground=ff262626
-DSnavigatorItemBackgroundHover=ff666666
-DSnavigatorItemBackgroundSelected=ff1f1f1f
+DSnavigatorItemBackground=ff2E2F30
+DSnavigatorItemBackgroundHover=ff333333
+DSnavigatorItemBackgroundSelected=ff3D3D3D
 DSnavigatorText=ffffffff
-DSnavigatorTextHover=ff1f1f1f
+DSnavigatorTextHover=ffffffff
 DSnavigatorTextSelected=ff2aafd3
 DSnavigatorIcon=ffffffff
-DSnavigatorIconHover=ff1f1f1f
-DSnavigatorIconSelected=ff7c7b7b
+DSnavigatorIconHover=ffa1a1a1
+DSnavigatorIconSelected=ffffffff
 DSnavigatorAliasIconChecked=ffff0000
 DSnavigatorDropIndicatorBackground=ff2aafd3
 DSnavigatorDropIndicatorOutline=ff2aafd3
@@ -371,7 +371,7 @@ QmlDesigner_FormEditorForegroundColor=ffdadada
 
 ;background color for main form view, library, navigator, properties, connections
 ;QmlDesigner_BackgroundColorDarkAlternate=ff4c4e50
-QmlDesigner_BackgroundColorDarkAlternate=ff323232
+QmlDesigner_BackgroundColorDarkAlternate=ff2e2f30
 
 ;filter outlines, override W/H outlines, properties spinbox background, timeline separators.
 ;QmlDesigner_BackgroundColorDarker=ff262728
diff --git a/share/qtcreator/themes/flat-dark.creatortheme b/share/qtcreator/themes/flat-dark.creatortheme
index 67c3a5822ad..27ab6094628 100644
--- a/share/qtcreator/themes/flat-dark.creatortheme
+++ b/share/qtcreator/themes/flat-dark.creatortheme
@@ -27,23 +27,23 @@ qmlDesignerButtonColor=ff4c4e50
 
 [Colors]
 ;DS controls theme START
-DSpanelBackground=ff323232
+DSpanelBackground=ff2E2F30
 
 DSwelcomeScreenBackground=ff242424
-DSsubPanelBackground=ff040404
-DSthumbnailBackground=ff292929
-DSthumbnailLabelBackground=ff3D3D3D
+DSsubPanelBackground=ff1c1c1c
+DSthumbnailBackground=ff232323
+DSthumbnailLabelBackground=ff2b2a2a
 
 DSinteraction=ff2aafd3
 DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff707070
 
-DScontrolBackground=ff323232
-DScontrolBackgroundInteraction=ff595959
-DScontrolBackgroundDisabled=ff323232
-DScontrolBackgroundGlobalHover=ff474747
-DScontrolBackgroundHover=ff666666
+DScontrolBackground=ff2e2f30
+DScontrolBackgroundInteraction=ff3d3d3d
+DScontrolBackgroundDisabled=ff2e2f30
+DScontrolBackgroundGlobalHover=ff333333
+DScontrolBackgroundHover=ff333333
 
 DScontrolOutline=ff1f1f1f
 DScontrolOutlineInteraction=ff2aafd3
@@ -58,9 +58,9 @@ DSplaceholderTextColor=ffffffff
 DSplaceholderTextColorInteraction=ffababab
 
 DSiconColor=ffffffff
-DSiconColorHover=ff262626
+DSiconColorHover=ffffffff
 DSiconColorInteraction=ff707070
-DSiconColorDisabled=ff707070
+DSiconColorDisabled=ffC7C7C7
 DSiconColorSelected=ff2aafd3
 
 DSlinkIndicatorColor=ff808080
@@ -106,7 +106,7 @@ DSactionJIT=ff2db543
 DStableHeaderBackground=ffff0000
 DStableHeaderText=ff00ff00
 
-DSdockContainerBackground=ff323232
+DSdockContainerBackground=ff242424
 DSdockContainerSplitter=ff323232
 DSdockAreaBackground=ff262728
 
@@ -142,15 +142,15 @@ DStabFocusButtonPress=ff2aafd3
 
 DSnavigatorBranch=ff7c7b7b
 DSnavigatorBranchIndicator=ff7c7b7b
-DSnavigatorItemBackground=ff262626
-DSnavigatorItemBackgroundHover=ff666666
-DSnavigatorItemBackgroundSelected=ff1f1f1f
+DSnavigatorItemBackground=ff2E2F30
+DSnavigatorItemBackgroundHover=ff333333
+DSnavigatorItemBackgroundSelected=ff3D3D3D
 DSnavigatorText=ffffffff
-DSnavigatorTextHover=ff1f1f1f
+DSnavigatorTextHover=ffffffff
 DSnavigatorTextSelected=ff2aafd3
 DSnavigatorIcon=ffffffff
-DSnavigatorIconHover=ff1f1f1f
-DSnavigatorIconSelected=ff7c7b7b
+DSnavigatorIconHover=ffa1a1a1
+DSnavigatorIconSelected=ffffffff
 DSnavigatorAliasIconChecked=ffff0000
 DSnavigatorDropIndicatorBackground=ff2aafd3
 DSnavigatorDropIndicatorOutline=ff2aafd3
@@ -164,8 +164,8 @@ DStoolTipText=ffdadada
 
 DSUnimportedModuleColor=ffe33c2e
 
-DSBackgroundColorAlternate=ff323232
-DSBackgroundColorNormal=ff1f1f1f
+DSBackgroundColorAlternate=alternateBackground
+DSBackgroundColorNormal=normalBackground
 
 ;DS controls theme END
 
diff --git a/share/qtcreator/themes/flat-light.creatortheme b/share/qtcreator/themes/flat-light.creatortheme
index f5a80b2c97a..6c1a0aef4ab 100644
--- a/share/qtcreator/themes/flat-light.creatortheme
+++ b/share/qtcreator/themes/flat-light.creatortheme
@@ -27,8 +27,8 @@ DSpanelBackground=ffeaeaea
 
 DSwelcomeScreenBackground=ffEAEAEA
 DSsubPanelBackground=ffEFEFEF
-DSthumbnailBackground=ffF2F2F2
-DSthumbnailLabelBackground=ffEBEBEB
+DSthumbnailBackground=ffE8E8E8
+DSthumbnailLabelBackground=ffDDDDDD
 
 DSinteraction=ff2aafd3
 DSerrorColor=ffdf3a3a
@@ -38,8 +38,8 @@ DSdisabledColor=ff8e8e8e
 DScontrolBackground=ffeaeaea
 DScontrolBackgroundInteraction=ffc9c9c9
 DScontrolBackgroundDisabled=ffeaeaea
-DScontrolBackgroundGlobalHover=ffe5e5e5
-DScontrolBackgroundHover=ffd1d1d1
+DScontrolBackgroundGlobalHover=ffdedddd
+DScontrolBackgroundHover=ffdedddd
 
 DScontrolOutline=ffcecccc
 DScontrolOutlineInteraction=ff2aafd3
@@ -138,15 +138,15 @@ DStabFocusButtonPress=ff2aafd3
 
 DSnavigatorBranch=ff7c7b7b
 DSnavigatorBranchIndicator=ff7c7b7b
-DSnavigatorItemBackground=ffd8d8d8
-DSnavigatorItemBackgroundHover=ffc2c2c2
+DSnavigatorItemBackground=ffeaeaea
+DSnavigatorItemBackgroundHover=ffdedddd
 DSnavigatorItemBackgroundSelected=ffffffff
 DSnavigatorText=ff262626
 DSnavigatorTextHover=ff1f1f1f
 DSnavigatorTextSelected=ff2aafd3
 DSnavigatorIcon=ff1f1f1f
-DSnavigatorIconHover=ff1f1f1f
-DSnavigatorIconSelected=ff7c7b7b
+DSnavigatorIconHover=ff7c7b7b
+DSnavigatorIconSelected=ff1f1f1f
 DSnavigatorAliasIconChecked=ffff0000
 DSnavigatorDropIndicatorBackground=ff2aafd3
 DSnavigatorDropIndicatorOutline=ff2aafd3
diff --git a/share/qtcreator/themes/flat.creatortheme b/share/qtcreator/themes/flat.creatortheme
index 59c21dd705a..14a20a1befd 100644
--- a/share/qtcreator/themes/flat.creatortheme
+++ b/share/qtcreator/themes/flat.creatortheme
@@ -21,23 +21,23 @@ qmlDesignerButtonColor=ff4c4e50
 
 [Colors]
 ;DS controls theme START
-DSpanelBackground=ff323232
+DSpanelBackground=ff2E2F30
 
 DSwelcomeScreenBackground=ff242424
-DSsubPanelBackground=ff040404
-DSthumbnailBackground=ff292929
-DSthumbnailLabelBackground=ff3D3D3D
+DSsubPanelBackground=ff1c1c1c
+DSthumbnailBackground=ff232323
+DSthumbnailLabelBackground=ff2b2a2a
 
 DSinteraction=ff2aafd3
 DSerrorColor=ffdf3a3a
 DSwarningColor=warning
 DSdisabledColor=ff707070
 
-DScontrolBackground=ff323232
-DScontrolBackgroundInteraction=ff595959
-DScontrolBackgroundDisabled=ff323232
-DScontrolBackgroundGlobalHover=ff474747
-DScontrolBackgroundHover=ff666666
+DScontrolBackground=ff2e2f30
+DScontrolBackgroundInteraction=ff3d3d3d
+DScontrolBackgroundDisabled=ff2e2f30
+DScontrolBackgroundGlobalHover=ff333333
+DScontrolBackgroundHover=ff333333
 
 DScontrolOutline=ff1f1f1f
 DScontrolOutlineInteraction=ff2aafd3
@@ -52,9 +52,9 @@ DSplaceholderTextColor=ffffffff
 DSplaceholderTextColorInteraction=ffababab
 
 DSiconColor=ffffffff
-DSiconColorHover=ff262626
+DSiconColorHover=ffffffff
 DSiconColorInteraction=ff707070
-DSiconColorDisabled=ff707070
+DSiconColorDisabled=ffC7C7C7
 DSiconColorSelected=ff2aafd3
 
 DSlinkIndicatorColor=ff808080
@@ -100,7 +100,7 @@ DSactionJIT=ff2db543
 DStableHeaderBackground=ffff0000
 DStableHeaderText=ff00ff00
 
-DSdockContainerBackground=ff323232
+DSdockContainerBackground=ff242424
 DSdockContainerSplitter=ff323232
 DSdockAreaBackground=ff262728
 
@@ -113,7 +113,7 @@ DStitleBarIcon=ffffffff
 DStitleBarButtonHover=40ffffff
 DStitleBarButtonPress=60ffffff
 
-DStabContainerBackground=ff0000ff
+DStabContainerBackground=ff1f1f1f
 DStabSplitter=ff595959
 
 DStabInactiveBackground=ff1f1f1f
@@ -136,15 +136,15 @@ DStabFocusButtonPress=ff2aafd3
 
 DSnavigatorBranch=ff7c7b7b
 DSnavigatorBranchIndicator=ff7c7b7b
-DSnavigatorItemBackground=ff262626
-DSnavigatorItemBackgroundHover=ff666666
-DSnavigatorItemBackgroundSelected=ff1f1f1f
+DSnavigatorItemBackground=ff2E2F30
+DSnavigatorItemBackgroundHover=ff333333
+DSnavigatorItemBackgroundSelected=ff3D3D3D
 DSnavigatorText=ffffffff
-DSnavigatorTextHover=ff1f1f1f
+DSnavigatorTextHover=ffffffff
 DSnavigatorTextSelected=ff2aafd3
 DSnavigatorIcon=ffffffff
-DSnavigatorIconHover=ff1f1f1f
-DSnavigatorIconSelected=ff7c7b7b
+DSnavigatorIconHover=ffa1a1a1
+DSnavigatorIconSelected=ffffffff
 DSnavigatorAliasIconChecked=ffff0000
 DSnavigatorDropIndicatorBackground=ff2aafd3
 DSnavigatorDropIndicatorOutline=ff2aafd3
@@ -158,8 +158,8 @@ DStoolTipText=ffdadada
 
 DSUnimportedModuleColor=ffe33c2e
 
-DSBackgroundColorAlternate=ff323232
-DSBackgroundColorNormal=ff1f1f1f
+DSBackgroundColorAlternate=alternateBackground
+DSBackgroundColorNormal=normalBackground
 
 ;DS controls theme END
 

From 7c38ee31e3cedb42e2e6fc555ba901d13f021dfb Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Mon, 24 Jan 2022 16:58:26 +0100
Subject: [PATCH 06/12] QmlDesigner: Update SpinBoxIndicator icon in font

Change-Id: Ib2921239fc5e29b5a0b14bb90eda56117fba12cf
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/StudioTheme/icons.ttf             | Bin 21764 -> 22324 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
index eb9426e8f457d9f690fae2f16d640720e780a0f7..49ed0eb183b17b408ead7c92ca27f040f277effe 100644
GIT binary patch
delta 1211
zcmZo!#kgf1V?6^S0|NsuLjwadLx7uGi0`!Z?_V)6giA0mFv$1^>l;OOqy{oDFh(#i
zFeD`BCKh=5*!^H&V0y#Az!;QVR-(Y5$W+O|z~aEbz`&B8SX}V`KLaxZL%09~0|Q5T
zPGwr_H=Vl-46G##49*KOQWH~@_8p$iz`$^afq}s+BO|pwk?ZUKi3|*kA`A=+DjB&Y
z6{5a8<_rvsI~W)kO>**+6TMBWJQx^QTo@P_^>Py{3K$+UTw-8gv|wOhP{>QnO+6Q2
zQ_jHPDZ;?Obh9A8xTL66bPWT8_Xh?BZUwOC7#SE!lN-$A`E9;3a5KMPU|?XlC*q(B
zp_v?XCo$SGPMd7U7|XbI^BhJ!MxOuw8RQsb7-Sek7#JpBVsd5NI$47GEccX7kd}!I
z3~f^<e_)QTKf&;i(S)&%aTDVUCIKcRrWB?YW(H;nW+Ubx<|5`k<`v9uSU6auSj<>5
zSlU>YupD5y!OFm@!8(a`AL}{RZ)|dGA#7!AeQd|rez6O%2eB{V(BO#Un8I<2;|FIL
zXBKA@=Pb?*oY%NGxHP!@xRSW)xMp#!<7VS_;O^sI#eJckM~5edr-)|{&l_G3-a6g`
zd`x^{e0h8=e5d%e`1AO;@&6ML6EF}c5U3HDAaFq7ilB_3mSBWnmynQ<k5GfqDxn8L
z?}Rmk6NK}GdxRf}7>HDfoDh{0%@I8$CMT99&L*xUULbx&LP#P&;+(_}$t=kx$vKkS
zB(F*FNO?)MNU5HadL{Kwx=BVzrbXtO>>fD_xg5D?@(J>n6s#1MDEw1&Qmj+FFgc5L
zIxiCg>whoi$IOZh$_(C<1=!Rko3r^aF-lBsXY*rXWSD%NO?z@7humgmc6Afg|Ns8~
zV}8YC!NAJEz{+UO$tceF<sX+5;}*s(PE3qH9RK++ZgJdPZ_UM6&&nY4e>L-IrnL<E
z49*PR48aU(3=E8NjBM<DOzh(9>TJqNdd%u-rfMeU26i0g>gM8R#zu0?;$o~u<{(Km
zQxkJ_Hg-8yb2C#DHDx7sadkFP5iw&UaWiv077*Xe*hoxNgq`^a3o|ndn|{94cKPEe
z@veQzDJlX?_3Z2%T!Mm<k_z%_!aEgCz$N|}xCgqZ>RSeihGwS-sM)&*##M6~D~pRo
zRe`9D#jzp=Vc|vQZh_9K`c?rVjJ7Piyeu60!LrMgHfiZt_$mo8GO~-Xb8-m?h>A#v
zig7K0i(i+sl?${~Q}i}T5EW1`)KnFlFDR;P%r_wqMA@0gZmzM}%DUOsk&R8=lu-?w
z0~i=s7$g}dK-sJe0*q&%Y&Hf-Cc(*B?z-w(47(VZ85mhO8CV#M7-OJpRt5#eRZun?
zgAwE1$@|=u8I2}Ca#v+En#|#GQqYLOgh7|VkU^Khh{1rth{0&`6AwL3BNJUiT_Xb{
zqsf9E0h4n)8yOiUzxGsOoVJ<IOM{VxaWdnS&1T-`IQWIiGK({lGIKIZD*e;aj3$K?
g35t|wRwWjt6#FKZy5<&?R2ogr3+duPWLXDY0HSmx>;M1&

delta 910
zcmdn8j<IDGV?6^S0|NsuLjwadLx7uGi0{<*znmBtLS8U1Fv$1^>l;OOr1~>3Fh(#i
zFeD`BCKh<?uuEiMV0yv8z!;QVR-(Y5$W+O|z+%I|z`&B8SX}V`KLaxZL&yUL1_qAw
zoXWHu-K%RD7+7-{7#x>mq$Z{){yY1gfq~%;0|SFuMn-CVBG=dd6B!s7MHm<uR5Ef)
zDnwm)EEpIVcQ7z88sy|BCu$~1>|$VGabRFz)XGh)C}4QVaEXC|(Sm`2K_M?OH`OQU
z<#GlFcL4?lraJ}s#U*wbwzUilo^Kc!xW0fr$H>4C^J<k&JipCX25x4M#~AKzagAhP
zU|_hrg~>H?5~D5Sl*x9Cv5cEH&tcSK<X{kCkYkWx5Se_9$(3>QWEtkO+zg!{<r5hg
z+88E(VUDgp!^p&F!PvyOjqweW2$LC822%$!3$qNf8FLtO8S^COHOwDacv$3EtXOhb
zx>#1Q9AUY`%EGF{I*s)Z>m}A-Y)WhqY*lQN*iNziV;5l$V_(6c!;!=>gX0{>AI>Pw
zJkB=Gd7N7~Z*lQ(>2L*crExWJ&Ewj{&Bg7)J&AiA_mz4c1D*t)GM)oGA9#Iun|P1#
zvGGOm74dcOo#WTzFXG=Nz$73gU?NZ=&>%2H;E2EtK?OlQ!5G0lAu*u<p%$TaLQjM~
z3F`=_2p0)Y5Pl|NB2p)EMpQ|(K=hcHl31QNm$;sIiTDi(F^Ld~OA>!1^Ca6O7f9}s
zyd@<d<tNo4rFco|oivwppA3UckgSF57TFhaNpe@@ZRD3JFetbvG$>q}T*Nw^pP7O6
zzZdgkW<>^N1{DUM$zp73jJlI;*nC+2J!CSU+{Na{^jvcCEjI1Rc^rzHmD$xzOc_KN
zw3)9kDKT&|FfgifGV(JrikmYspXB~$_Rox)oAD|LGl_HmGh;l(&GSzi#AVo=Z_UNH
zd8X|O*3G6aLagd$j2hsWXJBAqkYt<;WwSB}FrJ69*%&05L?-8X>Z<23>|$VMU}WKB
zU|}#~jEAyW859`TLfLE#MvM<8AM#XYG@Sg*Q<c$hGLP3uVM7KZ23-b2215p21|tRo
z1|tT;$<Ms>xD1VS4GndT42%pX&+`tLoa@~<`J=Z2<CM)pJ{pXh?R?L1OqLJJo4hEj
KjR%nmT_XWf1>_t6


From 94bf7a656f95e94d65cf26b32f6c76631268cc64 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Mon, 24 Jan 2022 17:04:06 +0100
Subject: [PATCH 07/12] QmlDesigner: Fix SpinBoxIndicator hover/edit state

* Make global hover work on disabled SpinBoxIndicator
* Fix disabled state not showing in edit mode
* Hide/blend indicator on drag operation
* Some color changes

Task-number: QDS-5970
Task-number: QDS-5975
Change-Id: I4965b4c6ad906fe05f8a43cabb1914e15a23ba7d
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../StudioControls/RealSpinBoxIndicator.qml   | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml
index 26373f4db19..9e715fd8730 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/RealSpinBoxIndicator.qml
@@ -32,7 +32,7 @@ Rectangle {
 
     property T.Control myControl
 
-    property bool hover: spinBoxIndicatorMouseArea.containsMouse && spinBoxIndicator.enabled
+    property bool hover: spinBoxIndicatorMouseArea.containsMouse
     property bool pressed: spinBoxIndicatorMouseArea.containsPress
     property bool released: false
     property bool realEnabled: true
@@ -112,7 +112,6 @@ Rectangle {
         id: spinBoxIndicatorIcon
         text: StudioTheme.Constants.upDownSquare2
         color: StudioTheme.Values.themeTextColor
-        renderType: Text.NativeRendering
         horizontalAlignment: Text.AlignHCenter
         verticalAlignment: Text.AlignVCenter
         font.pixelSize: StudioTheme.Values.spinControlIconSizeMulti
@@ -126,6 +125,15 @@ Rectangle {
         }
 
         states: [
+            State {
+                name: "default"
+                when: myControl.enabled && spinBoxIndicator.enabled && !myControl.edit
+                      && !spinBoxIndicator.hover && !myControl.hover && !myControl.drag
+                PropertyChanges {
+                    target: spinBoxIndicatorIcon
+                    color: StudioTheme.Values.themeTextColor
+                }
+            },
             State {
                 name: "globalHover"
                 when: myControl.enabled && spinBoxIndicator.enabled && !myControl.drag
@@ -150,12 +158,12 @@ Rectangle {
                       && spinBoxIndicator.pressed
                 PropertyChanges {
                     target: spinBoxIndicatorIcon
-                    color: "#323232" // TODO
+                    color: StudioTheme.Values.themeIconColor
                 }
             },
             State {
                 name: "edit"
-                when: myControl.edit
+                when: myControl.edit && spinBoxIndicator.enabled
                 PropertyChanges {
                     target: spinBoxIndicatorIcon
                     color: StudioTheme.Values.themeTextColor
@@ -201,7 +209,7 @@ Rectangle {
         },
         State {
             name: "hover"
-            when: myControl.enabled && !myControl.drag
+            when: myControl.enabled && !myControl.drag && spinBoxIndicator.enabled
                   && spinBoxIndicator.hover && myControl.hover && !spinBoxIndicator.pressed
             PropertyChanges {
                 target: spinBoxIndicatorIcon
@@ -227,7 +235,7 @@ Rectangle {
         },
         State {
             name: "edit"
-            when: myControl.edit
+            when: myControl.edit && myControl.enabled && spinBoxIndicator.enabled
             PropertyChanges {
                 target: spinBoxIndicatorIcon
                 visible: true
@@ -239,7 +247,7 @@ Rectangle {
         },
         State {
             name: "drag"
-            when: myControl.drag
+            when: myControl.drag && myControl.enabled
             PropertyChanges {
                 target: spinBoxIndicatorIcon
                 visible: false

From e05ecea4f52174db2e9e2a4e7d5b9c59bae1fd6f Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Mon, 24 Jan 2022 17:05:38 +0100
Subject: [PATCH 08/12] QmlDesigner: Fix colors in some control states

* Fix color of press state in AbstractButton and CheckIndicator
* Replace hard coded color value for disabled due to MCU

Change-Id: Ic73c95e263ad30a5804f77ef1bfa44fa16ed5de9
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../imports/StudioControls/AbstractButton.qml                 | 4 ++--
 .../imports/StudioControls/CheckIndicator.qml                 | 4 ++--
 .../propertyEditorQmlSources/imports/StudioTheme/Values.qml   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
index d8f664cd409..577257de709 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/AbstractButton.qml
@@ -94,7 +94,7 @@ T.AbstractButton {
                     when: myButton.enabled && myButton.pressed
                     PropertyChanges {
                         target: buttonIcon
-                        color: StudioTheme.Values.themeIconColorInteraction
+                        color: StudioTheme.Values.themeIconColor
                     }
                 },
                 State {
@@ -152,7 +152,7 @@ T.AbstractButton {
             when: myButton.hover && myButton.pressed
             PropertyChanges {
                 target: buttonBackground
-                color: StudioTheme.Values.themeControlBackgroundInteraction
+                color: StudioTheme.Values.themeInteraction
                 border.color: StudioTheme.Values.themeInteraction
             }
             PropertyChanges {
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
index 8083c3d376e..1997419bab4 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioControls/CheckIndicator.qml
@@ -110,7 +110,7 @@ Rectangle {
             when: checkIndicator.checked
             PropertyChanges {
                 target: checkIndicatorIcon
-                color: StudioTheme.Values.themeIconColorInteraction
+                color: StudioTheme.Values.themeIconColor
             }
             PropertyChanges {
                 target: checkIndicator
@@ -136,7 +136,7 @@ Rectangle {
                   && checkIndicator.pressed
             PropertyChanges {
                 target: checkIndicatorIcon
-                color: StudioTheme.Values.themeIconColorInteraction
+                color: StudioTheme.Values.themeIconColor
             }
             PropertyChanges {
                 target: checkIndicator
diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
index 5ba591c174b..bba4b2001f8 100644
--- a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
+++ b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/Values.qml
@@ -236,7 +236,7 @@ QtObject {
     property string themeTextColorDisabled: Theme.color(Theme.DStextColorDisabled)
     property string themeTextSelectionColor: Theme.color(Theme.DStextSelectionColor)
     property string themeTextSelectedTextColor: Theme.color(Theme.DStextSelectedTextColor)
-    property string themeTextColorDisabledMCU: "black" // TODO
+    property string themeTextColorDisabledMCU: Theme.color(Theme.DStextColorDisabled)
 
     property string themePlaceholderTextColor: Theme.color(Theme.DSplaceholderTextColor)
     property string themePlaceholderTextColorInteraction: Theme.color(Theme.DSplaceholderTextColorInteraction)

From b3e9f24ed1c0d3c0ee4917d4b449da90e00e888a Mon Sep 17 00:00:00 2001
From: Marco Bubke <marco.bubke@qt.io>
Date: Mon, 24 Jan 2022 14:38:29 +0100
Subject: [PATCH 09/12] QmlDesigner: Fix 32 bit

Because std::ptrdiff_t and int are the same under 32 bit the constructor
is changed to a template. The class is private so it is very unlikely
that it leads to errors.

Task-number: QTCREATORBUG-26910
Change-Id: I94c987b9b6d2f04876740ff283a339c0db056cfd
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christophe Giboudeaux <christophe@krop.fr>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
---
 .../designercore/projectstorage/storagecache.h        | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
index 747c3d9a07d..27d2905e8e4 100644
--- a/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
+++ b/src/plugins/qmldesigner/designercore/projectstorage/storagecache.h
@@ -67,15 +67,8 @@ class StorageCache
 
         StorageCacheIndex(const char *) = delete;
 
-        constexpr explicit StorageCacheIndex(int id) noexcept
-            : id{id}
-        {}
-
-        constexpr explicit StorageCacheIndex(std::size_t id) noexcept
-            : id{static_cast<int>(id)}
-        {}
-
-        constexpr explicit StorageCacheIndex(std::ptrdiff_t id) noexcept
+        template<typename IntegerType>
+        constexpr explicit StorageCacheIndex(IntegerType id) noexcept
             : id{static_cast<int>(id)}
         {}
 

From 5a3648c8956c74cc39ed37b8ee2a7d324b0dfc35 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 25 Jan 2022 11:29:34 +0100
Subject: [PATCH 10/12] macOS: Fix Delete with Google Japanese IME

Do not eat all ShortcutOverride events. Let the rest of the class &
widget hierarchy know about them too.

Fixes: QTCREATORBUG-26764
Change-Id: I7e2f42183bc9cb3931aca3669a6703c83e39b4bc
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 src/plugins/texteditor/texteditor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/texteditor/texteditor.cpp b/src/plugins/texteditor/texteditor.cpp
index 79228163cc5..ae9b735367c 100644
--- a/src/plugins/texteditor/texteditor.cpp
+++ b/src/plugins/texteditor/texteditor.cpp
@@ -2914,7 +2914,7 @@ bool TextEditorWidget::event(QEvent *e)
                            && (ke->key() < Qt::Key_Escape));
             d->m_maybeFakeTooltipEvent = false;
         }
-        return true;
+        break;
     }
     case QEvent::ApplicationPaletteChange: {
         // slight hack: ignore palette changes

From 30a3e8364dd93d34c6823b251bcbfc87842cc6bc Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Mon, 24 Jan 2022 16:57:26 +0100
Subject: [PATCH 11/12] QmlDesigner: Suppress warning in text model merger

Suppress warning "Found an unknown QML value." by accepting
UiSourceElement.

Change-Id: I7d33c50744f339b9cec30967071366bc85a9fb3e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 .../qmldesigner/designercore/model/texttomodelmerger.cpp        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
index c3239054d19..75d0b524a6e 100644
--- a/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
+++ b/src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp
@@ -1348,6 +1348,8 @@ void TextToModelMerger::syncNode(ModelNode &modelNode,
                 syncExpressionProperty(modelProperty, astValue, astType, differenceHandler);
             }
             modelPropertyNames.remove(astName.toUtf8());
+        } else if (auto source = AST::cast<AST::UiSourceElement *>(member)) {
+            // function et al
         } else {
             qWarning() << "Found an unknown QML value.";
         }

From 250738d858bcdbcbeab0037d3dddee71a06bd8c7 Mon Sep 17 00:00:00 2001
From: Henning Gruendl <henning.gruendl@qt.io>
Date: Tue, 25 Jan 2022 15:46:43 +0100
Subject: [PATCH 12/12] QmlDesigner: Fix icon font

Change-Id: I31a656e711d1bff24eedfc80ee5c62c594c03c19
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 .../imports/StudioTheme/icons.ttf             | Bin 22324 -> 21740 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf b/share/qtcreator/qmldesigner/propertyEditorQmlSources/imports/StudioTheme/icons.ttf
index 49ed0eb183b17b408ead7c92ca27f040f277effe..b6d6af3df2407f628a05f16466912bedc2a60fb4 100644
GIT binary patch
delta 407
zcmdn8j`7V(#(D-u1_lORh6V;^h5$FW5Z`H=?p<JD2)V$(z#!uvtZx+Ak?PODz!<^6
zz>tufn^@qn!!D75f$0SU17lEfS&0IJB2y&;1B(p<0|QHXVsXL${|w9w3?U~N7#KLx
zb1Ktf6Q5jWU|`K*U~ufoNKH&pI=HEpfq~%;0|SFuMn-CVBG=dd6B!s7MHm<uR5Ef)
zDnwm*lo=QpcQ7z88sy|BCu%T>CowRvI503UYUL(Y6fitwxWvG~Xu-h1ppciCn|dzL
zrh<XN?FRz`)6IhX;u5<I+gb(&&npZJTwlPRV`N|`iwKX5=ePOFz|H)Efq{YHp6K=k
z5SnTGf=P_Fj8i7tF~%}(-aLoVl#x+n@--$`#?6yun9p)Ebb{1PWMF7x*!+b#fl*5O
zi;SDBj_eBAJ91%iC*%#}XUTt2uuv#bIJUWnmEC;vOxqQ#n@wF7u`!xXzTsudVXAAW
sYh++#G<lwPz~o%-C5%%x3;Ad;ZnpD1$1zzxEN}9nuy$^^bG9!404pJKBme*a

delta 721
zcmaE}l5xvA#(D-u1_lORh6V;^h5$FW5Z`I*-@jsD2$x`BV36?-);EgmNDX9QV2og3
zU`R;LO)T*AvHQWm!1RWJfiWn#tVDr9k*Sh_fyIG=fq^AGvAE#>e+Fg-hHwD}1_qAw
zoXWJ;Z#s7w7+6af7@QYmq$Z{)?K?c3fq~%;0|SFuMn-CVBG=dd6B!s7MHm<uR5Ef)
zDnxyG%o!LMcQ7z8n&jjsCwiM$c`z`rxG*p<>g6U@6fityxWvG~Xu-h1ppciCn|dz5
zrksJnQ-pzm>1IKGaY<3D=o$tF?+*+N+zMdNF)}ceCO4SJ^V@u7;AVcoz`($8PsBkN
zLNht&PGYoWoHp5xF_v-b<~fX}jI1&YA`A?ZFEP0?Zk;T_e3pAkCrIr?28On&n?Eoo
zFv`gY$+XB^lied{A(tcfOg=&Wl7f}O5`}+?PKtGk7dB_HvYXelGRXX2&3u|^ErULT
zGlMrnFhd#x1EU-x8#^BpyEwZ#o3fG~v$~q8nu)oA9f!HPxwx6JksPzQ7^{&vNK(zz
z#9W<?U5?e<%+y3pS&3a-olR6k%-BfW%v_HJ#5XfG5)&0+XFkHh%*?{3pKrBY{&-5f
zYhQATiU3nRJ39xLprE9rg1nmWPK6V2iGK#}fi9~0mVu(7*(m~Q_U?gk)ttu4;$l%%
zAZlZAtcXEac#*kVptGvJRe%ViEekI%3x|HN>@uZIS~?cKN<xf`>>})(Tmk~3A`+rv
zTub2M*X3;G0xi`Py-gBC1r!W5RmJ8DiYgoPO~?aLcIL60Q*5@fZdP@i#?ELmd5?!J
zqsio79={o<ZT{w|!N|fmnQ_WyIq!2E{6b}!#hFQ&IhiGu{%L7OlV1cE35t|wRwWjt
Y6#FKZy5<&?R2oeV3+d*DN2G%;0JRaZzyJUM