From 4a7630085429248f47b3fca1365d928a058a6bad Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Mon, 23 Sep 2013 14:05:54 +0200 Subject: WinRT: Use UtcTimeZone instead of QWinTimeZone backend As registry access isn't possible on WinRT it cannot use QWinTimeZone as backend. Instead it uses QUtcTimeZone. Change-Id: I51c59a187e3da6e957d0b3f6376069d55c9fc2ec Reviewed-by: Andrew Knight Reviewed-by: John Layt --- src/corelib/tools/qtimezone.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/corelib/tools/qtimezone.cpp') diff --git a/src/corelib/tools/qtimezone.cpp b/src/corelib/tools/qtimezone.cpp index cdd0aba102..890798b421 100644 --- a/src/corelib/tools/qtimezone.cpp +++ b/src/corelib/tools/qtimezone.cpp @@ -65,7 +65,8 @@ static QTimeZonePrivate *newBackendTimeZone() return new QMacTimeZonePrivate(); #elif defined Q_OS_UNIX return new QTzTimeZonePrivate(); -#elif defined Q_OS_WIN + // Registry based timezone backend not available on WinRT +#elif defined Q_OS_WIN && !defined Q_OS_WINRT return new QWinTimeZonePrivate(); #elif defined QT_USE_ICU return new QIcuTimeZonePrivate(); @@ -89,7 +90,8 @@ static QTimeZonePrivate *newBackendTimeZone(const QByteArray &olsenId) return new QMacTimeZonePrivate(olsenId); #elif defined Q_OS_UNIX return new QTzTimeZonePrivate(olsenId); -#elif defined Q_OS_WIN + // Registry based timezone backend not available on WinRT +#elif defined Q_OS_WIN && !defined Q_OS_WINRT return new QWinTimeZonePrivate(olsenId); #elif defined QT_USE_ICU return new QIcuTimeZonePrivate(olsenId); -- cgit v1.2.3