diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-04 14:33:06 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-01-08 04:52:43 +0000 |
| commit | b096c53d593a313a6372bffb35f45cdc0e1ffd21 (patch) | |
| tree | 31b9eb39439c6fb0055c167b1105489728ae6bbf /src/corelib/tools/qdatetime.cpp | |
| parent | 78f234d5dd7face13dd88fd777fa27497590b34d (diff) | |
QtCore: Raise minimum supported MSVC version to 2015
Remove code for older versions and streamline #ifdefs.
Task-number: QTBUG-51673
Change-Id: I211703189ff12f827d94914093369736b6e65d4a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 050f37dcd2..fccf1c4afa 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -2216,7 +2216,7 @@ static int qt_timezone() static QString qt_tzname(QDateTimePrivate::DaylightStatus daylightStatus) { int isDst = (daylightStatus == QDateTimePrivate::DaylightTime) ? 1 : 0; -#if defined(_MSC_VER) && _MSC_VER >= 1400 +#if defined(Q_CC_MSVC) size_t s = 0; char name[512]; if (_get_tzname(&s, name, 512, isDst)) @@ -2346,7 +2346,7 @@ static bool qt_localtime(qint64 msecsSinceEpoch, QDate *localDate, QTime *localT res = localtime_r(&secsSinceEpoch, &local); if (res) valid = true; -#elif defined(_MSC_VER) && _MSC_VER >= 1400 +#elif defined(Q_CC_MSVC) if (!_localtime64_s(&local, &secsSinceEpoch)) valid = true; #else |