From 60e8714e58369fd786707847575ba842f08530f1 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 14 Sep 2016 08:26:50 +0200 Subject: Bring back QSysInfo enumeration values for Windows CE Partially revert 7fc2864dc5391096a19c2d5f80695129c24cc303. Entries should be kept until Qt 6 for source compatibility. Task-number: QTBUG-55973 Change-Id: I09346fcd9227224f878f5ee064152e85f075ae09 Reviewed-by: Maurice Kalinowski Reviewed-by: Thiago Macieira --- src/corelib/global/qglobal.cpp | 6 ++++++ src/corelib/global/qsysinfo.h | 8 +++++++- 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'src/corelib') diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index 5687920c9b..a9a583d808 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1172,6 +1172,12 @@ bool qSharedBuild() Q_DECL_NOTHROW \value WV_None Operating system other than Windows. + \omitvalue WV_CE + \omitvalue WV_CENET + \omitvalue WV_CE_5 + \omitvalue WV_CE_6 + \omitvalue WV_CE_based + \sa MacVersion */ diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index f01b45cbf9..23f412aa6a 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -109,7 +109,13 @@ public: WV_6_1 = WV_WINDOWS7, WV_6_2 = WV_WINDOWS8, WV_6_3 = WV_WINDOWS8_1, - WV_10_0 = WV_WINDOWS10 + WV_10_0 = WV_WINDOWS10, + + WV_CE = 0x0100, + WV_CENET = 0x0200, + WV_CE_5 = 0x0300, + WV_CE_6 = 0x0400, + WV_CE_based = 0x0f00 }; #if defined(Q_OS_WIN) || defined(Q_OS_CYGWIN) static const WinVersion WindowsVersion; -- cgit v1.2.3