diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-02-17 20:31:38 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-17 20:31:38 +0100 |
| commit | e88011357e5dd3b0ae4e6bc715ef29e5f4f3ffab (patch) | |
| tree | c5b05d45e49194d70ff4defae41e5d5d5cf75e80 /src/corelib/tools | |
| parent | 2df8884bc68343ad96962e7496b98d6e585c0347 (diff) | |
| parent | e65cd6f3794e12e6bc5c2ee985eae8e70ff5f333 (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qpair.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qsimd_p.h | 3 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/tools/qpair.qdoc b/src/corelib/tools/qpair.qdoc index a79486115d..55353dc258 100644 --- a/src/corelib/tools/qpair.qdoc +++ b/src/corelib/tools/qpair.qdoc @@ -84,7 +84,7 @@ /*! \fn QPair::QPair() Constructs an empty pair. The \c first and \c second elements are - initialized with \l{default-constructed values}. + initialized with \l{default-constructed value}s. */ /*! diff --git a/src/corelib/tools/qsimd_p.h b/src/corelib/tools/qsimd_p.h index 1a9c25837e..b9d546452f 100644 --- a/src/corelib/tools/qsimd_p.h +++ b/src/corelib/tools/qsimd_p.h @@ -139,7 +139,8 @@ #endif // other x86 intrinsics -#if defined(QT_COMPILER_SUPPORTS_AVX) && defined(Q_CC_GNU) +#if defined(QT_COMPILER_SUPPORTS_AVX) && defined(Q_CC_GNU) && \ + (!defined(Q_CC_INTEL)|| __INTEL_COMPILER >= 1310 || (__GNUC__ * 100 + __GNUC_MINOR__ < 407)) #define QT_COMPILER_SUPPORTS_X86INTRIN #include <x86intrin.h> #endif diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index ed8cb734f5..0be0a84459 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -4965,7 +4965,7 @@ int QString::compare_helper(const QChar *data1, int length1, QLatin1String s2, lists of strings to the user. On Mac OS X since Qt 4.3, this function compares according the - "Order for sorted lists" setting in the International prefereces panel. + "Order for sorted lists" setting in the International preferences panel. \sa compare(), QTextCodec::locale() */ |