diff options
Diffstat (limited to 'src/corelib')
-rw-r--r-- | src/corelib/global/qnamespace.qdoc | 1 | ||||
-rw-r--r-- | src/corelib/io/qsettings.h | 2 | ||||
-rw-r--r-- | src/corelib/tools/qlocale.cpp | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 2828002183..2614a0bfd9 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -1338,6 +1338,7 @@ \omitvalue WA_WState_WindowOpacitySet \omitvalue WA_WState_AcceptedTouchBeginEvent \omitvalue WA_MacNoShadow + \omitvalue WA_ContentsMarginsRespectsSafeArea */ /*! \typedef Qt::HANDLE diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index f34e6bea1b..d78edd23a2 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -88,7 +88,7 @@ public: NativeFormat, IniFormat, -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) Registry32Format, Registry64Format, #endif diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 6ae5a4162a..f7a6f35183 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -3807,6 +3807,12 @@ QString QLocale::toCurrencyString(double value, const QString &symbol, int preci } /*! + \fn QString QLocale::toCurrencyString(float i, const QString &symbol) const + \fn QString QLocale::toCurrencyString(float i, const QString &symbol, int precision) const + \overload toCurrencyString() +*/ + +/*! \since 5.10 \enum QLocale::DataSizeFormat |