diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 11:45:50 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-07-24 13:10:57 +0200 |
| commit | 9a189a096f134e80e0c11523db14c8580275b4ad (patch) | |
| tree | 154a408d7607a9aa9cf10f66ed552dfbcfe18292 /src/corelib/text/qlocale.h | |
| parent | 999f62531a784b8f0f1f6d3cb7aaaa5455485d17 (diff) | |
Remove non-Qt6 compile time switches from QtCore
We already manage to compile without this code, and none of it are full
classes or separate functions suitable for qt5compat.
Change-Id: I47facac7ec621cfc4b0b26214b7de37897443519
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'src/corelib/text/qlocale.h')
| -rw-r--r-- | src/corelib/text/qlocale.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/src/corelib/text/qlocale.h b/src/corelib/text/qlocale.h index f4a36123b6..b0dab638ac 100644 --- a/src/corelib/text/qlocale.h +++ b/src/corelib/text/qlocale.h @@ -1065,22 +1065,10 @@ public: inline QString toCurrencyString(ushort, const QString &symbol = QString()) const; inline QString toCurrencyString(int, const QString &symbol = QString()) const; inline QString toCurrencyString(uint, const QString &symbol = QString()) const; -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) QString toCurrencyString(double, const QString &symbol = QString(), int precision = -1) const; inline QString toCurrencyString(float i, const QString &symbol = QString(), int precision = -1) const { return toCurrencyString(double(i), symbol, precision); } -#else - QString toCurrencyString(double, const QString &symbol = QString()) const; - QString toCurrencyString(double, const QString &symbol, int precision) const; - inline QString toCurrencyString(float i, const QString &symbol = QString()) const - { return toCurrencyString(double(i), symbol); } - inline QString toCurrencyString(float i, const QString &symbol, int precision) const - { return toCurrencyString(double(i), symbol, precision); } -#endif -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QString formattedDataSize(qint64 bytes, int precision = 2, DataSizeFormats format = DataSizeIecFormat); -#endif QString formattedDataSize(qint64 bytes, int precision = 2, DataSizeFormats format = DataSizeIecFormat) const; QStringList uiLanguages() const; |