diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 11:48:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-01 11:48:52 (GMT) |
| commit | fe7c8626af168ca29fd74930b9baa16c6dacdc30 (patch) | |
| tree | ecda40603807abb6ec228b753169208888cacc55 | |
| parent | 8bbb28f2d5f6a53f94f23f3ac86f5270143795ab (diff) | |
| parent | fc2fab3e08ea577d12166d318863c453e093c2f1 (diff) | |
| download | Qt-fe7c8626af168ca29fd74930b9baa16c6dacdc30.zip Qt-fe7c8626af168ca29fd74930b9baa16c6dacdc30.tar.gz Qt-fe7c8626af168ca29fd74930b9baa16c6dacdc30.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix qt_wince_is_windows_mobile_65()
| -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() { |