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>bb10
parent
bf3b08ee06
commit
41e67d1ac4
|
|
@ -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>
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in New Issue