aboutsummaryrefslogtreecommitdiff
path: root/libqmenumodel/src/qstateaction.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'libqmenumodel/src/qstateaction.cpp')
-rw-r--r--libqmenumodel/src/qstateaction.cpp16
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);
}