From 13f466c05d779504e04be97a8767e49e000a152c Mon Sep 17 00:00:00 2001
From: Ivan Komissarov <abbapoh@gmail.com>
Date: Mon, 22 Feb 2021 22:03:44 +0100
Subject: [PATCH 01/14] cmake build: Explicitly turn on project file updates on
 the QtC side

We want to have flags consistent with the Qbs build and project file
updates are disabled by default (for standalone qbs builds in Brew or
choco) to avoid dependency on QtGui

Task-number: QTCREATORBUG-25232
Change-Id: I217057f45519e0c92201d1b76d5b04924804aed0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
---
 src/shared/CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/shared/CMakeLists.txt b/src/shared/CMakeLists.txt
index cbf076479f0..6101e2a46c0 100644
--- a/src/shared/CMakeLists.txt
+++ b/src/shared/CMakeLists.txt
@@ -37,6 +37,7 @@ if (ENABLE_BUILD_QBS)
 
   set(INSTALL_PUBLIC_HEADERS OFF CACHE BOOL "")
   set(WITH_TESTS OFF)
+  set(WITH_PROJECT_FILE_UPDATES ON)
   set(QBS_INSTALL_QCH_DOCS ${WITH_DOCS} CACHE BOOL "")
   add_subdirectory(qbs)
 endif()

From d8a35381cf3c0cb8d994e502b1ecd15374fe0750 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Tue, 23 Feb 2021 09:23:15 +0100
Subject: [PATCH 02/14] Update 4.14.1 change log

Change-Id: I988aebbd52c4c6ce8b09c49ee3cd63dc63ec9513
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 dist/changes-4.14.1.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dist/changes-4.14.1.md b/dist/changes-4.14.1.md
index b019dd205fb..7e0dd10a98b 100644
--- a/dist/changes-4.14.1.md
+++ b/dist/changes-4.14.1.md
@@ -72,6 +72,7 @@ Debugging
 ### LLDB
 
 * Fixed that application output could be printed delayed (QTCREATORBUG-24667)
+* Fixed performance issue (QTCREATORBUG-25185, QTCREATORBUG-25217)
 
 ### CDB
 

From beebf9389bd6c19155b02a86839e98be0c04f96a Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Mon, 22 Feb 2021 11:47:47 +0100
Subject: [PATCH 03/14] Doc: Describe "Text codec for tools" Environment option

Task-number: QTCREATORBUG-25162
Change-Id: I5a5e18cec9f2a1f5479b997c705517b07b794458
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 ...tcreator-options-environment-interface.png | Bin 14876 -> 8007 bytes
 doc/qtcreator/src/howto/creator-ui.qdoc       |  10 +++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/doc/qtcreator/images/qtcreator-options-environment-interface.png b/doc/qtcreator/images/qtcreator-options-environment-interface.png
index 43b51eb1f932d110823c2288dc07a0652896a316..41374d1b5dc3038799e940002affba3d36976480 100644
GIT binary patch
literal 8007
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

literal 14876
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
HN@xNAS>i35

diff --git a/doc/qtcreator/src/howto/creator-ui.qdoc b/doc/qtcreator/src/howto/creator-ui.qdoc
index 8647c66696a..0d78e314c55 100644
--- a/doc/qtcreator/src/howto/creator-ui.qdoc
+++ b/doc/qtcreator/src/howto/creator-ui.qdoc
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the Qt Creator documentation.
@@ -411,6 +411,14 @@
     For more information about the \uicontrol {QML Debugger Console} view, see
     \l{Executing JavaScript Expressions}.
 
+    If the text in the output panes is not displayed correctly, \QC might
+    be using a different codec from the one used by the tools that generate
+    the output. To specify the codec to use, select \uicontrol Tools >
+    \uicontrol Options > \uicontrol Environment > \uicontrol Interface, and
+    then select the codec in the \uicontrol {Text codec for tools} field.
+
+    \image qtcreator-options-environment-interface.png "Interface tab in the Environment options"
+
     \section1 Finding and Filtering Output
 
     To search from output, press \key {Ctrl+F} when the pane is active. Enter

From 8b8fc8458aa9ff84316aba577ba60055305017fa Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@qt.io>
Date: Mon, 15 Feb 2021 17:20:00 +0200
Subject: [PATCH 04/14] QmlDesigner: Allow partially overwriting 3D imports

When importing a 3D scene, if an existing import with the same name is
found, allow partially overwriting an existing import by selecting
the files to overwrite.

Task-number: QDS-3738
Change-Id: I8969da9bd03ef47ede4768cc2c7eb033bee3cb66
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/plugins/qmldesigner/CMakeLists.txt        |   6 +
 .../itemlibrary/assetimportupdatedialog.cpp   |  94 +++++++
 .../itemlibrary/assetimportupdatedialog.h     |  59 ++++
 .../itemlibrary/assetimportupdatedialog.ui    |  77 +++++
 .../itemlibrary/assetimportupdatetreeitem.cpp |  87 ++++++
 .../itemlibrary/assetimportupdatetreeitem.h   |  65 +++++
 .../assetimportupdatetreeitemdelegate.cpp     | 101 +++++++
 .../assetimportupdatetreeitemdelegate.h       |  57 ++++
 .../assetimportupdatetreemodel.cpp            | 262 ++++++++++++++++++
 .../itemlibrary/assetimportupdatetreemodel.h  |  73 +++++
 .../itemlibrary/assetimportupdatetreeview.cpp |  57 ++++
 .../itemlibrary/assetimportupdatetreeview.h   |  54 ++++
 .../components/itemlibrary/itemlibrary.pri    |  17 +-
 .../itemlibrary/itemlibraryassetimporter.cpp  |  90 +++++-
 .../itemlibrary/itemlibraryassetimporter.h    |  12 +-
 src/plugins/qmldesigner/qmldesignerplugin.qbs |  11 +
 16 files changed, 1103 insertions(+), 19 deletions(-)
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.cpp
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.h
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.ui
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitem.cpp
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitem.h
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitemdelegate.cpp
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitemdelegate.h
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.cpp
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.h
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeview.cpp
 create mode 100644 src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeview.h

