diff options
| author | Mitch Curtis <mitch.curtis@qt.io> | 2021-02-23 12:01:32 +0100 |
|---|---|---|
| committer | Mitch Curtis <mitch.curtis@qt.io> | 2021-03-13 20:03:49 +0100 |
| commit | d61ececdb8a53c88885e11f5f6f993fcb98f3dab (patch) | |
| tree | d8f73b06554ddf42ad0b4b9377a520c3b80e0203 /src/qml/qml/qqmllocale_p.h | |
| parent | acf3a16800d4aa451ef8540d58de710c99d43d2c (diff) | |
Expose formattedDataSize() in QML Locale type
This was added to qtbase in 9d23aeb.
Qt Quick Dialogs needs it to display file sizes in FileDialog.
[ChangeLog][QML][Locale] Added formattedDataSize() for formatting
quantities of bytes as kB, MB, GB etc.
Fixes: QTBUG-91283
Change-Id: I8ea64f961c04d4900d18fa45398670df89882c56
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 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/qml/qml/qqmllocale_p.h b/src/qml/qml/qqmllocale_p.h index 73eae259fb..475bc639cf 100644 --- a/src/qml/qml/qqmllocale_p.h +++ b/src/qml/qml/qqmllocale_p.h @@ -139,6 +139,15 @@ namespace QQmlLocale }; Q_ENUM_NS(NumberOptions) + enum DataSizeFormat { + DataSizeBase1000 = QLocale::DataSizeBase1000, + DataSizeSIQuantifiers = QLocale::DataSizeSIQuantifiers, + DataSizeIecFormat = QLocale::DataSizeIecFormat, + DataSizeTraditionalFormat = QLocale::DataSizeTraditionalFormat, + DataSizeSIFormat = QLocale::DataSizeSIFormat + }; + Q_ENUM_NS(DataSizeFormat) + Q_QML_PRIVATE_EXPORT QV4::ReturnedValue locale(QV4::ExecutionEngine *engine, const QString &localeName); Q_QML_PRIVATE_EXPORT QV4::ReturnedValue wrap(QV4::ExecutionEngine *engine, const QLocale &locale); Q_QML_PRIVATE_EXPORT void registerStringLocaleCompare(QV4::ExecutionEngine *engine); @@ -205,6 +214,8 @@ struct QQmlLocaleData : public QV4::Object static QV4::ReturnedValue method_get_numberOptions(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); static QV4::ReturnedValue method_set_numberOptions(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); + + static QV4::ReturnedValue method_get_formattedDataSize(const QV4::FunctionObject *, const QV4::Value *thisObject, const QV4::Value *argv, int argc); }; } |