diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 21:16:41 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 21:16:41 (GMT) |
| commit | fd5c6436d4be5ce6db57a8a34951c8ab4dac9000 (patch) | |
| tree | 2b2ce0df9cd0bfcc1c8a0566668c92df8be94206 /src/corelib | |
| parent | 117b9bb3d576d9974b3d05174d1fccf98e47cb22 (diff) | |
| parent | 5f5cf5b798cc7e65e47987b654beaf9d762406eb (diff) | |
| download | Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.zip Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.gz Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tests/auto/qsqldatabase/tst_databases.h
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/macosx/arch.pri | 7 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/corelib/arch/macosx/arch.pri b/src/corelib/arch/macosx/arch.pri index e42a962..a2b1bf7 100644 --- a/src/corelib/arch/macosx/arch.pri +++ b/src/corelib/arch/macosx/arch.pri @@ -1,7 +1,6 @@ # # Mac OS X architecture # -!*-icc*:!*-g++* { - contains($$list($$system(uname -m)), .*86):SOURCES += $$QT_ARCH_CPP/../i386/qatomic.s - else:SOURCES += $$QT_ARCH_CPP/../powerpc/qatomic32.s -} + +# Left blank intentionally since all the current compilers that we support can +# handle in-line assembly. diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 3ff263d..71482f5 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -169,7 +169,7 @@ static int ucstricmp(const ushort *a, const ushort *ae, const uchar *b) // Unicode case-insensitive comparison static int ucstrcmp(const QChar *a, int alen, const QChar *b, int blen) { - if (a == b) + if (a == b && alen == blen) return 0; int l = qMin(alen, blen); while (l-- && *a == *b) |