From 3a9b2fc482a95416bb5173720cc000cf99851823 Mon Sep 17 00:00:00 2001 From: Denis Dzyubenko Date: Wed, 23 Mar 2011 11:32:21 +0100 Subject: Revert "Added short time format support on Windows." This reverts commit 96e3f2358ffdeb12c141e8139cdfbc8b24a14700. Conflicts: src/corelib/tools/qlocale_win.cpp --- src/corelib/tools/qlocale_win.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/corelib/tools/qlocale_win.cpp b/src/corelib/tools/qlocale_win.cpp index b1b1962..c892e04 100644 --- a/src/corelib/tools/qlocale_win.cpp +++ b/src/corelib/tools/qlocale_win.cpp @@ -336,7 +336,7 @@ QVariant QSystemLocalePrivate::toString(const QDate &date, QLocale::FormatType t return QString(); } -QVariant QSystemLocalePrivate::toString(const QTime &time, QLocale::FormatType type) +QVariant QSystemLocalePrivate::toString(const QTime &time, QLocale::FormatType) { SYSTEMTIME st; memset(&st, 0, sizeof(SYSTEMTIME)); @@ -346,8 +346,6 @@ QVariant QSystemLocalePrivate::toString(const QTime &time, QLocale::FormatType t st.wMilliseconds = 0; DWORD flags = 0; - if (type != QLocale::LongFormat && QSysInfo::windowsVersion() >= QSysInfo::WV_WINDOWS7) - flags = 2; // TIME_NOSECONDS wchar_t buf[255]; if (GetTimeFormat(lcid, flags, &st, NULL, buf, 255)) { -- cgit v0.12