diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-25 06:35:41 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-25 06:35:41 (GMT) |
| commit | a1ac8f5f657665a53855f085c6c03e0d5eff5f39 (patch) | |
| tree | c89fa4e0b2920adf2db2fd75c51d5a47f941be1b /src/corelib | |
| parent | 86b92bdef3dbf471662d0a65a21a3fb02424e0af (diff) | |
| parent | 4e701b138de18491e43ede295aa41696f0751152 (diff) | |
| download | Qt-a1ac8f5f657665a53855f085c6c03e0d5eff5f39.zip Qt-a1ac8f5f657665a53855f085c6c03e0d5eff5f39.tar.gz Qt-a1ac8f5f657665a53855f085c6c03e0d5eff5f39.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/arch/macosx/arch.pri | 7 | ||||
| -rw-r--r-- | src/corelib/concurrent/qtconcurrentthreadengine.h | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
3 files changed, 5 insertions, 6 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/concurrent/qtconcurrentthreadengine.h b/src/corelib/concurrent/qtconcurrentthreadengine.h index 286c2b8..896b193 100644 --- a/src/corelib/concurrent/qtconcurrentthreadengine.h +++ b/src/corelib/concurrent/qtconcurrentthreadengine.h @@ -66,7 +66,7 @@ namespace QtConcurrent { // The ThreadEngineBarrier counts worker threads, and allows one // thread to wait for all others to finish. Tested for its use in // QtConcurrent, requires more testing for use as a general class. -class ThreadEngineBarrier +class Q_CORE_EXPORT ThreadEngineBarrier { private: // The thread count is maintained as an integer in the count atomic 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) |