diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-18 05:32:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-18 05:32:06 (GMT) |
| commit | a01bd14b63a784d1924133aeb965435e48a93461 (patch) | |
| tree | 28803ff6442c9ebb522b3ef67762e8e2d8ddb863 /src/corelib/tools | |
| parent | e1d8cf0b1cb07f7c4e70017322f2f548ae216e78 (diff) | |
| parent | c47d1793580ed467c1d0cdfa59253eff5a2413bd (diff) | |
| download | Qt-a01bd14b63a784d1924133aeb965435e48a93461.zip Qt-a01bd14b63a784d1924133aeb965435e48a93461.tar.gz Qt-a01bd14b63a784d1924133aeb965435e48a93461.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed crash when destroying QGLWidget
Prevent crash in GL 2 engine when stroking null rectangle.
Compile fix.
Documentation update for new switching events.
Send QMeeGoSwitchEvent to toplevel widgets before switching graphics system.
Doc: Fixing typo
Fix possible missing glyphs in text when using GL engine
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index d4a1248..92b54a0 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -3572,7 +3572,7 @@ static QByteArray toLatin1_helper(const QChar *data, int length) } length = length % 16; } -#elif QT_ALWAYS_HAVE_NEON +#elif defined(QT_ALWAYS_HAVE_NEON) // Refer to the documentation of the SSE2 implementation // this use eactly the same method as for SSE except: // 1) neon has unsigned comparison |