From 5f421ccac8c37c7ef20d0eb2d1a7d06bbe574088 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 26 Mar 2026 16:27:31 +0100 Subject: {libqmenumodel/src,tests/client}: Fix warnings with Qt6 --- libqmenumodel/src/qstateaction.cpp | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) (limited to 'libqmenumodel/src/qstateaction.cpp') 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); } -- cgit v1.2.3