From a1e3001fa4036b80a86828a957aaf05126efa310 Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 18 Sep 2020 10:54:22 +0200 Subject: [PATCH] QmlDesigner: Fix build with Qt6 Task-number: QTCREATORBUG-24098 Change-Id: I3d5c7d821402acc13ccd505550afc66a531b13b5 Reviewed-by: hjk Reviewed-by: Thomas Hartmann Reviewed-by: Miikka Heikkinen --- .../assetexporterplugin/assetexportdialog.cpp | 2 +- .../componentcore/designeractionmanager.cpp | 2 +- .../componentcore/designeractionmanager.h | 2 +- .../components/edit3d/edit3dactions.h | 4 +-- .../components/edit3d/edit3dwidget.cpp | 2 ++ .../anchorindicatorgraphicsitem.cpp | 2 +- .../formeditor/formeditortoolbutton.cpp | 1 + .../itemlibrary/itemlibrarymodel.cpp | 6 ++--- .../gradientpresetcustomlistmodel.cpp | 2 ++ .../richtexteditor/richtexteditor.cpp | 20 +++++++------- .../components/timelineeditor/easingcurve.cpp | 5 ++-- .../timelineeditor/timelinetoolbutton.cpp | 1 + .../instances/capturingconnectionmanager.cpp | 1 + .../metainfo/subcomponentmanager.cpp | 2 +- .../designercore/model/modelmerger.cpp | 2 +- .../designercore/model/propertyparser.cpp | 26 +++++++++---------- .../designercore/model/stylesheetmerger.cpp | 2 +- src/plugins/qmldesigner/designmodewidget.cpp | 9 ++++--- 18 files changed, 51 insertions(+), 40 deletions(-) diff --git a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp index 3fbc85fd559..5c46f76f05a 100644 --- a/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp +++ b/src/plugins/qmldesigner/assetexporterplugin/assetexportdialog.cpp @@ -91,7 +91,7 @@ AssetExportDialog::AssetExportDialog(const Utils::FilePath &exportPath, m_ui->advancedOptions->setSummaryText(tr("Advanced Options")); m_ui->advancedOptions->setWidget(optionsWidget); auto optionsLayout = new QHBoxLayout(optionsWidget); - optionsLayout->setMargin(8); + optionsLayout->setContentsMargins(8, 8, 8, 8); m_exportAssetsCheck = new QCheckBox(tr("Export assets"), this); m_exportAssetsCheck->setChecked(true); optionsLayout->addWidget(m_exportAssetsCheck); diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp index 254d43f4fd1..baa0f6a245d 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.cpp @@ -199,7 +199,7 @@ void DesignerActionManager::registerAddResourceHandler(const AddResourceHandler m_addResourceHandler.append(handler); } -QHash DesignerActionManager::modelNodePreviewHandlers() const +QMultiHash DesignerActionManager::modelNodePreviewHandlers() const { return m_modelNodePreviewImageHandlers; } diff --git a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h index 13d964c866c..b76d2faa6a5 100644 --- a/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h +++ b/src/plugins/qmldesigner/components/componentcore/designeractionmanager.h @@ -124,7 +124,7 @@ public: QList addResourceHandler() const; void registerAddResourceHandler(const AddResourceHandler &handler); - QHash modelNodePreviewHandlers() const; + QMultiHash modelNodePreviewHandlers() const; void registerModelNodePreviewHandler(const ModelNodePreviewImageHandler &handler); bool hasModelNodePreviewHandler(const ModelNode &node) const; ModelNodePreviewImageOperation modelNodePreviewOperation(const ModelNode &node) const; diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dactions.h b/src/plugins/qmldesigner/components/edit3d/edit3dactions.h index 1973e22491d..80a6ed8c814 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dactions.h +++ b/src/plugins/qmldesigner/components/edit3d/edit3dactions.h @@ -28,8 +28,8 @@ #include -#include -#include +#include +#include namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp index 3d0d3f2f640..f4321e51612 100644 --- a/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp +++ b/src/plugins/qmldesigner/components/edit3d/edit3dwidget.cpp @@ -38,6 +38,8 @@ #include #include #include + +#include #include namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp index 1cfeb02ba1c..88a262d66ed 100644 --- a/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp +++ b/src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp @@ -82,7 +82,7 @@ void AnchorIndicatorGraphicsItem::paint(QPainter *painter, const QStyleOptionGra qreal zoomFactor = 1; if (QGraphicsView* view = scene()->views().at(0)) - zoomFactor = view->matrix().m11(); + zoomFactor = view->transform().m11(); qreal bumpSize = 8 / zoomFactor; QRectF bumpRectangle(0., 0., bumpSize, bumpSize); diff --git a/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp b/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp index a4f2f3bff0c..b65e11c7fa3 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditortoolbutton.cpp @@ -32,6 +32,7 @@ #include #include +#include namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp index a106d7924e3..7f09bc0b493 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarymodel.cpp @@ -50,7 +50,7 @@ static Q_LOGGING_CATEGORY(itemlibraryPopulate, "qtc.itemlibrary.populate", QtWarningMsg) static bool inline registerItemLibrarySortedModel() { - qmlRegisterType(); + qmlRegisterAnonymousType("ItemLibrarySectionModel", 1); return true; } @@ -296,8 +296,8 @@ void ItemLibraryModel::clearSections() void ItemLibraryModel::registerQmlTypes() { - qmlRegisterType(); - qmlRegisterType(); + qmlRegisterAnonymousType("ItemLibrarySectionModel", 1); + qmlRegisterAnonymousType("ItemLibraryModel", 1); } ItemLibrarySection *ItemLibraryModel::sectionByName(const QString §ionName) diff --git a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp index a1599a70996..64008fade55 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp +++ b/src/plugins/qmldesigner/components/propertyeditor/gradientpresetcustomlistmodel.cpp @@ -55,7 +55,9 @@ GradientPresetCustomListModel::GradientPresetCustomListModel(QObject *parent) : GradientPresetListModel(parent) , m_filename(getFilename()) { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) qRegisterMetaTypeStreamOperators("GradientPresetItem"); +#endif readPresets(); } diff --git a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp index eda25ec9b8a..6b0cc398e93 100644 --- a/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp +++ b/src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp @@ -29,17 +29,18 @@ #include -#include #include +#include +#include +#include +#include +#include #include #include -#include -#include #include -#include -#include #include -#include +#include +#include #include @@ -368,7 +369,8 @@ void RichTextEditor::setupHyperlinkActions() QTextCharFormat linkFormat = cursor.charFormat(); if (linkFormat.isAnchor()) { m_linkDialog->setLink(linkFormat.anchorHref()); - m_linkDialog->setAnchor(linkFormat.anchorName()); + m_linkDialog->setAnchor( + linkFormat.anchorNames().isEmpty() ? QString() : linkFormat.anchorNames().first()); } else { m_linkDialog->setLink("http://"); @@ -475,7 +477,7 @@ void RichTextEditor::setupFontActions() if (!w) return; w->setCurrentIndex(w->findText(ui->textEdit->currentCharFormat().font().family())); - connect(w, QOverload::of(&QComboBox::activated), [this](const QString &f) { + connect(w, &QComboBox::textActivated, [this](const QString &f) { QTextCharFormat fmt; fmt.setFontFamily(f); mergeFormatOnWordOrSelection(fmt); @@ -495,7 +497,7 @@ void RichTextEditor::setupFontActions() foreach (int size, standardSizes) w->addItem(QString::number(size)); w->setCurrentText(QString::number(ui->textEdit->currentCharFormat().font().pointSize())); - connect(w, QOverload::of(&QComboBox::activated), [this](const QString &p) { + connect(w, &QComboBox::textActivated, [this](const QString &p) { qreal pointSize = p.toDouble(); if (pointSize > 0.0) { QTextCharFormat fmt; diff --git a/src/plugins/qmldesigner/components/timelineeditor/easingcurve.cpp b/src/plugins/qmldesigner/components/timelineeditor/easingcurve.cpp index b2b9c8dad30..8dbd32e2681 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/easingcurve.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/easingcurve.cpp @@ -67,8 +67,10 @@ void EasingCurve::registerStreamOperators() { qRegisterMetaType("QmlDesigner::EasingCurve"); qRegisterMetaType("QmlDesigner::NamedEasingCurve"); +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) qRegisterMetaTypeStreamOperators("QmlDesigner::EasingCurve"); qRegisterMetaTypeStreamOperators("QmlDesigner::NamedEasingCurve"); +#endif } int EasingCurve::count() const @@ -149,8 +151,7 @@ QString EasingCurve::toString() const bool EasingCurve::fromString(const QString &code) { if (code.startsWith(QLatin1Char('[')) && code.endsWith(QLatin1Char(']'))) { - const QStringRef cleanCode(&code, 1, code.size() - 2); - const auto stringList = cleanCode.split(QLatin1Char(','), Qt::SkipEmptyParts); + const auto stringList = code.mid(1, code.size() - 2).split(QLatin1Char(','), Qt::SkipEmptyParts); if (stringList.count() >= 6 && (stringList.count() % 6 == 0)) { bool checkX, checkY; diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbutton.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbutton.cpp index e6a94541866..8f8b5f0d88a 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbutton.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbutton.cpp @@ -34,6 +34,7 @@ #include #include +#include #include namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp index 589e9b121d1..adf395d874b 100644 --- a/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp +++ b/src/plugins/qmldesigner/designercore/instances/capturingconnectionmanager.cpp @@ -30,6 +30,7 @@ #include #include #include +#include namespace QmlDesigner { diff --git a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp index b4b043847e2..3a550053a09 100644 --- a/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp +++ b/src/plugins/qmldesigner/designercore/metainfo/subcomponentmanager.cpp @@ -503,7 +503,7 @@ void SubComponentManager::update(const QUrl &filePath, const QList &impo } if (!newDir.filePath().isEmpty()) - m_dirToQualifier.insertMulti(newDir.canonicalFilePath(), QString()); + m_dirToQualifier.insert(newDir.canonicalFilePath(), QString()); } // diff --git a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp index 4034faccdeb..7d47d478312 100644 --- a/src/plugins/qmldesigner/designercore/model/modelmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/modelmerger.cpp @@ -90,7 +90,7 @@ static void splitIdInBaseNameAndNumber(const QString &id, QString *baseId, int * int counter = 0; while (counter < id.count()) { bool canConvertToInteger = false; - int newNumber = id.rightRef(counter +1).toInt(&canConvertToInteger); + int newNumber = id.right(counter + 1).toInt(&canConvertToInteger); if (canConvertToInteger) *number = newNumber; else diff --git a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp index b832d21de82..b58b3eb2bdb 100644 --- a/src/plugins/qmldesigner/designercore/model/propertyparser.cpp +++ b/src/plugins/qmldesigner/designercore/model/propertyparser.cpp @@ -89,8 +89,8 @@ QPointF pointFFromString(const QString &s, bool *ok) bool xGood, yGood; int index = s.indexOf(QLatin1Char(',')); - qreal xCoord = s.leftRef(index).toDouble(&xGood); - qreal yCoord = s.midRef(index+1).toDouble(&yGood); + qreal xCoord = s.left(index).toDouble(&xGood); + qreal yCoord = s.mid(index + 1).toDouble(&yGood); if (!xGood || !yGood) { if (ok) *ok = false; @@ -112,12 +112,12 @@ QRectF rectFFromString(const QString &s, bool *ok) bool xGood, yGood, wGood, hGood; int index = s.indexOf(QLatin1Char(',')); - qreal x = s.leftRef(index).toDouble(&xGood); + qreal x = s.left(index).toDouble(&xGood); int index2 = s.indexOf(QLatin1Char(','), index+1); - qreal y = s.midRef(index+1, index2-index-1).toDouble(&yGood); + qreal y = s.mid(index + 1, index2 - index - 1).toDouble(&yGood); index = s.indexOf(QLatin1Char('x'), index2+1); - qreal width = s.midRef(index2+1, index-index2-1).toDouble(&wGood); - qreal height = s.midRef(index+1).toDouble(&hGood); + qreal width = s.mid(index2 + 1, index - index2 - 1).toDouble(&wGood); + qreal height = s.mid(index + 1).toDouble(&hGood); if (!xGood || !yGood || !wGood || !hGood) { if (ok) *ok = false; @@ -139,8 +139,8 @@ QSizeF sizeFFromString(const QString &s, bool *ok) bool wGood, hGood; int index = s.indexOf(QLatin1Char('x')); - qreal width = s.leftRef(index).toDouble(&wGood); - qreal height = s.midRef(index+1).toDouble(&hGood); + qreal width = s.left(index).toDouble(&wGood); + qreal height = s.mid(index + 1).toDouble(&hGood); if (!wGood || !hGood) { if (ok) *ok = false; @@ -162,8 +162,8 @@ QVector2D vector2DFromString(const QString &s, bool *ok) bool xGood, yGood; int index = s.indexOf(QLatin1Char(',')); - qreal xCoord = s.leftRef(index).toDouble(&xGood); - qreal yCoord = s.midRef(index + 1).toDouble(&yGood); + qreal xCoord = s.left(index).toDouble(&xGood); + qreal yCoord = s.mid(index + 1).toDouble(&yGood); if (!xGood || !yGood) { if (ok) *ok = false; @@ -186,9 +186,9 @@ QVector3D vector3DFromString(const QString &s, bool *ok) bool xGood, yGood, zGood; int index = s.indexOf(QLatin1Char(',')); int index2 = s.indexOf(QLatin1Char(','), index+1); - qreal xCoord = s.leftRef(index).toDouble(&xGood); - qreal yCoord = s.midRef(index+1, index2-index-1).toDouble(&yGood); - qreal zCoord = s.midRef(index2+1).toDouble(&zGood); + qreal xCoord = s.left(index).toDouble(&xGood); + qreal yCoord = s.mid(index + 1, index2 - index - 1).toDouble(&yGood); + qreal zCoord = s.mid(index2 + 1).toDouble(&zGood); if (!xGood || !yGood || !zGood) { if (ok) *ok = false; diff --git a/src/plugins/qmldesigner/designercore/model/stylesheetmerger.cpp b/src/plugins/qmldesigner/designercore/model/stylesheetmerger.cpp index 2c724313ea8..38e61469159 100644 --- a/src/plugins/qmldesigner/designercore/model/stylesheetmerger.cpp +++ b/src/plugins/qmldesigner/designercore/model/stylesheetmerger.cpp @@ -83,7 +83,7 @@ static void splitIdInBaseNameAndNumber(const QString &id, QString *baseId, int * int counter = 0; while (counter < id.count()) { bool canConvertToInteger = false; - int newNumber = id.rightRef(counter +1).toInt(&canConvertToInteger); + int newNumber = id.right(counter + 1).toInt(&canConvertToInteger); if (canConvertToInteger) *number = newNumber; else diff --git a/src/plugins/qmldesigner/designmodewidget.cpp b/src/plugins/qmldesigner/designmodewidget.cpp index e57a329239e..84a1e0c487d 100644 --- a/src/plugins/qmldesigner/designmodewidget.cpp +++ b/src/plugins/qmldesigner/designmodewidget.cpp @@ -62,12 +62,13 @@ #include #include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include #include #include