diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-06-06 09:49:07 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-06-06 17:39:08 +0000 |
| commit | 96b6ebbfbcca25fe2bf0114cd24973cdd0e39fd1 (patch) | |
| tree | fd03474fc1341436cbf8ba79e8ec277b8146e06e | |
| parent | 30fb3d463bfcdc4536445909aeda7452c44e5bee (diff) | |
Revert "Qt Designer: Replace a QHash<QObject *,bool> by QSet<QObject *>"
This reverts commit c3feee64550c42aacd4b39bc180c34b63f010fc2.
It causes a BIC break since the destructor is inline.
Change-Id: Id51ad5c16b3ff9267df186cafd6c4bdba9031904
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
(cherry picked from commit 6e450cc0a6763a1dae632b893a59a0841d09e82e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/designer/src/lib/extension/default_extensionfactory.cpp | 2 | ||||
| -rw-r--r-- | src/designer/src/lib/extension/default_extensionfactory.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/designer/src/lib/extension/default_extensionfactory.cpp b/src/designer/src/lib/extension/default_extensionfactory.cpp index 3695c1987..fd647c5a6 100644 --- a/src/designer/src/lib/extension/default_extensionfactory.cpp +++ b/src/designer/src/lib/extension/default_extensionfactory.cpp @@ -89,7 +89,7 @@ QObject *QExtensionFactory::extension(QObject *object, const QString &iid) const if (!m_extended.contains(object)) { connect(object, &QObject::destroyed, this, &QExtensionFactory::objectDestroyed); - m_extended.insert(object); + m_extended.insert(object, true); } if (it == m_extensions.end()) diff --git a/src/designer/src/lib/extension/default_extensionfactory.h b/src/designer/src/lib/extension/default_extensionfactory.h index eb9e3dc62..795d55d7a 100644 --- a/src/designer/src/lib/extension/default_extensionfactory.h +++ b/src/designer/src/lib/extension/default_extensionfactory.h @@ -10,7 +10,6 @@ #include <QtCore/qmap.h> #include <QtCore/qhash.h> #include <QtCore/qpair.h> -#include <QtCore/qset.h> QT_BEGIN_NAMESPACE @@ -34,7 +33,8 @@ protected: private: mutable QMap<QPair<QString, QObject *>, QObject *> m_extensions; - mutable QSet<QObject *> m_extended; + // ### FIXME Qt 7: Use QSet, add out of line destructor. + mutable QHash<QObject*, bool> m_extended; }; QT_END_NAMESPACE |