diff options
| author | Yuhang Zhao <2546789017@qq.com> | 2023-03-12 10:27:52 +0800 |
|---|---|---|
| committer | Yuhang Zhao <2546789017@qq.com> | 2023-03-16 19:16:32 +0800 |
| commit | e70706de7defb8d0e069020f109f0689215548bd (patch) | |
| tree | 6eaf0078e9de7cc58e40162ce7b88a3fcae72a86 /src/qml/qml/qqmllocale_p.h | |
| parent | 2da7c0441a856c2ff3bdec7fbd33aaf119e64b56 (diff) | |
qmllocale: fix build when deprecated APIs are disabled
Guard the callers of the deprecated APIs with proper macros,
otherwise they will case compilation errors when deprecated APIs
from qtbase are disabled.
Pick-to: 6.5 6.4
Change-Id: Ie25e7424aaccf7175c839ecddbd326a7a5649709
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/qml/qqmllocale_p.h')
| -rw-r--r-- | src/qml/qml/qqmllocale_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 7a497db523..ff8eb65292 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -128,7 +128,9 @@ struct QQmlLocaleData : public QV4::Object static QV4::ReturnedValue method_get_name(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); static QV4::ReturnedValue method_get_nativeLanguageName(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); +#if QT_DEPRECATED_SINCE(6, 6) static QV4::ReturnedValue method_get_nativeCountryName(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); +#endif static QV4::ReturnedValue method_get_nativeTerritoryName(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); static QV4::ReturnedValue method_get_decimalPoint(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); static QV4::ReturnedValue method_get_groupSeparator(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); |