diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-07-17 10:21:54 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-07-17 10:21:54 +1000 |
| commit | 987aec28b950e1c9817a20a9dd71afc071cd93ea (patch) | |
| tree | e3ae207dc5793947325a1deaebab76c3de959192 /src/corelib/global/qglobal.cpp | |
| parent | 5344f4cb267e35cd112aea6f445f1046a5ac0a9c (diff) | |
| parent | e1c019fd7ecaa59eee39f23434dd63d5656f4ee0 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/global/qglobal.cpp')
| -rw-r--r-- | src/corelib/global/qglobal.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp index ad4868d22..f7d651409 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1668,7 +1668,7 @@ QSysInfo::WinVersion QSysInfo::windowsVersion() winver = QSysInfo::WV_WINDOWS7; } else { qWarning("Qt: Untested Windows version %d.%d detected!", - osver.dwMajorVersion, osver.dwMinorVersion); + int(osver.dwMajorVersion), int(osver.dwMinorVersion)); winver = QSysInfo::WV_NT_based; } } |