diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2012-07-16 16:49:51 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-18 19:53:27 +0200 |
| commit | 41e67d1ac4208a0bdc2fdfd5e042d83ee0f4c2fe (patch) | |
| tree | 12982daba4ac8c57dde8f6e235ccd0e07347538e /src | |
| parent | bf3b08ee0644c848a82067d2ad38d1bdc2ec7108 (diff) | |
qmetaobject_p.h: don't (incorrectly) fwd-declare QVarLengthArray
qmetaobject_p.h forward-declared QVarLengthArray without the default parameter
for the 'int' template argument. This violates the ODR, so just #include the
header instead. It's not like there's much point in the fwd declaration in
a private header.
Change-Id: Ie5ef1740c57da396c95f5bae1cd81ac941a8ac2d
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.cpp | 1 | ||||
| -rw-r--r-- | src/corelib/kernel/qmetaobject_p.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp index 3e82de78ea..589c6a571b 100644 --- a/src/corelib/kernel/qmetaobject.cpp +++ b/src/corelib/kernel/qmetaobject.cpp @@ -48,7 +48,6 @@ #include <qdatastream.h> #include <qstringlist.h> #include <qthread.h> -#include <qvarlengtharray.h> #include <qvariant.h> #include <qhash.h> #include <qdebug.h> diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h index 855a0e04e7..117412fe54 100644 --- a/src/corelib/kernel/qmetaobject_p.h +++ b/src/corelib/kernel/qmetaobject_p.h @@ -58,6 +58,7 @@ #ifndef QT_NO_QOBJECT #include <private/qobject_p.h> // For QObjectPrivate::Connection #endif +#include <QtCore/qvarlengtharray.h> QT_BEGIN_NAMESPACE @@ -159,7 +160,6 @@ private: QByteArray _name; }; -template <class T, int> class QVarLengthArray; typedef QVarLengthArray<QArgumentType, 10> QArgumentTypeArray; class QMetaMethodPrivate; |