1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remains of Windows CE from QSysInfo.

Browse Source 
Remove documentation of enumeration values and code from manual test.

Change-Id: I8e6cbbe11ab38421fb29595ae79351f5a919ff70
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
This commit is contained in:
Friedemann Kleint 2016-04-20 10:45:40 +02:00 committed by Friedemann Kleint
parent cedc554321
commit b4d2ae0676
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/global/qglobal.cpp
View File

@ -1164,19 +1164,11 @@ bool qSharedBuild() Q_DECL_NOTHROW
\value WV_6_3 Operating system version 6.3, corresponds to Windows 8.1, introduced in Qt 5.2
\value WV_10_0 Operating system version 10.0, corresponds to Windows 10, introduced in Qt 5.5
CE-based versions:
\value WV_CE Windows CE
\value WV_CENET Windows CE .NET
\value WV_CE_5 Windows CE 5.x
\value WV_CE_6 Windows CE 6.x
The following masks can be used for testing whether a Windows
version is MS-DOS-based, NT-based, or CE-based:
\value WV_DOS_based MS-DOS-based version of Windows
\value WV_NT_based NT-based version of Windows
\value WV_CE_based CE-based version of Windows
\value WV_None Operating system other than Windows.

7
tests/manual/qsysinfo/main.cpp
View File

@ -57,13 +57,6 @@ QByteArray windowsVersionToString(QSysInfo::WinVersion v)
CASE_VERSION(WV_WINDOWS10);
case QSysInfo::WV_NT_based: // shouldn't happen
break;
CASE_VERSION(WV_CE);
CASE_VERSION(WV_CENET);
CASE_VERSION(WV_CE_5);
CASE_VERSION(WV_CE_6);
case QSysInfo::WV_CE_based: // shouldn't happen
break;
}
return "WinVersion(0x" + QByteArray::number(v, 16) + ')';