diff options
| author | João Abecasis <joao.abecasis@nokia.com> | 2012-02-21 14:58:57 +0100 |
|---|---|---|
| committer | João Abecasis <joao.abecasis@nokia.com> | 2012-02-21 14:58:57 +0100 |
| commit | 31a0358afb4fde998d1eeeaa80fc32e4420266c7 (patch) | |
| tree | 938455353474196c1f49b0529b5b644e19c21f3e /src/corelib/tools/qvector.h | |
| parent | 4c8a4058c359c8d163c643120426079fc80c8214 (diff) | |
| parent | 69da8588d41bbf5ab785f5ad7c1fce76deefc7d0 (diff) | |
Merge remote-tracking branch 'gerrit/master' into containers
Conflicts:
src/corelib/tools/qbytearray.h
Change-Id: I03b1f3e05c9b7a45130887c522fcd9b7aa387129
Diffstat (limited to 'src/corelib/tools/qvector.h')
| -rw-r--r-- | src/corelib/tools/qvector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h index b47dddab14..83b1910450 100644 --- a/src/corelib/tools/qvector.h +++ b/src/corelib/tools/qvector.h @@ -67,7 +67,7 @@ struct Q_CORE_EXPORT QVectorData QtPrivate::RefCount ref; int alloc; int size; -#if defined(QT_ARCH_SPARC) && defined(Q_CC_GNU) && defined(__LP64__) && defined(QT_BOOTSTRAPPED) +#if defined(Q_PROCESSOR_SPARC) && defined(Q_CC_GNU) && defined(__LP64__) && defined(QT_BOOTSTRAPPED) // workaround for bug in gcc 3.4.2 uint capacity; uint reserved; |