diff options
author | Oliver Wolff <oliver.wolff@digia.com> | 2013-09-23 14:05:54 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 17:27:11 +0200 |
commit | 4a7630085429248f47b3fca1365d928a058a6bad (patch) | |
tree | eb110023f69346b705dc8773feaac70548222919 /src/corelib/tools/tools.pri | |
parent | bb4869a0c53a7e4aeda12f80be834cf18811d3f6 (diff) |
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 <andrew.knight@digia.com>
Reviewed-by: John Layt <jlayt@kde.org>
Diffstat (limited to 'src/corelib/tools/tools.pri')
-rw-r--r-- | src/corelib/tools/tools.pri | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index e043a4cd15..a645961236 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -124,8 +124,10 @@ else:blackberry { HEADERS += tools/qlocale_blackberry.h } else:unix:SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp tools/qtimezoneprivate_tz.cpp -else:win32:SOURCES += tools/qelapsedtimer_win.cpp tools/qlocale_win.cpp tools/qtimezoneprivate_win.cpp -else:integrity:SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp +else:win32 { + SOURCES += tools/qelapsedtimer_win.cpp tools/qlocale_win.cpp + !winrt: SOURCES += tools/qtimezoneprivate_win.cpp +} else:integrity:SOURCES += tools/qelapsedtimer_unix.cpp tools/qlocale_unix.cpp else:SOURCES += tools/qelapsedtimer_generic.cpp contains(QT_CONFIG, zlib) { |