diff options
| author | Paul Olav Tvete <paul.tvete@qt.io> | 2017-03-16 10:25:45 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-03-20 15:51:56 +0000 |
| commit | 086e0b70ac69987441481055a935c31fe89d03f4 (patch) | |
| tree | f9f8932d5cedd5e0155cad9b32a1e585475c5e9b | |
| parent | 03560060a1702af5190b60fec74f9e71b3c2e104 (diff) | |
Build fix for -no-feature-timezone
Use the QDateTime constructor that takes an offset from UTC
instead of creating a timezone that has the same offset.
Change-Id: Iceb1bf598263e7d81786fbf847012993d07e08ba
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| -rw-r--r-- | src/gsttools/qgstutils.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/gsttools/qgstutils.cpp b/src/gsttools/qgstutils.cpp index cb6048818..96bd09f86 100644 --- a/src/gsttools/qgstutils.cpp +++ b/src/gsttools/qgstutils.cpp @@ -41,7 +41,6 @@ #include "qgstutils_p.h" #include <QtCore/qdatetime.h> -#include <QtCore/qtimezone.h> #include <QtCore/qdir.h> #include <QtCore/qbytearray.h> #include <QtCore/qvariant.h> @@ -136,7 +135,9 @@ static void addTagToMap(const GstTagList *list, int minute = gst_date_time_get_minute(dateTime); int second = gst_date_time_get_second(dateTime); float tz = gst_date_time_get_time_zone_offset(dateTime); - map->insert(QByteArray(tag), QDateTime(QDate(year,month,day), QTime(hour, minute, second), QTimeZone(tz * 60 * 60))); + QDateTime dateTime(QDate(year, month, day), QTime(hour, minute, second), + Qt::OffsetFromUTC, tz * 60 * 60); + map->insert(QByteArray(tag), dateTime); } else if (year > 0 && month > 0 && day > 0) { map->insert(QByteArray(tag), QDate(year,month,day)); } |