diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-09-27 11:08:55 +0200 |
| commit | d0fcaa7eaaae85ddbf0a78efa59b341380c101a4 (patch) | |
| tree | 9b3422ae33ef9dfcda0af228c56c3d2eeed7b0c3 /src/corelib/tools/qlocale.h | |
| parent | f6ce2d42b3cbe049ebcf1a2349a5cd4dde2c6d24 (diff) | |
| parent | 5e64957ee4162ecf4456306a530a68761c2b127f (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/corelib/global/qconfig-bootstrapped.h
src/widgets/util/qcompleter.cpp
Change-Id: I4f44f0f074982530f2f2e750ce696230b2754cf3
Diffstat (limited to 'src/corelib/tools/qlocale.h')
| -rw-r--r-- | src/corelib/tools/qlocale.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index 8e6c5c503b..f3afb8c406 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -1004,7 +1004,7 @@ public: QString dateFormat(FormatType format = LongFormat) const; QString timeFormat(FormatType format = LongFormat) const; QString dateTimeFormat(FormatType format = LongFormat) const; -#ifndef QT_NO_DATESTRING +#if QT_CONFIG(datestring) QDate toDate(const QString &string, FormatType = LongFormat) const; QTime toTime(const QString &string, FormatType = LongFormat) const; QDateTime toDateTime(const QString &string, FormatType format = LongFormat) const; |