diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 11:06:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-15 11:06:57 (GMT) |
| commit | ef4803f1d77fca4420b83fd9b0e109672b6473bf (patch) | |
| tree | 9246e0001f1faf3fe76ad612a5e12f60fcb4c776 /src/corelib/tools/qstring.cpp | |
| parent | cde72ad73cf2ee31e701e84763c152685493b7c7 (diff) | |
| parent | e4d429f955a9db248b71c95f59902be01eaed062 (diff) | |
| download | Qt-ef4803f1d77fca4420b83fd9b0e109672b6473bf.zip Qt-ef4803f1d77fca4420b83fd9b0e109672b6473bf.tar.gz Qt-ef4803f1d77fca4420b83fd9b0e109672b6473bf.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:
Remove driver bug work-around from GL 2 paint engine.
Don't set -mfpu=neon globally if the compiler supports neon.
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -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 bfbdb73..d4a1248 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_HAVE_NEON +#elif 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 |