diff --git a/src/plugins/qmldesigner/CMakeLists.txt b/src/plugins/qmldesigner/CMakeLists.txt
index d08027197be..41e70cb1e95 100644
--- a/src/plugins/qmldesigner/CMakeLists.txt
+++ b/src/plugins/qmldesigner/CMakeLists.txt
@@ -300,6 +300,12 @@ extend_qtc_plugin(QmlDesigner
 extend_qtc_plugin(QmlDesigner
   SOURCES_PREFIX components/itemlibrary
   SOURCES
+    assetimportupdatedialog.cpp assetimportupdatedialog.h
+    assetimportupdatedialog.ui
+    assetimportupdatetreeitem.cpp assetimportupdatetreeitem.h
+    assetimportupdatetreeitemdelegate.cpp assetimportupdatetreeitemdelegate.h
+    assetimportupdatetreemodel.cpp assetimportupdatetreemodel.h
+    assetimportupdatetreeview.cpp assetimportupdatetreeview.h
     customfilesystemmodel.cpp customfilesystemmodel.h
     itemlibrary.qrc
     itemlibraryimageprovider.cpp itemlibraryimageprovider.h
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.cpp
new file mode 100644
index 00000000000..bc420dc6385
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.cpp
@@ -0,0 +1,94 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+#include "assetimportupdatedialog.h"
+#include "ui_assetimportupdatedialog.h"
+#include "assetimportupdatetreeview.h"
+#include "assetimportupdatetreemodel.h"
+
+#include <QDirIterator>
+#include <QPushButton>
+#include <QTreeView>
+#include <QFileInfo>
+#include <QModelIndex>
+
+namespace QmlDesigner {
+namespace Internal {
+
+AssetImportUpdateDialog::AssetImportUpdateDialog(
+        const QString &importPath, const QSet<QString> &preSelectedFiles,
+        const QSet<QString> &hiddenEntries, QWidget *parent)
+    : QDialog(parent)
+    , ui(new Ui::AssetImportUpdateDialog)
+{
+    setModal(true);
+    ui->setupUi(this);
+
+    connect(ui->buttonBox->button(QDialogButtonBox::Ok), &QPushButton::clicked,
+            this, &AssetImportUpdateDialog::accept);
+    connect(ui->buttonBox->button(QDialogButtonBox::Cancel), &QPushButton::clicked,
+            this, &AssetImportUpdateDialog::reject);
+    connect(ui->expandButton, &QPushButton::clicked,
+            this, &AssetImportUpdateDialog::expandAll);
+    connect(ui->collapseButton, &QPushButton::clicked,
+            this, &AssetImportUpdateDialog::collapseAll);
+    ui->buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
+
+    QList<QFileInfo> infos;
+    infos.append(QFileInfo{importPath});
+    QDirIterator it(importPath, {"*"}, QDir::Files | QDir::Dirs | QDir::NoDotAndDotDot,
+                    QDirIterator::Subdirectories);
+    while (it.hasNext()) {
+        it.next();
+        const QString absFile = it.fileInfo().absoluteFilePath();
+        if (!hiddenEntries.contains(absFile))
+            infos.append(it.fileInfo());
+    }
+
+    ui->treeView->model()->createItems(infos, preSelectedFiles);
+    ui->treeView->expandAll();
+}
+
+AssetImportUpdateDialog::~AssetImportUpdateDialog()
+{
+    delete ui;
+}
+
+QStringList AssetImportUpdateDialog::selectedFiles() const
+{
+    return ui->treeView->model()->checkedFiles();
+}
+
+void AssetImportUpdateDialog::collapseAll()
+{
+    ui->treeView->collapseAll();
+}
+
+void AssetImportUpdateDialog::expandAll()
+{
+    ui->treeView->expandAll();
+}
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.h b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.h
new file mode 100644
index 00000000000..497fc6ca384
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.h
@@ -0,0 +1,59 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+#pragma once
+
+#include <QDialog>
+#include <QStringList>
+#include <QSet>
+
+namespace QmlDesigner {
+namespace Internal {
+
+namespace Ui {
+class AssetImportUpdateDialog;
+}
+
+class AssetImportUpdateDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit AssetImportUpdateDialog(const QString &importPath,
+                                     const QSet<QString> &preSelectedFiles,
+                                     const QSet<QString> &hiddenEntries,
+                                     QWidget *parent = nullptr);
+    ~AssetImportUpdateDialog();
+
+    QStringList selectedFiles() const;
+
+private:
+    void collapseAll();
+    void expandAll();
+
+    Ui::AssetImportUpdateDialog *ui = nullptr;
+};
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.ui b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.ui
new file mode 100644
index 00000000000..576987e5de0
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatedialog.ui
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>QmlDesigner::Internal::AssetImportUpdateDialog</class>
+ <widget class="QDialog" name="QmlDesigner::Internal::AssetImportUpdateDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>472</width>
+    <height>360</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Select Files to Update</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="AssetImportUpdateTreeView" name="treeView">
+       <property name="selectionMode">
+        <enum>QAbstractItemView::NoSelection</enum>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0,0,0">
+       <item>
+        <widget class="QPushButton" name="expandButton">
+         <property name="text">
+          <string>Expand All</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <widget class="QPushButton" name="collapseButton">
+         <property name="text">
+          <string>Collapse All</string>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>77</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item>
+        <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="standardButtons">
+          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>AssetImportUpdateTreeView</class>
+   <extends>QTreeView</extends>
+   <header>assetimportupdatetreeview.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitem.cpp b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitem.cpp
new file mode 100644
index 00000000000..81f5a143924
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitem.cpp
@@ -0,0 +1,87 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#include "assetimportupdatetreeitem.h"
+
+namespace QmlDesigner {
+namespace Internal {
+
+AssetImportUpdateTreeItem::AssetImportUpdateTreeItem(const QFileInfo &info,
+                                                     AssetImportUpdateTreeItem *parent)
+  : m_parent(parent)
+  , m_fileInfo(info)
+{
+    if (parent)
+        parent->appendChild(this);
+}
+
+AssetImportUpdateTreeItem::~AssetImportUpdateTreeItem()
+{
+    if (m_parent)
+        m_parent->removeChild(this);
+    clear();
+}
+
+void AssetImportUpdateTreeItem::clear()
+{
+    qDeleteAll(m_children);
+    m_children.clear();
+    m_fileInfo = {};
+    m_parent = nullptr;
+}
+
+int AssetImportUpdateTreeItem::childCount() const
+{
+    return m_children.count();
+}
+
+int AssetImportUpdateTreeItem::rowOfItem() const
+{
+    return m_parent ? m_parent->m_children.indexOf(const_cast<AssetImportUpdateTreeItem *>(this))
+                    : 0;
+}
+
+AssetImportUpdateTreeItem *AssetImportUpdateTreeItem::childAt(int index) const
+{
+    return m_children.at(index);
+}
+
+AssetImportUpdateTreeItem *AssetImportUpdateTreeItem::parent() const
+{
+    return m_parent;
+}
+
+void AssetImportUpdateTreeItem::removeChild(AssetImportUpdateTreeItem *item)
+{
+    m_children.removeOne(item);
+}
+
+void AssetImportUpdateTreeItem::appendChild(AssetImportUpdateTreeItem *item)
+{
+    m_children.append(item);
+}
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitem.h b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitem.h
new file mode 100644
index 00000000000..ef944e2dece
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitem.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QString>
+#include <QList>
+#include <QFileInfo>
+
+namespace QmlDesigner {
+namespace Internal {
+
+class AssetImportUpdateTreeItem
+{
+public:
+    explicit AssetImportUpdateTreeItem(const QFileInfo &info,
+                                       AssetImportUpdateTreeItem *parent = nullptr);
+    virtual ~AssetImportUpdateTreeItem();
+
+    AssetImportUpdateTreeItem *parent() const;
+    AssetImportUpdateTreeItem *childAt(int index) const;
+    int childCount() const;
+    int rowOfItem() const;
+    void clear();
+
+    Qt::CheckState checkState() const { return m_checkState; }
+    void setCheckState(Qt::CheckState checkState) { m_checkState = checkState; }
+    const QFileInfo &fileInfo() const { return m_fileInfo; }
+    void setFileInfo(const QFileInfo &info) { m_fileInfo = info; }
+    void removeChild(AssetImportUpdateTreeItem *item);
+    const QList<AssetImportUpdateTreeItem *> &children() const { return m_children; }
+
+private:
+    void appendChild(AssetImportUpdateTreeItem *item);
+
+    AssetImportUpdateTreeItem *m_parent;
+    QList<AssetImportUpdateTreeItem *> m_children;
+    Qt::CheckState m_checkState = Qt::Unchecked;
+    QFileInfo m_fileInfo;
+};
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitemdelegate.cpp b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitemdelegate.cpp
new file mode 100644
index 00000000000..9a517f76b24
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitemdelegate.cpp
@@ -0,0 +1,101 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#include "assetimportupdatetreeitemdelegate.h"
+#include "assetimportupdatetreemodel.h"
+
+#include <QPainter>
+#include <QModelIndex>
+
+namespace QmlDesigner {
+namespace Internal {
+
+AssetImportUpdateTreeItemDelegate::AssetImportUpdateTreeItemDelegate(QObject *parent)
+    : QItemDelegate(parent)
+{
+}
+
+AssetImportUpdateTreeItemDelegate::LayoutInfo AssetImportUpdateTreeItemDelegate::getLayoutInfo(
+        const QStyleOptionViewItem &option, const QModelIndex &index) const
+{
+    LayoutInfo info;
+    info.option = setOptions(index, option);
+
+    const bool checkable = (index.model()->flags(index) & Qt::ItemIsUserCheckable);
+    info.checkState = Qt::Unchecked;
+    if (checkable) {
+        QVariant checkStateData = index.data(Qt::CheckStateRole);
+        info.checkState = static_cast<Qt::CheckState>(checkStateData.toInt());
+        info.checkRect = doCheck(info.option, info.option.rect, checkStateData);
+    }
+
+    info.textRect = info.option.rect.adjusted(0, 0, info.checkRect.width(), 0);
+
+    doLayout(info.option, &info.checkRect, &info.iconRect, &info.textRect, false);
+
+    return info;
+}
+
+void AssetImportUpdateTreeItemDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
+                                              const QModelIndex &index) const
+{
+    painter->save();
+
+    const LayoutInfo info = getLayoutInfo(option, index);
+
+    painter->setFont(info.option.font);
+
+    drawBackground(painter, info.option, index);
+    drawText(painter, info.option, info.textRect, index);
+    drawCheck(painter, info.option, info.checkRect, info.checkState);
+
+    painter->restore();
+}
+
+QSize AssetImportUpdateTreeItemDelegate::sizeHint(const QStyleOptionViewItem &option,
+                                                  const QModelIndex &index) const
+{
+    const LayoutInfo info = getLayoutInfo(option, index);
+    const int height = index.data(Qt::SizeHintRole).value<QSize>().height();
+    // get text width, see QItemDelegatePrivate::displayRect
+    const QString text = index.data(Qt::DisplayRole).toString();
+    const QRect textMaxRect(0, 0, INT_MAX / 256, height);
+    const QRect textLayoutRect = textRectangle(nullptr, textMaxRect, info.option.font, text);
+    const QRect textRect(info.textRect.x(), info.textRect.y(), textLayoutRect.width(), height);
+    const QRect layoutRect = info.checkRect | textRect;
+    return QSize(layoutRect.x(), layoutRect.y()) + layoutRect.size();
+}
+
+void AssetImportUpdateTreeItemDelegate::drawText(QPainter *painter,
+                                                 const QStyleOptionViewItem &option,
+                                                 const QRect &rect,
+                                                 const QModelIndex &index) const
+{
+    const QString text = index.data(Qt::DisplayRole).toString();
+    drawDisplay(painter, option, rect, text);
+}
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitemdelegate.h b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitemdelegate.h
new file mode 100644
index 00000000000..a066ebcfb41
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeitemdelegate.h
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QItemDelegate>
+#include <QStyleOptionViewItem>
+
+namespace QmlDesigner {
+namespace Internal {
+
+class AssetImportUpdateTreeItemDelegate : public QItemDelegate
+{
+public:
+    AssetImportUpdateTreeItemDelegate(QObject *parent = nullptr);
+    void paint(QPainter *painter, const QStyleOptionViewItem &option,
+               const QModelIndex &index) const override;
+    QSize sizeHint(const QStyleOptionViewItem &option, const QModelIndex &index) const override;
+private:
+    struct LayoutInfo
+    {
+        QRect checkRect;
+        QRect textRect;
+        QRect iconRect;
+        Qt::CheckState checkState;
+        QStyleOptionViewItem option;
+    };
+
+    LayoutInfo getLayoutInfo(const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    void drawText(QPainter *painter, const QStyleOptionViewItem &option,
+                  const QRect &rect, const QModelIndex &index) const;
+};
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.cpp
new file mode 100644
index 00000000000..fac0797d5ed
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.cpp
@@ -0,0 +1,262 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#include "assetimportupdatetreemodel.h"
+#include "assetimportupdatetreeitem.h"
+
+#include <QSize>
+
+namespace QmlDesigner {
+namespace Internal {
+
+AssetImportUpdateTreeModel::AssetImportUpdateTreeModel(QObject *parent)
+    : QAbstractItemModel(parent)
+{
+    m_rootItem = new AssetImportUpdateTreeItem {{}};
+}
+
+AssetImportUpdateTreeModel::~AssetImportUpdateTreeModel()
+{
+    delete m_rootItem;
+}
+
+Qt::ItemFlags AssetImportUpdateTreeModel::flags(const QModelIndex &idx) const
+{
+    Qt::ItemFlags flags = QAbstractItemModel::flags(idx);
+
+    if (idx.isValid())
+        flags |= Qt::ItemIsUserCheckable;
+
+    return flags;
+}
+
+QModelIndex AssetImportUpdateTreeModel::index(int row, int column,
+                                              const QModelIndex &parent) const
+{
+    if (!hasIndex(row, column, parent))
+        return QModelIndex();
+
+    const AssetImportUpdateTreeItem *parentItem;
+
+    parentItem = parent.isValid() ? treeItemAtIndex(parent) : m_rootItem;
+
+    const AssetImportUpdateTreeItem *childItem = parentItem->childAt(row);
+    if (childItem)
+        return createIndex(row, column, const_cast<AssetImportUpdateTreeItem *>(childItem));
+    else
+        return QModelIndex();
+}
+
+QModelIndex AssetImportUpdateTreeModel::index(AssetImportUpdateTreeItem *item) const
+{
+    return createIndex(item->rowOfItem(), 0, item);
+}
+
+QVariant AssetImportUpdateTreeModel::data(const AssetImportUpdateTreeItem *row, int role) const
+{
+    if (role == Qt::DisplayRole)
+        return row->fileInfo().fileName();
+    if (role == Qt::CheckStateRole)
+        return row->checkState();
+    if (role == Qt::ToolTipRole)
+        return row->fileInfo().absoluteFilePath();
+    return {};
+}
+
+QModelIndex AssetImportUpdateTreeModel::parent(const QModelIndex &idx) const
+{
+    if (!idx.isValid())
+        return QModelIndex();
+
+    const AssetImportUpdateTreeItem *childItem = treeItemAtIndex(idx);
+    const AssetImportUpdateTreeItem *parentItem = childItem->parent();
+
+    if (parentItem == m_rootItem)
+        return QModelIndex();
+
+    return createIndex(parentItem->rowOfItem(), 0, const_cast<AssetImportUpdateTreeItem *>(parentItem));
+}
+
+int AssetImportUpdateTreeModel::rowCount(const QModelIndex &parent) const
+{
+    if (parent.column() > 0)
+        return 0;
+
+    return parent.isValid() ? treeItemAtIndex(parent)->childCount()
+                            : m_rootItem->childCount();
+}
+
+int AssetImportUpdateTreeModel::columnCount(const QModelIndex &) const
+{
+    return 1;
+}
+
+AssetImportUpdateTreeItem *AssetImportUpdateTreeModel::treeItemAtIndex(const QModelIndex &idx)
+{
+    return static_cast<AssetImportUpdateTreeItem*>(idx.internalPointer());
+}
+
+QVariant AssetImportUpdateTreeModel::data(const QModelIndex &idx, int role) const
+{
+    if (!idx.isValid())
+        return {};
+
+    if (role == Qt::SizeHintRole)
+        return QSize(0, 20);
+
+    return data(treeItemAtIndex(idx), role);
+}
+
+bool AssetImportUpdateTreeModel::setData(const QModelIndex &idx, const QVariant &value, int role)
+{
+    if (role == Qt::CheckStateRole) {
+        auto checkState = static_cast<Qt::CheckState>(value.toInt());
+        return setCheckState(idx, checkState);
+    }
+    return QAbstractItemModel::setData(idx, value, role);
+}
+
+bool AssetImportUpdateTreeModel::setCheckState(const QModelIndex &idx, Qt::CheckState checkState,
+                                               bool firstCall)
+{
+    AssetImportUpdateTreeItem *item = treeItemAtIndex(idx);
+    if (item->checkState() == checkState)
+        return false;
+    item->setCheckState(checkState);
+    if (firstCall) {
+        emit dataChanged(idx, idx);
+        // check parents
+        AssetImportUpdateTreeItem *parent = item->parent();
+        QModelIndex parentIdx = idx.parent();
+        while (parent) {
+            bool hasChecked = false;
+            bool hasUnchecked = false;
+            for (const auto child : parent->children()) {
+                if (child->checkState() == Qt::Checked) {
+                    hasChecked = true;
+                } else if (child->checkState() == Qt::Unchecked) {
+                    hasUnchecked = true;
+                } else if (child->checkState() == Qt::PartiallyChecked) {
+                    hasChecked = true;
+                    hasUnchecked = true;
+                }
+            }
+            if (hasChecked && hasUnchecked)
+                parent->setCheckState(Qt::PartiallyChecked);
+            else if (hasChecked)
+                parent->setCheckState(Qt::Checked);
+            else
+                parent->setCheckState(Qt::Unchecked);
+            emit dataChanged(parentIdx, parentIdx);
+            parent = parent->parent();
+            parentIdx = parentIdx.parent();
+        }
+    }
+    // check children
+    if (int children = item->childCount()) {
+        for (int i = 0; i < children; ++i)
+            setCheckState(index(i, 0, idx), checkState, false);
+        emit dataChanged(index(0, 0, idx), index(children - 1, 0, idx));
+    }
+    return true;
+}
+
+void AssetImportUpdateTreeModel::createItems(const QList<QFileInfo> &infos,
+                                             const QSet<QString> &preselectedFiles)
+{
+    beginResetModel();
+    if (!infos.isEmpty()) {
+        QHash<QString, AssetImportUpdateTreeItem *> dirItems;
+        for (const auto &info : infos) {
+            auto parent = dirItems.value(info.absolutePath());
+            if (!parent)
+                parent = m_rootItem;
+            auto item = new AssetImportUpdateTreeItem(info, parent);
+            if (info.isDir()) {
+                dirItems.insert(info.absoluteFilePath(), item);
+            } else {
+                m_fileItems.append(item);
+                if (preselectedFiles.contains(info.absoluteFilePath()))
+                    item->setCheckState(Qt::Checked);
+            }
+        }
+        // Remove dir items that have no children from the model
+        for (auto dirItem : qAsConst(dirItems)) {
+            if (dirItem->childCount() == 0)
+                delete dirItem;
+        }
+        std::function<Qt::CheckState (AssetImportUpdateTreeItem *)> updateDirCheckStatesRecursive;
+        updateDirCheckStatesRecursive = [&](AssetImportUpdateTreeItem *item) -> Qt::CheckState {
+            bool hasChecked = false;
+            bool hasUnchecked = false;
+            for (const auto child : item->children()) {
+                Qt::CheckState childState = child->childCount() > 0
+                        ? updateDirCheckStatesRecursive(child)
+                        : child->checkState();
+                if (childState == Qt::Checked) {
+                    hasChecked = true;
+                } else if (childState == Qt::Unchecked) {
+                    hasUnchecked = true;
+                } else {
+                    hasChecked = true;
+                    hasUnchecked = true;
+                    break;
+                }
+            }
+            Qt::CheckState retval = Qt::Unchecked;
+            if (hasChecked && hasUnchecked)
+                retval = Qt::PartiallyChecked;
+            else if (hasChecked)
+                retval = Qt::Checked;
+            item->setCheckState(retval);
+            return retval;
+        };
+        m_rootItem->setCheckState(updateDirCheckStatesRecursive(m_rootItem));
+    }
+    endResetModel();
+}
+
+QStringList AssetImportUpdateTreeModel::checkedFiles() const
+{
+    QStringList retList;
+
+    for (const auto item : qAsConst(m_fileItems)) {
+        if (item->checkState() == Qt::Checked)
+            retList.append(item->fileInfo().absoluteFilePath());
+    }
+
+    return retList;
+}
+
+void AssetImportUpdateTreeModel::clear()
+{
+    beginResetModel();
+    m_fileItems.clear();
+    m_rootItem->clear(); // Deletes all children
+    endResetModel();
+}
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.h b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.h
new file mode 100644
index 00000000000..adba52f0379
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreemodel.h
@@ -0,0 +1,73 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include <QAbstractItemModel>
+#include <QFileInfo>
+#include <QList>
+#include <QSet>
+#include <QStringList>
+
+namespace QmlDesigner {
+namespace Internal {
+
+class AssetImportUpdateTreeItem;
+
+class AssetImportUpdateTreeModel : public QAbstractItemModel
+{
+    Q_OBJECT
+
+public:
+    AssetImportUpdateTreeModel(QObject *parent = nullptr);
+    ~AssetImportUpdateTreeModel() override;
+
+    Qt::ItemFlags flags(const QModelIndex &index) const override;
+    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
+    QModelIndex parent(const QModelIndex &child) const override;
+    int rowCount(const QModelIndex &parent = QModelIndex()) const override;
+    int columnCount(const QModelIndex &parent = QModelIndex()) const override;
+    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
+    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
+
+    void createItems(const QList<QFileInfo> &infos, const QSet<QString> &preselectedFiles);
+    QStringList checkedFiles() const;
+
+    static AssetImportUpdateTreeItem *treeItemAtIndex(const QModelIndex &idx);
+
+public slots:
+    void clear();
+
+private:
+    QModelIndex index(AssetImportUpdateTreeItem *item) const;
+    QVariant data(const AssetImportUpdateTreeItem *row, int role) const;
+    bool setCheckState(const QModelIndex &idx, Qt::CheckState checkState, bool firstCall = true);
+
+    AssetImportUpdateTreeItem *m_rootItem;
+    QList<AssetImportUpdateTreeItem *> m_fileItems;
+};
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeview.cpp b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeview.cpp
new file mode 100644
index 00000000000..87e9fc1c803
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeview.cpp
@@ -0,0 +1,57 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#include "assetimportupdatetreeview.h"
+#include "assetimportupdatetreemodel.h"
+#include "assetimportupdatetreeitemdelegate.h"
+
+#include <QHeaderView>
+
+namespace QmlDesigner {
+namespace Internal {
+
+AssetImportUpdateTreeView::AssetImportUpdateTreeView(QWidget *parent)
+    : Utils::TreeView(parent)
+    , m_model(new AssetImportUpdateTreeModel(this))
+{
+    setModel(m_model);
+    setItemDelegate(new AssetImportUpdateTreeItemDelegate(this));
+    setUniformRowHeights(true);
+    setExpandsOnDoubleClick(true);
+    header()->hide();
+}
+
+void AssetImportUpdateTreeView::clear()
+{
+    m_model->clear();
+}
+
+AssetImportUpdateTreeModel *AssetImportUpdateTreeView::model() const
+{
+    return m_model;
+}
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeview.h b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeview.h
new file mode 100644
index 00000000000..3c5e040cfaf
--- /dev/null
+++ b/src/plugins/qmldesigner/components/itemlibrary/assetimportupdatetreeview.h
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2021 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3 as published by the Free Software
+** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-3.0.html.
+**
+****************************************************************************/
+
+#pragma once
+
+#include "assetimportupdatetreeitem.h"
+
+#include <utils/itemviews.h>
+
+namespace QmlDesigner {
+namespace Internal {
+
+class AssetImportUpdateTreeModel;
+
+class AssetImportUpdateTreeView : public Utils::TreeView
+{
+    Q_OBJECT
+
+public:
+    explicit AssetImportUpdateTreeView(QWidget *parent = nullptr);
+
+    AssetImportUpdateTreeModel *model() const;
+
+public slots:
+    void clear();
+
+protected:
+    AssetImportUpdateTreeModel *m_model;
+};
+
+} // namespace Internal
+} // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri
index 3f05f1ab0b1..8099c878536 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrary.pri
@@ -15,7 +15,12 @@ HEADERS += itemlibraryview.h \
            itemlibraryaddimportmodel.h \
            itemlibraryassetimportdialog.h \
            itemlibraryassetimporter.h \
-           customfilesystemmodel.h
+           customfilesystemmodel.h \
+           assetimportupdatedialog.h \
+           assetimportupdatetreeitem.h \
+           assetimportupdatetreeitemdelegate.h \
+           assetimportupdatetreemodel.h \
+           assetimportupdatetreeview.h
 
 SOURCES += itemlibraryview.cpp \
            $$PWD/itemlibraryiconimageprovider.cpp \
@@ -31,7 +36,13 @@ SOURCES += itemlibraryview.cpp \
            itemlibraryaddimportmodel.cpp \
            itemlibraryassetimportdialog.cpp \
            itemlibraryassetimporter.cpp \
-           customfilesystemmodel.cpp
+           customfilesystemmodel.cpp \
+           assetimportupdatedialog.cpp \
+           assetimportupdatetreeitem.cpp \
+           assetimportupdatetreeitemdelegate.cpp \
+           assetimportupdatetreemodel.cpp \
+           assetimportupdatetreeview.cpp
 RESOURCES += itemlibrary.qrc
 
-FORMS += itemlibraryassetimportdialog.ui
+FORMS += itemlibraryassetimportdialog.ui \
+         assetimportupdatedialog.ui
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
index 847be2c5f25..69924f20080 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
@@ -23,6 +23,7 @@
 **
 ****************************************************************************/
 #include "itemlibraryassetimporter.h"
+#include "assetimportupdatedialog.h"
 #include "qmldesignerplugin.h"
 #include "qmldesignerconstants.h"
 
@@ -41,6 +42,7 @@
 #include <QApplication>
 #include <QMessageBox>
 #include <QJsonDocument>
+#include <QPushButton>
 
 namespace
 {
@@ -262,11 +264,43 @@ bool ItemLibraryAssetImporter::preParseQuick3DAsset(const QString &file, ParseDa
             pd.assetName = assetDirs[0];
             pd.targetDirPath = pd.targetDir.filePath(pd.assetName);
         }
-        if (!confirmAssetOverwrite(pd.assetName)) {
+        OverwriteResult result = confirmAssetOverwrite(pd.assetName);
+        if (result == OverwriteResult::Skip) {
             addWarning(tr("Skipped import of existing asset: \"%1\"").arg(pd.assetName));
             return false;
+        } else if (result == OverwriteResult::Update) {
+            // Add generated icons and existing source asset file, as those will always need
+            // to be overwritten
+            QSet<QString> alwaysOverwrite;
+            QString iconPath = pd.targetDirPath + '/' + Constants::QUICK_3D_ASSET_ICON_DIR;
+            // Note: Despite the name, QUICK_3D_ASSET_LIBRARY_ICON_SUFFIX is not a traditional file
+            // suffix. It's guaranteed to be in the generated icon filename, though.
+            QStringList filters {QStringLiteral("*%1*").arg(Constants::QUICK_3D_ASSET_LIBRARY_ICON_SUFFIX)};
+            QDirIterator iconIt(iconPath, filters, QDir::Files);
+            while (iconIt.hasNext()) {
+                iconIt.next();
+                alwaysOverwrite.insert(iconIt.fileInfo().absoluteFilePath());
+            }
+            alwaysOverwrite.insert(sourceSceneTargetFilePath(pd));
+
+            Internal::AssetImportUpdateDialog dlg {pd.targetDirPath, {}, alwaysOverwrite,
+                                                   qobject_cast<QWidget *>(parent())};
+            int exitVal = dlg.exec();
+
+            QStringList overwriteFiles;
+            if (exitVal == QDialog::Accepted)
+                overwriteFiles = dlg.selectedFiles();
+            if (!overwriteFiles.isEmpty()) {
+                overwriteFiles.append(QStringList::fromSet(alwaysOverwrite));
+                m_overwrittenImports.insert(pd.targetDirPath, overwriteFiles);
+            } else {
+                addWarning(tr("No files selected for overwrite, skipping import: \"%1\"").arg(pd.assetName));
+                return false;
+            }
+
+        } else {
+            m_overwrittenImports.insert(pd.targetDirPath, {});
         }
-        m_overwrittenImports << pd.targetDirPath;
     }
 
     pd.outDir.mkpath(pd.assetName);
@@ -395,8 +429,7 @@ void ItemLibraryAssetImporter::postParseQuick3DAsset(const ParseData &pd)
     }
 
     // Copy the original asset into a subdirectory
-    assetFiles.insert(pd.sourceInfo.absoluteFilePath(),
-                      pd.targetDirPath + QStringLiteral("/source scene/") + pd.sourceInfo.fileName());
+    assetFiles.insert(pd.sourceInfo.absoluteFilePath(), sourceSceneTargetFilePath(pd));
     m_importFiles.insert(assetFiles);
 }
 
@@ -408,11 +441,22 @@ void ItemLibraryAssetImporter::copyImportedFiles()
         notifyProgress(0, progressTitle);
 
         int counter = 0;
-        for (const QString &dirPath : qAsConst(m_overwrittenImports)) {
-            QDir dir(dirPath);
-            if (dir.exists())
-                dir.removeRecursively();
+        auto it = m_overwrittenImports.constBegin();
+        while (it != m_overwrittenImports.constEnd()) {
+            QDir dir(it.key());
+            if (dir.exists()) {
+                const auto &overwrittenFiles = it.value();
+                if (overwrittenFiles.isEmpty()) {
+                    // Overwrite entire import
+                    dir.removeRecursively();
+                } else {
+                    // Overwrite just selected files
+                    for (const auto &fileName : overwrittenFiles)
+                        QFile::remove(fileName);
+                }
+            }
             notifyProgress((100 * ++counter) / m_overwrittenImports.size(), progressTitle);
+            ++it;
         }
     }
 
@@ -430,7 +474,7 @@ void ItemLibraryAssetImporter::copyImportedFiles()
             // by filesystem watchers.
             QHash<QString, QString>::const_iterator it = assetFiles.begin();
             while (it != assetFiles.end()) {
-                if (QFileInfo::exists(it.key())) {
+                if (QFileInfo::exists(it.key()) && !QFileInfo::exists(it.value())) {
                     QDir targetDir = QFileInfo(it.value()).dir();
                     if (!targetDir.exists())
                         targetDir.mkpath(".");
@@ -461,13 +505,26 @@ void ItemLibraryAssetImporter::keepUiAlive() const
     QApplication::processEvents();
 }
 
-bool ItemLibraryAssetImporter::confirmAssetOverwrite(const QString &assetName)
+ItemLibraryAssetImporter::OverwriteResult ItemLibraryAssetImporter::confirmAssetOverwrite(const QString &assetName)
 {
     const QString title = tr("Overwrite Existing Asset?");
-    const QString question = tr("Asset already exists. Overwrite?\n\"%1\"").arg(assetName);
-    return QMessageBox::question(qobject_cast<QWidget *>(parent()),
-                                 title, question,
-                                 QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes;
+    const QString question = tr("Asset already exists. Overwrite existing or skip?\n\"%1\"").arg(assetName);
+
+    QMessageBox msgBox {QMessageBox::Question, title, question, QMessageBox::NoButton,
+                        qobject_cast<QWidget *>(parent())};
+    QPushButton *updateButton = msgBox.addButton(tr("Overwrite Selected Files"), QMessageBox::NoRole);
+    QPushButton *overwriteButton = msgBox.addButton(tr("Overwrite All Files"), QMessageBox::NoRole);
+    QPushButton *skipButton = msgBox.addButton(tr("Skip"), QMessageBox::NoRole);
+    msgBox.setDefaultButton(overwriteButton);
+    msgBox.setEscapeButton(skipButton);
+
+    msgBox.exec();
+
+    if (msgBox.clickedButton() == updateButton)
+        return OverwriteResult::Update;
+    else if (msgBox.clickedButton() == overwriteButton)
+        return OverwriteResult::Overwrite;
+    return OverwriteResult::Skip;
 }
 
 bool ItemLibraryAssetImporter::startImportProcess(const ParseData &pd)
@@ -623,6 +680,11 @@ void ItemLibraryAssetImporter::finalizeQuick3DImport()
     }
 }
 
+QString ItemLibraryAssetImporter::sourceSceneTargetFilePath(const ParseData &pd)
+{
+    return pd.targetDirPath + QStringLiteral("/source scene/") + pd.sourceInfo.fileName();
+}
+
 bool ItemLibraryAssetImporter::isCancelled() const
 {
     keepUiAlive();
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.h
index 022859a8527..56bd8ec8f29 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.h
@@ -99,14 +99,22 @@ private:
     void notifyProgress(int value, const QString &text);
     void notifyProgress(int value);
     void keepUiAlive() const;
-    bool confirmAssetOverwrite(const QString &assetName);
+
+    enum class OverwriteResult {
+        Skip,
+        Overwrite,
+        Update
+    };
+
+    OverwriteResult confirmAssetOverwrite(const QString &assetName);
     bool startImportProcess(const ParseData &pd);
     bool startIconProcess(int size, const QString &iconFile, const QString &iconSource);
     void postImport();
     void finalizeQuick3DImport();
+    QString sourceSceneTargetFilePath(const ParseData &pd);
 
     QSet<QHash<QString, QString>> m_importFiles;
-    QSet<QString> m_overwrittenImports;
+    QHash<QString, QStringList> m_overwrittenImports;
     bool m_isImporting = false;
     bool m_cancelled = false;
     QString m_importPath;
diff --git a/src/plugins/qmldesigner/qmldesignerplugin.qbs b/src/plugins/qmldesigner/qmldesignerplugin.qbs
index 0011be7a786..bd6c94cbb62 100644
--- a/src/plugins/qmldesigner/qmldesignerplugin.qbs
+++ b/src/plugins/qmldesigner/qmldesignerplugin.qbs
@@ -603,6 +603,17 @@ Project {
                 "integration/stackedutilitypanelcontroller.h",
                 "integration/utilitypanelcontroller.cpp",
                 "integration/utilitypanelcontroller.h",
+                "itemlibrary/assetimportupdatedialog.cpp",
+                "itemlibrary/assetimportupdatedialog.h",
+                "itemlibrary/assetimportupdatedialog.ui",
+                "itemlibrary/assetimportupdatetreeitem.cpp",
+                "itemlibrary/assetimportupdatetreeitem.h",
+                "itemlibrary/assetimportupdatetreeitemdelegate.cpp",
+                "itemlibrary/assetimportupdatetreeitemdelegate.h",
+                "itemlibrary/assetimportupdatetreemodel.cpp",
+                "itemlibrary/assetimportupdatetreemodel.h",
+                "itemlibrary/assetimportupdatetreeview.cpp",
+                "itemlibrary/assetimportupdatetreeview.h",
                 "itemlibrary/itemlibrary.qrc",
                 "itemlibrary/itemlibraryaddimportmodel.cpp",
                 "itemlibrary/itemlibraryaddimportmodel.h",

From 3dfb866bab3c319e7bfe9b11fbb834d0f995c877 Mon Sep 17 00:00:00 2001
From: Leena Miettinen <riitta-leena.miettinen@qt.io>
Date: Tue, 23 Feb 2021 12:51:40 +0100
Subject: [PATCH 05/14] Doc: Fix broken links

By hiding them if the link target is not part of the manual
or by fixing the link target if the section heading changed.

Change-Id: Ib72c71852ea3f8dacbfedb71a94d64d3eb5378fb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
---
 doc/qtcreator/src/howto/creator-external-tools.qdoc | 6 ++++--
 doc/qtcreator/src/qtquick/qtquick-designer.qdoc     | 5 +++--
 doc/qtcreator/src/qtquick/qtquick-states.qdoc       | 7 ++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/doc/qtcreator/src/howto/creator-external-tools.qdoc b/doc/qtcreator/src/howto/creator-external-tools.qdoc
index ebae6a113af..74128bed458 100644
--- a/doc/qtcreator/src/howto/creator-external-tools.qdoc
+++ b/doc/qtcreator/src/howto/creator-external-tools.qdoc
@@ -163,8 +163,10 @@
             To globally change the system environment from the one in which
             \QC is started, select \uicontrol Tools > \uicontrol Options >
             \uicontrol Environment > \uicontrol System, and then select
-            \uicontrol Change in the \uicontrol Environment field. For more
-            information, see \l{Specifying Environment Settings}.
+            \uicontrol Change in the \uicontrol Environment field.
+            \if defined(qtcreator)
+            For more information, see \l{Specifying Environment Settings}.
+            \endif
 
         \li Select the \uicontrol {Modifies current document} check box to make sure
             that if the current document is modified by the tool, it is saved
diff --git a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc
index 1fa57efd9f8..90287f9a7ca 100644
--- a/doc/qtcreator/src/qtquick/qtquick-designer.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-designer.qdoc
@@ -230,17 +230,18 @@
         \li Uses a \uicontrol Grid component to lay out the selected
             components.
         \li \l{Using Layouts}
+    \if defined(qtdesignstudio)
     \row
         \li \inlineimage icons/edit.png
         \li \uicontrol {Show Event List} (\key {Alt+E}): opens a dialog for
-            viewing and creating an {event list} for an
-            application flow.
+            viewing and creating an event list for an application flow.
         \li \l{Simulating Events}
     \row
         \li \inlineimage icons/assign.png
         \li \uicontrol {Assign Events to Actions} (\key {Alt+A}): assigns
             events to actions in an application flow.
         \li \l{Simulating Events}
+    \endif
     \row
         \li Styling
         \li Displays the UI style used for UI controls.
diff --git a/doc/qtcreator/src/qtquick/qtquick-states.qdoc b/doc/qtcreator/src/qtquick/qtquick-states.qdoc
index f04a7460e83..9dc2867e28b 100644
--- a/doc/qtcreator/src/qtquick/qtquick-states.qdoc
+++ b/doc/qtcreator/src/qtquick/qtquick-states.qdoc
@@ -89,9 +89,10 @@
 
     \image qmldesigner-states.png "States and Properties views"
 
-    \note If you have \l{Locking Items}{locked an item} in \uicontrol Navigator,
-    and you attempt to remove states where you change the values of its
-    properties, you are prompted to confirm the removal.
+    \note If you have \l{Locking Components}{locked a component} in
+    \uicontrol Navigator, and you attempt to remove states where you
+    change the values of its properties, you are prompted to confirm
+    the removal.
 
     For more information, watch the following video:
 

From 7d3ba0587f76c6905e1f2ee00ae54d4211af523c Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Mon, 22 Feb 2021 18:36:21 +0200
Subject: [PATCH 06/14] QmlDesigner: Fix item library expand issue

If a click happens on an item library item, mouse interaction
(expanding, collapsing sections, and showing context menu) is blocked
until some action happens (right-click for example). This is due
to a bug in QDrag. With this commit it is very hard to reproduce the
issue unless one's deliberately insisting to reproduce it.

Fixes: QDS-3792
Fixes: QDS-1652
Change-Id: I201b07aabf144adbb4d51e32c1fcc4990f89f5f9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 .../itemLibraryQmlSources/ItemDelegate.qml    |  2 +-
 .../itemlibrary/itemlibrarywidget.cpp         | 34 +++++++++----------
 .../itemlibrary/itemlibrarywidget.h           |  4 +--
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
index b7bc9b0b58c..f7cf00d92c3 100644
--- a/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
+++ b/share/qtcreator/qmldesigner/itemLibraryQmlSources/ItemDelegate.qml
@@ -75,7 +75,7 @@ Item {
             anchors.fill: parent
 
             onPressed: {
-                rootView.startDragAndDrop(mouseRegion, itemLibraryEntry)
+                rootView.startDragAndDrop(itemLibraryEntry)
             }
         }
     }
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index dc31d169459..68226022865 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -84,6 +84,17 @@ bool ItemLibraryWidget::eventFilter(QObject *obj, QEvent *event)
     if (event->type() == QEvent::FocusOut) {
         if (obj == m_itemViewQuickWidget.data())
             QMetaObject::invokeMethod(m_itemViewQuickWidget->rootObject(), "closeContextMenu");
+    } else if (event->type() == QMouseEvent::MouseMove) {
+        if (m_itemToDrag.isValid()) {
+            ItemLibraryEntry entry = m_itemToDrag.value<ItemLibraryEntry>();
+            auto drag = new QDrag(this);
+            drag->setPixmap(Utils::StyleHelper::dpiSpecificImageFile(entry.libraryEntryIconPath()));
+            drag->setMimeData(m_itemLibraryModel->getMimeData(entry));
+            drag->exec();
+            drag->deleteLater();
+
+            m_itemToDrag = {};
+        }
     }
 
     return QObject::eventFilter(obj, event);
@@ -366,25 +377,12 @@ void ItemLibraryWidget::setResourcePath(const QString &resourcePath)
     updateSearch();
 }
 
-void ItemLibraryWidget::startDragAndDrop(QQuickItem *mouseArea, QVariant itemLibraryId)
+void ItemLibraryWidget::startDragAndDrop(const QVariant &itemLibEntry)
 {
-    m_currentitemLibraryEntry = itemLibraryId.value<ItemLibraryEntry>();
-
-    QMimeData *mimeData = m_itemLibraryModel->getMimeData(m_currentitemLibraryEntry);
-    auto drag = new QDrag(this);
-
-    drag->setPixmap(Utils::StyleHelper::dpiSpecificImageFile(
-                        m_currentitemLibraryEntry.libraryEntryIconPath()));
-    drag->setMimeData(mimeData);
-
-    /* Workaround for bug in Qt. The release event is not delivered for Qt < 5.9 if a drag is started */
-    QMouseEvent event (QEvent::MouseButtonRelease, QPoint(-1, -1), Qt::LeftButton, Qt::LeftButton, Qt::NoModifier);
-    QApplication::sendEvent(mouseArea, &event);
-
-    QTimer::singleShot(0, [drag]() {
-        drag->exec();
-        drag->deleteLater();
-    });
+    // Actual drag is created after mouse has moved to avoid a QDrag bug that causes drag to stay
+    // active (and blocks mouse release) if mouse is released at the same spot of the drag start.
+    // This doesn't completely eliminate the bug but makes it significantly harder to produce.
+    m_itemToDrag = itemLibEntry;
 }
 
 void ItemLibraryWidget::setFlowMode(bool b)
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
index 3a274069fa2..5bde054fc9b 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.h
@@ -87,7 +87,7 @@ public:
     void setModel(Model *model);
     void setFlowMode(bool b);
 
-    Q_INVOKABLE void startDragAndDrop(QQuickItem *mouseArea, QVariant itemLibId);
+    Q_INVOKABLE void startDragAndDrop(const QVariant &itemLibEntry);
     Q_INVOKABLE void removeImport(const QString &importUrl);
 
 signals:
@@ -123,7 +123,7 @@ private:
     QShortcut *m_qmlSourceUpdateShortcut;
     AsynchronousImageCache &m_imageCache;
     QPointer<Model> m_model;
-    ItemLibraryEntry m_currentitemLibraryEntry;
+    QVariant m_itemToDrag;
     bool m_updateRetry = false;
     QString m_filterText;
 

From 83c61a7c53a55b6285fdbedd80b9d43268aa9841 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Mon, 22 Feb 2021 22:10:53 +0200
Subject: [PATCH 07/14] QmlDesigner: 2 item library import section improvements

- Move imports with no categories to the bottom of the list.
- Remove the project import from the list.

Change-Id: I41d229bb776bfe845dadbfc5c1be5b7d50aeee3e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 .../components/itemlibrary/itemlibraryimport.cpp    |  3 +++
 .../components/itemlibrary/itemlibrarymodel.cpp     | 13 +++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp
index ef1d0e7da72..41483535c5a 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryimport.cpp
@@ -64,6 +64,9 @@ QString ItemLibraryImport::sortingName() const
     if (m_isUserSection) // user components always come first
         return "_";
 
+    if (!hasCategories()) // imports with no categories are at the bottom of the list
+        return "zzzzz" + importName();
+
     return importName();
 }
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
index 761c450b317..c88ebb67e96 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp
@@ -30,12 +30,13 @@
 #include "itemlibraryitem.h"
 #include "itemlibraryinfo.h"
 
+#include <designermcumanager.h>
 #include <model.h>
 #include <nodehints.h>
 #include <nodemetainfo.h>
-
-#include <designermcumanager.h>
-
+#include <projectexplorer/project.h>
+#include <projectexplorer/session.h>
+#include "qmldesignerplugin.h"
 #include <utils/algorithm.h>
 #include <utils/qtcassert.h>
 
@@ -190,9 +191,13 @@ void ItemLibraryModel::update(ItemLibraryInfo *itemLibraryInfo, Model *model)
     beginResetModel();
     clearSections();
 
+    Utils::FilePath qmlFileName = QmlDesignerPlugin::instance()->currentDesignDocument()->fileName();
+    ProjectExplorer::Project *project = ProjectExplorer::SessionManager::projectForFile(qmlFileName);
+    QString projectName = project ? project->displayName() : "";
+
     // create import sections
     for (const Import &import : model->imports()) {
-        if (import.isLibraryImport()) {
+        if (import.isLibraryImport() && import.url() != projectName) {
             ItemLibraryImport *itemLibImport = new ItemLibraryImport(import, this);
             m_importList.append(itemLibImport);
             itemLibImport->setImportExpanded(loadExpandedState(import.url()));

From 28a8516394bbb78361fcfadbcd599d6159904102 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 22 Feb 2021 14:23:23 +0100
Subject: [PATCH 08/14] CMake build: Make it possible to separately build
 wininterrupt & cdbext

By making them separate projects. Follow the pattern from sdktool.
This is needed for building these tools on Windows 32bit for the
Qt6-based installers - because Qt 6 doesn't provide Windows 32bit
builds anymore.

Change-Id: I82e2fdc7312e95079bb13f8c5f0ac1028c09222f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 src/libs/qtcreatorcdbext/CMakeLists.txt | 20 +++++++++++++++++++-
 src/tools/wininterrupt/CMakeLists.txt   | 16 ++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/src/libs/qtcreatorcdbext/CMakeLists.txt b/src/libs/qtcreatorcdbext/CMakeLists.txt
index ddffac17e3f..c2a7c60a2ef 100644
--- a/src/libs/qtcreatorcdbext/CMakeLists.txt
+++ b/src/libs/qtcreatorcdbext/CMakeLists.txt
@@ -1,3 +1,19 @@
+cmake_minimum_required(VERSION 3.10)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake")
+
+project(qtcreatorcdbext)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+if (NOT QT_CREATOR_API_DEFINED)
+  # standalone build
+  include(QtCreatorIDEBranding)
+  include(QtCreatorAPI)
+endif()
+
 if (NOT WIN32 OR NOT MSVC)
   return()
 endif()
@@ -111,8 +127,10 @@ if (_library_enabled)
           COMPONENT qtcreatorcdbext)
 
   add_custom_target(copy_python_dll ALL VERBATIM)
+
+  qtc_output_binary_dir(output_binary_dir)
   add_custom_command(TARGET copy_python_dll POST_BUILD
-    COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${deployPythonFiles} "${PROJECT_BINARY_DIR}/lib/qtcreatorcdbext${ArchSuffix}/"
+    COMMAND "${CMAKE_COMMAND}" -E copy_if_different ${deployPythonFiles} "${output_binary_dir}/lib/qtcreatorcdbext${ArchSuffix}/"
     VERBATIM
   )
 endif()
diff --git a/src/tools/wininterrupt/CMakeLists.txt b/src/tools/wininterrupt/CMakeLists.txt
index f87825ed8e8..b16e2e1e65b 100644
--- a/src/tools/wininterrupt/CMakeLists.txt
+++ b/src/tools/wininterrupt/CMakeLists.txt
@@ -1,3 +1,19 @@
+cmake_minimum_required(VERSION 3.10)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake")
+
+project(wininterrupt)
+
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+if (NOT QT_CREATOR_API_DEFINED)
+  # standalone build
+  include(QtCreatorIDEBranding)
+  include(QtCreatorAPI)
+endif()
+
 if (NOT WIN32)
   return()
 endif()

From cc0d70dd993618e7915de0c005cb539e620d11f1 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Mon, 22 Feb 2021 15:35:25 +0100
Subject: [PATCH 09/14] build.py: Build wininterrupt and qtcreatorcdbext
 separately

The build of wininterrupt and qtcreatorcdbext was using the fully
configured & built Qt Creator as a base. Now that we have separate CMake
projects for these tools, build them really separately.

This will be needed for building them on Windows 32bit for the Qt 6
build, since that doesn't provide Qt builds on that platform anymore.

Change-Id: I50a662c6366814cbb6f4ce62adca2c1c3e9d546f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 scripts/build.py | 92 ++++++++++++++++++++++++++++--------------------
 1 file changed, 53 insertions(+), 39 deletions(-)

diff --git a/scripts/build.py b/scripts/build.py
index afc289fd327..2ccb1a98f44 100755
--- a/scripts/build.py
+++ b/scripts/build.py
@@ -107,29 +107,10 @@ def get_arguments():
     args.with_debug_info = args.build_type == 'RelWithDebInfo'
     return args
 
-def build_qtcreator(args, paths):
-    if not os.path.exists(paths.build):
-        os.makedirs(paths.build)
-    prefix_paths = [os.path.abspath(fp) for fp in args.prefix_paths] + [paths.qt]
-    if paths.llvm:
-        prefix_paths += [paths.llvm]
-    if paths.elfutils:
-        prefix_paths += [paths.elfutils]
-    prefix_paths = [common.to_posix_path(fp) for fp in prefix_paths]
-    with_docs_str = 'OFF' if args.no_docs else 'ON'
-    build_date_option = 'OFF' if args.no_build_date else 'ON'
-    test_option = 'ON' if args.with_tests else 'OFF'
+def common_cmake_arguments(args):
     separate_debug_info_option = 'ON' if args.with_debug_info else 'OFF'
-    cmake_args = ['cmake',
-                  '-DCMAKE_PREFIX_PATH=' + ';'.join(prefix_paths),
-                  '-DCMAKE_BUILD_TYPE=' + args.build_type,
+    cmake_args = ['-DCMAKE_BUILD_TYPE=' + args.build_type,
                   '-DQTC_SEPARATE_DEBUG_INFO=' + separate_debug_info_option,
-                  '-DSHOW_BUILD_DATE=' + build_date_option,
-                  '-DWITH_DOCS=' + with_docs_str,
-                  '-DBUILD_DEVELOPER_DOCS=' + with_docs_str,
-                  '-DBUILD_EXECUTABLE_SDKTOOL=OFF',
-                  '-DCMAKE_INSTALL_PREFIX=' + common.to_posix_path(paths.install),
-                  '-DWITH_TESTS=' + test_option,
                   '-G', 'Ninja']
 
     if args.python3:
@@ -147,14 +128,39 @@ def build_qtcreator(args, paths):
         if not os.environ.get('CC') and not os.environ.get('CXX'):
             cmake_args += ['-DCMAKE_C_COMPILER=cl',
                            '-DCMAKE_CXX_COMPILER=cl']
-        cmake_args += ['-DBUILD_EXECUTABLE_WIN32INTERRUPT=OFF',
-                       '-DBUILD_EXECUTABLE_WIN64INTERRUPT=OFF',
-                       '-DBUILD_LIBRARY_QTCREATORCDBEXT=OFF']
         if args.python_path:
             python_library = glob.glob(os.path.join(args.python_path, 'libs', 'python??.lib'))
             if python_library:
                 cmake_args += ['-DPYTHON_LIBRARY=' + python_library[0],
                                '-DPYTHON_INCLUDE_DIR=' + os.path.join(args.python_path, 'include')]
+    return cmake_args
+
+def build_qtcreator(args, paths):
+    if not os.path.exists(paths.build):
+        os.makedirs(paths.build)
+    prefix_paths = [os.path.abspath(fp) for fp in args.prefix_paths] + [paths.qt]
+    if paths.llvm:
+        prefix_paths += [paths.llvm]
+    if paths.elfutils:
+        prefix_paths += [paths.elfutils]
+    prefix_paths = [common.to_posix_path(fp) for fp in prefix_paths]
+    with_docs_str = 'OFF' if args.no_docs else 'ON'
+    build_date_option = 'OFF' if args.no_build_date else 'ON'
+    test_option = 'ON' if args.with_tests else 'OFF'
+    cmake_args = ['cmake',
+                  '-DCMAKE_PREFIX_PATH=' + ';'.join(prefix_paths),
+                  '-DSHOW_BUILD_DATE=' + build_date_option,
+                  '-DWITH_DOCS=' + with_docs_str,
+                  '-DBUILD_DEVELOPER_DOCS=' + with_docs_str,
+                  '-DBUILD_EXECUTABLE_SDKTOOL=OFF',
+                  '-DCMAKE_INSTALL_PREFIX=' + common.to_posix_path(paths.install),
+                  '-DWITH_TESTS=' + test_option]
+    cmake_args += common_cmake_arguments(args)
+
+    if common.is_windows_platform():
+        cmake_args += ['-DBUILD_EXECUTABLE_WIN32INTERRUPT=OFF',
+                       '-DBUILD_EXECUTABLE_WIN64INTERRUPT=OFF',
+                       '-DBUILD_LIBRARY_QTCREATORCDBEXT=OFF']
 
     # TODO this works around a CMake bug https://gitlab.kitware.com/cmake/cmake/issues/20119
     cmake_args += ['-DBUILD_WITH_PCH=OFF']
@@ -198,28 +204,34 @@ def build_qtcreator(args, paths):
 def build_wininterrupt(args, paths):
     if not common.is_windows_platform():
         return
-    # assumes existing Qt Creator build
-    cmake_args = ['-DBUILD_EXECUTABLE_WIN32INTERRUPT=ON',
-                  '-DBUILD_EXECUTABLE_WIN64INTERRUPT=ON',
-                  '-DBUILD_LIBRARY_QTCREATORCDBEXT=OFF']
-    common.check_print_call(['cmake'] + cmake_args + [paths.src], paths.build)
-    common.check_print_call(['cmake', '--build', '.'], paths.build)
+    if not os.path.exists(paths.wininterrupt_build):
+        os.makedirs(paths.wininterrupt_build)
+    prefix_paths = [common.to_posix_path(os.path.abspath(fp)) for fp in args.prefix_paths]
+    cmake_args = ['-DCMAKE_PREFIX_PATH=' + ';'.join(prefix_paths),
+                  '-DCMAKE_INSTALL_PREFIX=' + common.to_posix_path(paths.wininterrupt_install)]
+    cmake_args += common_cmake_arguments(args)
+    common.check_print_call(['cmake'] + cmake_args + [os.path.join(paths.src, 'src', 'tools', 'wininterrupt')],
+                            paths.wininterrupt_build)
+    common.check_print_call(['cmake', '--build', '.'], paths.wininterrupt_build)
     common.check_print_call(['cmake', '--install', '.', '--prefix', paths.wininterrupt_install,
                              '--component', 'wininterrupt'],
-                            paths.build)
+                            paths.wininterrupt_build)
 
 def build_qtcreatorcdbext(args, paths):
     if args.no_cdb:
         return
-    # assumes existing Qt Creator build
-    cmake_args = ['-DBUILD_EXECUTABLE_WIN32INTERRUPT=OFF',
-                  '-DBUILD_EXECUTABLE_WIN64INTERRUPT=OFF',
-                  '-DBUILD_LIBRARY_QTCREATORCDBEXT=ON']
-    common.check_print_call(['cmake'] + cmake_args + [paths.src], paths.build)
-    common.check_print_call(['cmake', '--build', '.'], paths.build)
+    if not os.path.exists(paths.qtcreatorcdbext_build):
+        os.makedirs(paths.qtcreatorcdbext_build)
+    prefix_paths = [common.to_posix_path(os.path.abspath(fp)) for fp in args.prefix_paths]
+    cmake_args = ['-DCMAKE_PREFIX_PATH=' + ';'.join(prefix_paths),
+                  '-DCMAKE_INSTALL_PREFIX=' + common.to_posix_path(paths.qtcreatorcdbext_install)]
+    cmake_args += common_cmake_arguments(args)
+    common.check_print_call(['cmake'] + cmake_args + [os.path.join(paths.src, 'src', 'libs', 'qtcreatorcdbext')],
+                            paths.qtcreatorcdbext_build)
+    common.check_print_call(['cmake', '--build', '.'], paths.qtcreatorcdbext_build)
     common.check_print_call(['cmake', '--install', '.', '--prefix', paths.qtcreatorcdbext_install,
                              '--component', 'qtcreatorcdbext'],
-                            paths.build)
+                            paths.qtcreatorcdbext_build)
 
 def package_qtcreator(args, paths):
     if not args.no_zip:
@@ -261,7 +273,7 @@ def package_qtcreator(args, paths):
 
 def get_paths(args):
     Paths = collections.namedtuple('Paths',
-                                   ['qt', 'src', 'build',
+                                   ['qt', 'src', 'build', 'wininterrupt_build', 'qtcreatorcdbext_build',
                                     'install', 'dev_install', 'debug_install',
                                     'wininterrupt_install', 'qtcreatorcdbext_install', 'result',
                                     'elfutils', 'llvm'])
@@ -270,6 +282,8 @@ def get_paths(args):
     return Paths(qt=os.path.abspath(args.qt_path),
                  src=os.path.abspath(args.src),
                  build=os.path.join(build_path, 'build'),
+                 wininterrupt_build=os.path.join(build_path, 'build-wininterrupt'),
+                 qtcreatorcdbext_build=os.path.join(build_path, 'build-qtcreatorcdbext'),
                  install=os.path.join(install_path, 'qt-creator'),
                  dev_install=os.path.join(install_path, 'qt-creator-dev'),
                  debug_install=os.path.join(install_path, 'qt-creator-debug'),

From 58b3afa7283504c3b77ac861da696a58e61f1ea0 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Tue, 23 Feb 2021 15:20:10 +0200
Subject: [PATCH 10/14] QmlDesigner: Clean up flow tags remainings

Remove the remaining unused code related to flow tags. Flow tags feature
was removed as part of the new item library ui commit:
151184a6093fc8c39b2f33cf158aef49ab9df30c

Change-Id: Ic2f518cb7d345d4f5a183194bebb29c76b227c15
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 share/qtcreator/themes/design.creatortheme    |  4 +--
 .../itemlibrary/itemlibrarywidget.cpp         |  4 ---
 .../designercore/include/itemlibraryinfo.h    |  4 ---
 .../designercore/metainfo/itemlibraryinfo.cpp | 18 ------------
 .../designercore/metainfo/metainforeader.cpp  |  2 --
 .../metainfo/subcomponentmanager.cpp          | 28 -------------------
 .../qmldesigner/qmldesignerconstants.h        |  2 --
 7 files changed, 2 insertions(+), 60 deletions(-)

diff --git a/share/qtcreator/themes/design.creatortheme b/share/qtcreator/themes/design.creatortheme
index 2451371b7f8..67457b28495 100644
--- a/share/qtcreator/themes/design.creatortheme
+++ b/share/qtcreator/themes/design.creatortheme
@@ -307,7 +307,7 @@ QmlDesigner_ScrollBarHandleColor=ff595b5c
 
 ;palette colors
 
-;outline colors on the combo box, zoom slider, flowtag button, dialog outlines, on loading project the whole screen flashes this color
+;outline colors on the combo box, zoom slider, dialog outlines, on loading project the whole screen flashes this color
 ;PaletteWindow=normalBackground
 PaletteWindow=ff262626
 
@@ -347,7 +347,7 @@ PaletteText=text
 
 
 
-;text for flowtags, import dropdown, ticks for tick boxes.
+; text for ticks for tick boxes.
 PaletteButtonText=text
 ;PaletteButtonText=ffd3299a
 
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
index 68226022865..ea80e211132 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
@@ -229,15 +229,11 @@ void ItemLibraryWidget::setItemLibraryInfo(ItemLibraryInfo *itemLibraryInfo)
     if (m_itemLibraryInfo) {
         disconnect(m_itemLibraryInfo.data(), &ItemLibraryInfo::entriesChanged,
                    this, &ItemLibraryWidget::delayedUpdateModel);
-        disconnect(m_itemLibraryInfo.data(), &ItemLibraryInfo::importTagsChanged,
-                   this, &ItemLibraryWidget::delayedUpdateModel);
     }
     m_itemLibraryInfo = itemLibraryInfo;
     if (itemLibraryInfo) {
         connect(m_itemLibraryInfo.data(), &ItemLibraryInfo::entriesChanged,
                 this, &ItemLibraryWidget::delayedUpdateModel);
-        connect(m_itemLibraryInfo.data(), &ItemLibraryInfo::importTagsChanged,
-                this, &ItemLibraryWidget::delayedUpdateModel);
     }
     delayedUpdateModel();
 }
diff --git a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
index 9e26d8a3c22..e7d0c3e2927 100644
--- a/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
+++ b/src/plugins/qmldesigner/designercore/include/itemlibraryinfo.h
@@ -108,14 +108,11 @@ public:
     void clearEntries();
 
     QStringList blacklistImports() const;
-    QStringList showTagsForImports() const;
 
     void addBlacklistImports(const QStringList &list);
-    void addShowTagsForImports(const QStringList &list);
 
 signals:
     void entriesChanged();
-    void importTagsChanged();
 
 private: // functions
     ItemLibraryInfo(QObject *parent = nullptr);
@@ -126,7 +123,6 @@ private: // variables
     QPointer<ItemLibraryInfo> m_baseInfo;
 
     QStringList m_blacklistImports;
-    QStringList m_showTagsForImports;
 };
 
 } // namespace QmlDesigner
diff --git a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
index 31ad31aa91f..4fc5e7c0887 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/itemlibraryinfo.cpp
@@ -344,29 +344,11 @@ QStringList ItemLibraryInfo::blacklistImports() const
     return list;
 }
 
-// TODO: remove this and its dependencies, as flow tags are removed
-QStringList ItemLibraryInfo::showTagsForImports() const
-{
-    auto list = m_showTagsForImports;
-    if (m_baseInfo)
-        list.append(m_baseInfo->m_showTagsForImports);
-    list.removeDuplicates();
-    return list;
-}
-
 void ItemLibraryInfo::addBlacklistImports(const QStringList &list)
 {
     m_blacklistImports.append(list);
 }
 
-void ItemLibraryInfo::addShowTagsForImports(const QStringList &list)
-{
-    if (!list.isEmpty()) {
-        m_showTagsForImports.append(list);
-        emit importTagsChanged();
-    }
-}
-
 void ItemLibraryInfo::setBaseInfo(ItemLibraryInfo *baseInfo)
 {
     m_baseInfo = baseInfo;
diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
index cfb35aac772..4c6cf7ec1d2 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
@@ -230,8 +230,6 @@ void MetaInfoReader::readImportsProperty(const QString &name, const QVariant &va
 
     if (name == "blacklistImports" && !values.isEmpty()) {
         m_metaInfo.itemLibraryInfo()->addBlacklistImports(values);
-    } else if (name == "showTagsForImports" && !values.isEmpty()) {
-        m_metaInfo.itemLibraryInfo()->addShowTagsForImports(values);
     } else {
         addError(tr("Unknown property for Imports %1").arg(name), currentSourceLocation());
         setParserState(Error);
diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
index adc7b482d55..0c759c59ced 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp
@@ -369,23 +369,6 @@ void SubComponentManager::parseQuick3DAssetDir(const QString &assetPath)
     for (QString &asset : assets)
         asset.prepend(assetImportRoot + QLatin1Char('.'));
 
-    QStringList newFlowTags;
-    const QStringList flowTags = model()->metaInfo().itemLibraryInfo()->showTagsForImports();
-    const QString quick3Dlib = QLatin1String(Constants::QT_QUICK_3D_MODULE_NAME);
-    const QList<Import> possibleImports = model()->possibleImports();
-
-    auto isPossibleImport = [&possibleImports](const QString &asset) {
-        for (const Import &import : possibleImports) {
-            if (import.url() == asset)
-                return true;
-        }
-        return false;
-    };
-
-    // If there are 3D assets in import path, add a flow tag for QtQuick3D
-    if (!assets.isEmpty() && !flowTags.contains(quick3Dlib) && isPossibleImport(quick3Dlib))
-        newFlowTags << quick3Dlib;
-
     // Create item library entries for Quick3D assets that are imported by document
     const QString iconPath = QStringLiteral(":/ItemLibrary/images/item-3D_model-icon.png");
     for (auto &import : qAsConst(m_imports)) {
@@ -427,17 +410,6 @@ void SubComponentManager::parseQuick3DAssetDir(const QString &assetPath)
             }
         }
     }
-
-    // Create flow tags for the rest, if they are possible imports
-    if (!assets.isEmpty()) {
-        for (const QString &asset : qAsConst(assets)) {
-            if (!flowTags.contains(asset) && isPossibleImport(asset))
-                newFlowTags << asset;
-        }
-    }
-
-    if (!newFlowTags.isEmpty())
-        model()->metaInfo().itemLibraryInfo()->addShowTagsForImports(newFlowTags);
 }
 
 QStringList SubComponentManager::quick3DAssetPaths() const
diff --git a/src/plugins/qmldesigner/qmldesignerconstants.h b/src/plugins/qmldesigner/qmldesignerconstants.h
index f91caac9597..84985b991f7 100644
--- a/src/plugins/qmldesigner/qmldesignerconstants.h
+++ b/src/plugins/qmldesigner/qmldesignerconstants.h
@@ -70,7 +70,6 @@ const char QUICK_3D_ASSETS_FOLDER[] = "/Quick3DAssets";
 const char QUICK_3D_ASSET_LIBRARY_ICON_SUFFIX[] = "_libicon";
 const char QUICK_3D_ASSET_ICON_DIR[] = "_icons";
 const char DEFAULT_ASSET_IMPORT_FOLDER[] = "/asset_imports";
-const char QT_QUICK_3D_MODULE_NAME[] = "QtQuick3D";
 
 // Menus
 const char M_VIEW_WORKSPACES[] = "QmlDesigner.Menu.View.Workspaces";
@@ -86,7 +85,6 @@ const char EVENT_ANNOTATION_ADDED[] = "Annotation Added";
 const char EVENT_RESOURCE_IMPORTED[] = "Resource Imported ";
 const char EVENT_ACTION_EXECUTED[] = "Action Executed ";
 const char EVENT_IMPORT_ADDED[] = "Import Added ";
-const char EVENT_IMPORT_ADDED_FLOWTAG[] = "Import Added FlowTag ";
 const char EVENT_BINDINGEDITOR_OPENED[] = "Binding Editor Opened";
 const char EVENT_RICHTEXT_OPENED[] = "Richtext Editor Opened";
 const char EVENT_FORMEDITOR_TIME[] = "Form Editor";

From 4bdc4cf9c77b97e0cdf3b26d26d3944936a15137 Mon Sep 17 00:00:00 2001
From: Mahmoud Badri <mahmoud.badri@qt.io>
Date: Tue, 23 Feb 2021 17:02:41 +0200
Subject: [PATCH 11/14] QmlDesigner: Fix flow tags cleanup regression

Caused by: 58b3afa7283504c3b77ac861da696a58e61f1ea0

Change-Id: I2cb52801f7d7ad9d7d4382f81ad9e52cae16fd03
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
---
 .../qmldesigner/designercore/metainfo/metainforeader.cpp        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
index 4c6cf7ec1d2..83d826ad9ac 100644
--- a/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
+++ b/src/plugins/qmldesigner/designercore/metainfo/metainforeader.cpp
@@ -230,6 +230,8 @@ void MetaInfoReader::readImportsProperty(const QString &name, const QVariant &va
 
     if (name == "blacklistImports" && !values.isEmpty()) {
         m_metaInfo.itemLibraryInfo()->addBlacklistImports(values);
+    } else if (name == "showTagsForImports" && !values.isEmpty()) {
+        // Flow tags removed, but keeping this for now to avoid errors parsing old metadata files
     } else {
         addError(tr("Unknown property for Imports %1").arg(name), currentSourceLocation());
         setParserState(Error);

From 173a5b97dd2694a6847a777addc892337a3e9d83 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Tue, 23 Feb 2021 16:22:56 +0100
Subject: [PATCH 12/14] qmake build system: Install
 share/3rdparty/package-manager

Amends: cc0fa86ffd6c202aeb7ee091bbf8a91d7623718c

Change-Id: I00ca24fa18a10ff9bbbdeb86262c24c32d8dd8f8
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 src/share/3rdparty/data.pro | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/share/3rdparty/data.pro b/src/share/3rdparty/data.pro
index 3c3ab29bcdb..b8fb477854f 100644
--- a/src/share/3rdparty/data.pro
+++ b/src/share/3rdparty/data.pro
@@ -7,7 +7,8 @@ STATIC_OUTPUT_BASE = $$IDE_DATA_PATH
 STATIC_INSTALL_BASE = $$INSTALL_DATA_PATH
 
 DATA_DIRS = \
-    fonts
+    fonts \
+    package-manager
 
 for(data_dir, DATA_DIRS) {
     STATIC_FILES += $$files($$PWD/$$data_dir/*, true)

From 14162aae9faa5c13569656dfb969d4f3e240d270 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Tue, 23 Feb 2021 19:12:11 +0100
Subject: [PATCH 13/14] Remove conanfile.txt

It is outdated and was not noticed until Qt Creator started processing
present conanfile.txt files.

Change-Id: I3ae273d50cb6ba34cdaca0d952acaa68d3db659e
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
---
 conanfile.txt | 24 ------------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 conanfile.txt

diff --git a/conanfile.txt b/conanfile.txt
deleted file mode 100644
index c30ca6aad47..00000000000
--- a/conanfile.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-# This needs a special conan repository to work!
-# Please run:
-#   conan remote add qtcreator https://api.bintray.com/conan/qtcreator/qtcreator
-#   conan remote add bincrafters https://api.bintray.com/conan/bincrafters/public-conan
-# to make this repository available!
-#
-# Then do the following to build Qt Creator:
-#  1. Create a build directory and change into it
-#  2. Run "conan install /path/to/qtcreator/sources --build missing"
-#  3. Run "cmake -DCMAKE_TOOLCHAIN_FILE=conan_paths.cmake /path/to/qtcreator/sources -GNinja"
-
-[requires]
-qt/5.15.1@bincrafters/stable
-llvm/8.0.0@qtcreator/stable
-
-[generators]
-cmake_paths
-
-[options]
-qt:qtdeclarative=True
-qt:qtscript=True
-qt:qtserialport=True
-qt:qtsvg=True
-qt:qttools=True

From f9efff42e170f34a710e413eaf62387fc56f9e19 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@qt.io>
Date: Mon, 22 Feb 2021 17:29:39 +0100
Subject: [PATCH 14/14] LanguageClient: Fix DocumentOnTypeFormattingRequest
 interface

Change-Id: Ib84f6c475e5bf2faff395d60d4c3b42b0a9d7017
Reviewed-by: David Schulz <david.schulz@qt.io>
---
 src/libs/languageserverprotocol/languagefeatures.cpp | 2 +-
 src/libs/languageserverprotocol/languagefeatures.h   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libs/languageserverprotocol/languagefeatures.cpp b/src/libs/languageserverprotocol/languagefeatures.cpp
index bffa0df284f..de175b7e7e1 100644
--- a/src/libs/languageserverprotocol/languagefeatures.cpp
+++ b/src/libs/languageserverprotocol/languagefeatures.cpp
@@ -242,7 +242,7 @@ bool DocumentOnTypeFormattingParams::isValid(ErrorHierarchy *error) const
 }
 
 DocumentOnTypeFormattingRequest::DocumentOnTypeFormattingRequest(
-        const DocumentFormattingParams &params)
+        const DocumentOnTypeFormattingParams &params)
     : Request(methodName, params)
 { }
 
diff --git a/src/libs/languageserverprotocol/languagefeatures.h b/src/libs/languageserverprotocol/languagefeatures.h
index 5b1b9da3c2c..c1818b34f2c 100644
--- a/src/libs/languageserverprotocol/languagefeatures.h
+++ b/src/libs/languageserverprotocol/languagefeatures.h
@@ -786,10 +786,10 @@ public:
 };
 
 class LANGUAGESERVERPROTOCOL_EXPORT DocumentOnTypeFormattingRequest : public Request<
-        QList<TextEdit>, std::nullptr_t, DocumentFormattingParams>
+        LanguageClientArray<TextEdit>, std::nullptr_t, DocumentOnTypeFormattingParams>
 {
 public:
-    explicit DocumentOnTypeFormattingRequest(const DocumentFormattingParams &params);
+    explicit DocumentOnTypeFormattingRequest(const DocumentOnTypeFormattingParams &params);
     using Request::Request;
     constexpr static const char methodName[] = "textDocument/onTypeFormatting";
 };