diff options
Diffstat (limited to 'src/corelib/tools/qdatetime.cpp')
| -rw-r--r-- | src/corelib/tools/qdatetime.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/tools/qdatetime.cpp b/src/corelib/tools/qdatetime.cpp index 050f37dcd2..df5e4e44e4 100644 --- a/src/corelib/tools/qdatetime.cpp +++ b/src/corelib/tools/qdatetime.cpp @@ -1272,7 +1272,7 @@ QDate QDate::fromString(const QString& string, Qt::DateFormat format) } /*! - \fn QDate::fromString(const QString &string, const QString &format) + \fn QDate QDate::fromString(const QString &string, const QString &format) Returns the QDate represented by the \a string, using the \a format given, or an invalid date if the string cannot be parsed. @@ -2000,7 +2000,7 @@ QTime QTime::fromString(const QString& string, Qt::DateFormat format) } /*! - \fn QTime::fromString(const QString &string, const QString &format) + \fn QTime QTime::fromString(const QString &string, const QString &format) Returns the QTime represented by the \a string, using the \a format given, or an invalid time if the string cannot be parsed. @@ -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 @@ -4944,7 +4944,7 @@ QDateTime QDateTime::fromString(const QString& string, Qt::DateFormat format) } /*! - \fn QDateTime::fromString(const QString &string, const QString &format) + \fn QDateTime QDateTime::fromString(const QString &string, const QString &format) Returns the QDateTime represented by the \a string, using the \a format given, or an invalid datetime if the string cannot be parsed. |