1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix generated forward declarations in qdbusxml.cpp

Browse Source 
Simply use qcontainerfwd.h, instead of declaring those manually.

Change-Id: I6d87bf14b60469b457e8e9335868f8cdb0303817
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2020-09-09 10:08:24 +02:00
parent 557623cc4f
commit e07a739138
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/tools/qcontainerfwd.h
View File

@ -61,6 +61,10 @@ template <class T> class QStack;
template<class T, qsizetype Prealloc = 256> class QVarLengthArray; template<class T, qsizetype Prealloc = 256> class QVarLengthArray;
template <class T> class QList; template <class T> class QList;
template<typename T> using QVector = QList<T>; template<typename T> using QVector = QList<T>;
class QStringList;
using QByteArrayList = QList<QByteArray>;
class QMetaType;
class QVariant;
QT_END_NAMESPACE QT_END_NAMESPACE

8
src/tools/qdbusxml2cpp/qdbusxml2cpp.cpp
View File

@ -71,13 +71,7 @@ static const char includeList[] =
"#include <QtCore/QVariant>\n"; "#include <QtCore/QVariant>\n";
static const char forwardDeclarations[] = static const char forwardDeclarations[] =
"QT_BEGIN_NAMESPACE\n" "#include <QtCore/qcontainerfwd.h>\n";
"#include <QtCore/qcontainerfwd.h>\n"
"class QByteArray;\n"
"class QString;\n"
"class QStringList;\n"
"class QVariant;\n"
"QT_END_NAMESPACE\n";
static QDBusIntrospection::Interfaces readInput() static QDBusIntrospection::Interfaces readInput()
{ {