summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools/qstring.cpp
diff options
context:
space:
mode:
authorDavid Boddie <david.boddie@nokia.com>2010-11-23 14:49:41 (GMT)
committerDavid Boddie <david.boddie@nokia.com>2010-11-23 14:49:41 (GMT)
commitd0694162b872befc8c57dbf900bbd502ce25b80d (patch)
treecb078d538f9df9ae5dbcbd647b6010604a744fac /src/corelib/tools/qstring.cpp
parent3dc88a6229afc72125fa5565eb565a6fbc92620f (diff)
parentcfc1e1c3687d7ad1ddf4b5650d06bf52de4e3576 (diff)
downloadQt-d0694162b872befc8c57dbf900bbd502ce25b80d.zip
Qt-d0694162b872befc8c57dbf900bbd502ce25b80d.tar.gz
Qt-d0694162b872befc8c57dbf900bbd502ce25b80d.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
-rw-r--r--src/corelib/tools/qstring.cpp2
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