From 41e67d1ac4208a0bdc2fdfd5e042d83ee0f4c2fe Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Mon, 16 Jul 2012 16:49:51 +0200
Subject: [PATCH] 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>
---
 src/corelib/kernel/qmetaobject.cpp | 1 -
 src/corelib/kernel/qmetaobject_p.h | 2 +-
 2 files changed, 1 insertion(+), 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;