diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-01-23 17:11:58 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-01-30 08:23:54 +0000 |
| commit | 9625241fef1bdab0b614dde37cf0bb76a8c0671d (patch) | |
| tree | 70bb2a54a36c2bbf2c0233b2208d897b5f17b858 | |
| parent | b4d8bdc180a8f6c60ceb67acc72d673286d726b4 (diff) | |
| download | qttools-9625241fef1bdab0b614dde37cf0bb76a8c0671d.tar.gz | |
Qt Designer: Remove Q_DECLARE_METATYPE(QtIconMap)
It causes clashes with qmetatype.h's
Q_DECLARE_ASSOCIATIVE_CONTAINER_METATYPE(QMap) in CMake Unity (Jumbo)
builds and is reportedly unnecessary.
See https://lists.qt-project.org/pipermail/development/2022-July/042744.html
Task-number: QTBUG-109394
Change-Id: Ie8fae63cccb87da9152cfc4d1be5cc4068407a34
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 6e1d66c92d0b175945dad73a5ebada1e5aa4ad9b)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/shared/qtpropertybrowser/qtvariantproperty.cpp | 2 | ||||
| -rw-r--r-- | src/shared/qtpropertybrowser/qtvariantproperty.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.cpp b/src/shared/qtpropertybrowser/qtvariantproperty.cpp index 3225ccd4b..08e571cac 100644 --- a/src/shared/qtpropertybrowser/qtvariantproperty.cpp +++ b/src/shared/qtpropertybrowser/qtvariantproperty.cpp @@ -17,6 +17,8 @@ QT_BEGIN_NAMESPACE +using QtIconMap = QMap<int, QIcon>; + class QtEnumPropertyType { }; diff --git a/src/shared/qtpropertybrowser/qtvariantproperty.h b/src/shared/qtpropertybrowser/qtvariantproperty.h index 464184f8c..22682439b 100644 --- a/src/shared/qtpropertybrowser/qtvariantproperty.h +++ b/src/shared/qtpropertybrowser/qtvariantproperty.h @@ -12,8 +12,6 @@ QT_BEGIN_NAMESPACE class QRegularExpression; -typedef QMap<int, QIcon> QtIconMap; - class QtVariantPropertyManager; class QtVariantProperty : public QtProperty @@ -136,6 +134,4 @@ private: QT_END_NAMESPACE -Q_DECLARE_METATYPE(QIcon) -Q_DECLARE_METATYPE(QtIconMap) #endif |