diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:33:07 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2010-11-19 10:33:07 (GMT) |
| commit | 527f67325c200940e403f32b0db8f8c2677a1159 (patch) | |
| tree | c12a152f12c3abcf9f46e4f0dc1784dee127340e /src/corelib/tools/qstring.cpp | |
| parent | a26d41fc2732e225dc9a1b5eb5224cc499ae87b4 (diff) | |
| parent | 72378ce571bcb88d0519a1b02d0e543b5237d613 (diff) | |
| download | Qt-527f67325c200940e403f32b0db8f8c2677a1159.zip Qt-527f67325c200940e403f32b0db8f8c2677a1159.tar.gz Qt-527f67325c200940e403f32b0db8f8c2677a1159.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-team into QTBUG-15333
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 |