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

QmlDesigner: Fix the build error for CollectionEditor

Browse Source 
* fixes the gcc build error on CollectionEditorUtils
* fixes the unused parameters error on macOS
* fixes the build error for using the unknown template for QPointer

Change-Id: I71f6fe319b5b682b858712139084d26079a822fb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
This commit is contained in:
Ali Kianian
2023-10-30 08:54:53 +02:00
parent cfa46fa974
commit 7d6cb2b400
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.cpp
View File

@@ -64,8 +64,8 @@ bool CollectionDetailsSortFilterModel::selectColumn(int column)
CollectionDetailsSortFilterModel::~CollectionDetailsSortFilterModel() = default; CollectionDetailsSortFilterModel::~CollectionDetailsSortFilterModel() = default;
bool CollectionDetailsSortFilterModel::filterAcceptsRow(int sourceRow, bool CollectionDetailsSortFilterModel::filterAcceptsRow(
const QModelIndex &sourceParent) const [[maybe_unused]] int sourceRow, [[maybe_unused]] const QModelIndex &sourceParent) const
{ {
return true; return true;
} }

1
src/plugins/qmldesigner/components/collectioneditor/collectiondetailssortfiltermodel.h
View File

@@ -3,6 +3,7 @@
#pragma once #pragma once
#include <QPointer>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
namespace QmlDesigner { namespace QmlDesigner {

11
src/plugins/qmldesigner/components/collectioneditor/collectioneditorutils.cpp
View File

@@ -12,6 +12,11 @@ namespace {
using CollectionDataVariant = std::variant<QString, bool, double, QUrl, QColor>; using CollectionDataVariant = std::variant<QString, bool, double, QUrl, QColor>;
inline bool operator<(const QColor &a, const QColor &b)
{
return a.name(QColor::HexArgb) < b.name(QColor::HexArgb);
}
inline CollectionDataVariant valueToVariant(const QVariant &value, inline CollectionDataVariant valueToVariant(const QVariant &value,
QmlDesigner::CollectionDetails::DataType type) QmlDesigner::CollectionDetails::DataType type)
{ {
@@ -45,12 +50,6 @@ struct LessThanVisitor
{ {
return a < b; return a < b;
} }
template<>
bool operator()(const QColor &a, const QColor &b) const
{
return a.name(QColor::HexArgb) < b.name(QColor::HexArgb);
}
}; };
} // namespace } // namespace