From dce690ab73b0ec2c406c2280a860aaa05e2ea7b1 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Thu, 25 Feb 2021 13:29:24 +0100
Subject: [PATCH] Fix build with Qt 6

Change-Id: I67ffc389d7579ac98755ec99614ce9b3e4e07df5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
---
 src/libs/sqlite/utf8string.h                       |  7 +++++++
 .../itemlibrary/itemlibraryassetimportdialog.cpp   |  2 +-
 .../itemlibrary/itemlibraryassetimporter.cpp       | 14 ++++++++------
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/libs/sqlite/utf8string.h b/src/libs/sqlite/utf8string.h
index 6e8e469595f..0c6a1fb3341 100644
--- a/src/libs/sqlite/utf8string.h
+++ b/src/libs/sqlite/utf8string.h
@@ -268,6 +268,13 @@ public:
         return second == first;
     }
 
+    friend bool operator!=(const Utf8String &first, const char *second)
+    {
+        return first.byteArray != second;
+    }
+
+    friend bool operator!=(const char *first, const Utf8String &second) { return second != first; }
+
     friend bool operator==(const Utf8String &first, const QString &second)
     {
         return first.byteArray == second.toUtf8();
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
index 1192fb0fef0..5d6054c7b76 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
@@ -184,7 +184,7 @@ ItemLibraryAssetImportDialog::ItemLibraryAssetImportDialog(
             while (it != defaultOpts.constEnd()) {
                 if (m_importOptions.last().contains(it.key())) {
                     QJsonObject optObj = m_importOptions.last()[it.key()].toObject();
-                    QJsonValue value(it.value()["value"]);
+                    QJsonValue value(it.value().toObject()["value"]);
                     optObj.insert("value", value);
                     m_importOptions.last().insert(it.key(), optObj);
                 }
diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
index 220dff8508a..b78dcb6eece 100644
--- a/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
+++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
@@ -33,17 +33,19 @@
 #include "rewritertransaction.h"
 #include "rewritingexception.h"
 
+#include <utils/algorithm.h>
+
+#include <QApplication>
 #include <QDir>
 #include <QDirIterator>
-#include <QSaveFile>
 #include <QFile>
-#include <QLoggingCategory>
-#include <QTemporaryDir>
-#include <QApplication>
-#include <QMessageBox>
 #include <QJsonDocument>
 #include <QJsonObject>
+#include <QLoggingCategory>
+#include <QMessageBox>
 #include <QPushButton>
+#include <QSaveFile>
+#include <QTemporaryDir>
 
 namespace
 {
@@ -300,7 +302,7 @@ bool ItemLibraryAssetImporter::preParseQuick3DAsset(const QString &file, ParseDa
             if (exitVal == QDialog::Accepted)
                 overwriteFiles = dlg.selectedFiles();
             if (!overwriteFiles.isEmpty()) {
-                overwriteFiles.append(QStringList::fromSet(alwaysOverwrite));
+                overwriteFiles.append(Utils::toList(alwaysOverwrite));
                 m_overwrittenImports.insert(pd.targetDirPath, overwriteFiles);
             } else {
                 addWarning(tr("No files selected for overwrite, skipping import: \"%1\"").arg(pd.assetName));