diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-10 08:16:20 +0200 |
| commit | a20da2353cc308aab15e3efa05ab7d899e9c6ca7 (patch) | |
| tree | 63881eb44f19384ebfb0e0443291b8f9ab82f149 /src/corelib/tools/qdatetime_p.h | |
| parent | 95f787bfdc890c259e8b347bdad9123d534efe0f (diff) | |
| parent | eaf20420f8a4d72c804a9d3725c3e294b34c78c8 (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
mkspecs/win32-clang-msvc/qmake.conf
src/gui/image/qpnghandler.cpp
Change-Id: Ied79d02912ffb3a307a99483df7db08c7f9d0cd8
Diffstat (limited to 'src/corelib/tools/qdatetime_p.h')
| -rw-r--r-- | src/corelib/tools/qdatetime_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/corelib/tools/qdatetime_p.h b/src/corelib/tools/qdatetime_p.h index 6e4120d762..6018f8f7b0 100644 --- a/src/corelib/tools/qdatetime_p.h +++ b/src/corelib/tools/qdatetime_p.h @@ -140,6 +140,10 @@ public: // Inlined for its one caller in qdatetime.cpp inline void setUtcOffsetByTZ(qint64 atMSecsSinceEpoch); #endif // timezone + + // ### Qt 5.14: expose publicly in QDateTime + // The first and last years of which QDateTime can represent some part: + enum class YearRange : qint32 { First = -292275056, Last = +292278994 }; }; QT_END_NAMESPACE |