diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-03-01 11:30:25 (GMT) |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-03-01 11:39:44 (GMT) |
| commit | fc2fab3e08ea577d12166d318863c453e093c2f1 (patch) | |
| tree | a93cd1a9acc5ba6677aa3cd13e647a525ffc9022 | |
| parent | 901bee3cbad3fcf52465d72cd257b4dd87e5b049 (diff) | |
| download | Qt-fc2fab3e08ea577d12166d318863c453e093c2f1.zip Qt-fc2fab3e08ea577d12166d318863c453e093c2f1.tar.gz Qt-fc2fab3e08ea577d12166d318863c453e093c2f1.tar.bz2 | |
fix qt_wince_is_windows_mobile_65()
This function checked the wrong OS build number.
The first Windows mobile 6.5 build is supposed to have build number
21139.
Task-number: QTBUG-8418
Reviewed-by: thartman
| -rw-r--r-- | src/gui/kernel/qguifunctions_wince.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/gui/kernel/qguifunctions_wince.cpp b/src/gui/kernel/qguifunctions_wince.cpp index ac4cdc8..f5004b0 100644 --- a/src/gui/kernel/qguifunctions_wince.cpp +++ b/src/gui/kernel/qguifunctions_wince.cpp @@ -278,7 +278,14 @@ int qt_wince_get_version() bool qt_wince_is_windows_mobile_65() { - return ((qt_wince_get_version() == 52) && (qt_wince_get_build() > 2000)); + const DWORD dwFirstWM65BuildNumber = 21139; + OSVERSIONINFO osvi; + osvi.dwOSVersionInfoSize = sizeof(osvi); + if (!GetVersionEx(&osvi)) + return false; + return osvi.dwMajorVersion > 5 + || (osvi.dwMajorVersion == 5 && (osvi.dwMinorVersion > 2 || + (osvi.dwMinorVersion == 2 && osvi.dwBuildNumber >= dwFirstWM65BuildNumber))); } bool qt_wince_is_pocket_pc() { |