diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 20:20:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-21 20:20:56 (GMT) |
| commit | acbfa8717b07c2d5b85c62bcf70da3ef4983addb (patch) | |
| tree | 69c461d065f87e7ffb956e6f9ce16e54af5b4dda /src/corelib | |
| parent | d3f6ef8177f53968b22ba3585eef3ca2c3d5be1d (diff) | |
| parent | ce61e3c3c6ff7f00d9b756c99e8fc031a69e68db (diff) | |
| download | Qt-acbfa8717b07c2d5b85c62bcf70da3ef4983addb.zip Qt-acbfa8717b07c2d5b85c62bcf70da3ef4983addb.tar.gz Qt-acbfa8717b07c2d5b85c62bcf70da3ef4983addb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform.
Remove incorrect check in qpixmap autotest.
Diffstat (limited to 'src/corelib')
| -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 62d83cc..25ddd24 100644 --- a/src/corelib/global/qglobal.cpp +++ b/src/corelib/global/qglobal.cpp @@ -1862,7 +1862,7 @@ QSysInfo::SymbianVersion QSysInfo::symbianVersion() else if (minor == 1) { return cachedSymbianVersion = SV_SF_2; } - else if (minor == 2) { + else if (minor >= 2) { return cachedSymbianVersion = SV_SF_3; } } |