From 91bff8f86a5aadd4b8524579a5fa986334c02bb1 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 4 Feb 2020 16:05:16 +0100 Subject: Fix build with latest qtdeclarative Commit 789929f939a60462373beae37ab4373809095cff in qtdeclarative introduced QTypeRevision and changed internal API that's used here. Change-Id: I994084a26ac15a1795fd5d5add46113e3571402f Reviewed-by: Fabian Kosmale Reviewed-by: Ulf Hermann Reviewed-by: Mitch Curtis --- src/quickcontrols2/qquickstyle.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index 7a3359ef..1f6a28fd 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -548,7 +548,7 @@ QString QQuickStyle::path() */ void QQuickStyle::setStyle(const QString &style) { - if (QQmlMetaType::isModule(QStringLiteral("QtQuick.Controls"), 2, 0)) { + if (QQmlMetaType::isModule(QStringLiteral("QtQuick.Controls"), QTypeRevision::fromVersion(2, 0))) { qWarning() << "ERROR: QQuickStyle::setStyle() must be called before loading QML that imports Qt Quick Controls 2."; return; } @@ -572,7 +572,7 @@ void QQuickStyle::setStyle(const QString &style) */ void QQuickStyle::setFallbackStyle(const QString &style) { - if (QQmlMetaType::isModule(QStringLiteral("QtQuick.Controls"), 2, 0)) { + if (QQmlMetaType::isModule(QStringLiteral("QtQuick.Controls"), QTypeRevision::fromVersion(2, 0))) { qWarning() << "ERROR: QQuickStyle::setFallbackStyle() must be called before loading QML that imports Qt Quick Controls 2."; return; } -- cgit v1.2.3