diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-08 12:33:23 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-16 08:36:58 +0200 |
| commit | 0b92a93e8e165520b12cb8ca1d0a8812ed6e046b (patch) | |
| tree | abd70e7ce9477a31578d85d499ba69052d2befc5 /src/qml/qml/v8 | |
| parent | 7dab889190b2289a7c4b48e732d7cb7838dbf297 (diff) | |
Avoid various warnings about deprected QMetaType methods
Change-Id: I8f4b2703fdd08ff341904219cec33c321e0511c7
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/qml/qml/v8')
| -rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index d0f049039b..6dd12d61d5 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -824,7 +824,7 @@ ReturnedValue formatDateTimeObject(const T &formatThis, const QV4::Scope &scope, auto enginePriv = QQmlEnginePrivate::get(scope.engine->qmlEngine()); auto localeMetaTypeId = qMetaTypeId<QLocale>(); QVariant locale = enginePriv->v4engine()->toVariant(argv[1], localeMetaTypeId); - if (!locale.canConvert(localeMetaTypeId)) + if (!locale.canConvert(QMetaType(localeMetaTypeId))) scope.engine->throwError(QLatin1String("%1(): Bad second argument (must be either string, number or locale)").arg(functionName)); formatted = locale.value<QLocale>().toString(formatThis, formatOptions); } |