feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix build with Qt 6

Browse Source 
Change-Id: I67ffc389d7579ac98755ec99614ce9b3e4e07df5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Eike Ziller
2021-02-25 13:29:24 +01:00
parent 91241d86de
commit dce690ab73
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/sqlite/utf8string.h
View File

@@ -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();

2
src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimportdialog.cpp
View File

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

14
src/plugins/qmldesigner/components/itemlibrary/itemlibraryassetimporter.cpp
View File

@@ -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));