diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2026-06-11 21:04:06 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2026-06-11 21:04:06 +0200 |
| commit | d20734dcb6fcc6c5204dcd0b2154c8dea5457e05 (patch) | |
| tree | de2e2e3c72d2e3a0919b3bfba65a51d39b1b86c4 /libqmenumodel/src/qstateaction.cpp | |
| parent | f33cda5c57dab104163fe6884e2e15f3bac79c07 (diff) | |
| parent | 5f421ccac8c37c7ef20d0eb2d1a7d06bbe574088 (diff) | |
| download | qmenumodel-d20734dcb6fcc6c5204dcd0b2154c8dea5457e05.tar.gz qmenumodel-d20734dcb6fcc6c5204dcd0b2154c8dea5457e05.tar.bz2 qmenumodel-d20734dcb6fcc6c5204dcd0b2154c8dea5457e05.zip | |
Merge branch 'OPNA2608-port-qt6'
Attributes GH PR #29: https://github.com/AyatanaIndicators/qmenumodel/pull/29
Diffstat (limited to 'libqmenumodel/src/qstateaction.cpp')
| -rw-r--r-- | libqmenumodel/src/qstateaction.cpp | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/libqmenumodel/src/qstateaction.cpp b/libqmenumodel/src/qstateaction.cpp index e9736e8..c538ba4 100644 --- a/libqmenumodel/src/qstateaction.cpp +++ b/libqmenumodel/src/qstateaction.cpp @@ -95,7 +95,13 @@ bool QStateAction::isValid() const void QStateAction::updateState(const QVariant &state) { QVariant v = state; - if (v.convert(m_state.type())) + if (v.convert( +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + m_state.metaType() +#else + m_state.type() +#endif + )) m_group->updateActionState(m_name, v); } @@ -146,7 +152,13 @@ void QStateAction::setValid(bool valid) void QStateAction::setState(const QVariant &state) { QVariant v = state; - if (!m_state.isValid() || (v.convert(m_state.type()) && v != m_state)) { + if (!m_state.isValid() || (v.convert( +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + m_state.metaType() +#else + m_state.type() +#endif + ) && v != m_state)) { m_state = v; Q_EMIT stateChanged(m_state); } |