diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-23 15:28:03 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-06-30 17:56:09 +0200 |
| commit | 86e89942e3c8288137a96e2c2fde819c1aac028c (patch) | |
| tree | e91e273b1cc38a3b2efd3d503c82430236f154a0 /src | |
| parent | d9f60a2560143008336439ebc8a9399cd5bda7b4 (diff) | |
Adapt to renaming of QQmlMetaType::isModule()
Change-Id: I2db7915377caec6c80e04979a5813c605ae33e09
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/quickcontrols2/qquickstyle.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/quickcontrols2/qquickstyle.cpp b/src/quickcontrols2/qquickstyle.cpp index e1cf4bfe..6e1f17b1 100644 --- a/src/quickcontrols2/qquickstyle.cpp +++ b/src/quickcontrols2/qquickstyle.cpp @@ -578,7 +578,8 @@ void QQuickStyle::setStyle(const QString &style) { qCDebug(lcQtQuickControlsStyle) << "setStyle called with" << style; - if (QQmlMetaType::isModule(QStringLiteral("QtQuick.Controls"), QTypeRevision::fromVersion(2, 0))) { + if (QQmlMetaType::matchingModuleVersion( + QStringLiteral("QtQuick.Controls"), QTypeRevision::fromVersion(2, 0)).isValid()) { qWarning() << "ERROR: QQuickStyle::setStyle() must be called before loading QML that imports Qt Quick Controls 2."; return; } @@ -602,7 +603,8 @@ void QQuickStyle::setStyle(const QString &style) */ void QQuickStyle::setFallbackStyle(const QString &style) { - if (QQmlMetaType::isModule(QStringLiteral("QtQuick.Controls"), QTypeRevision::fromVersion(2, 0))) { + if (QQmlMetaType::matchingModuleVersion( + QStringLiteral("QtQuick.Controls"), QTypeRevision::fromVersion(2, 0)).isValid()) { qWarning() << "ERROR: QQuickStyle::setFallbackStyle() must be called before loading QML that imports Qt Quick Controls 2."; return; } |