diff options
| author | Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org> | 2019-11-04 03:00:55 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-11-04 13:55:43 +0100 |
| commit | c34155c55259edfaba104d66095a2670f9d936e7 (patch) | |
| tree | 45eab905d8b55150b153082976068e9b4d0789f2 /tools | |
| parent | 63b58773d56ecfddfe6d25cb13c06f3dff9737e9 (diff) | |
| download | qtxmlpatterns-c34155c55259edfaba104d66095a2670f9d936e7.tar.gz | |
Update dependencies on 'dev' in qt/qtxmlpatterns
Also applied build fixes to build with QList == QVector.
This means replacing forward-declarations and removing conversion code
between list and vector.
Change-Id: I6eac649f8376eafca8f96c3fa603d27ad5ad7b38
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/xmlpatterns/qapplicationargumentparser_p.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/xmlpatterns/qapplicationargumentparser_p.h b/tools/xmlpatterns/qapplicationargumentparser_p.h index 9ad9751..819069d 100644 --- a/tools/xmlpatterns/qapplicationargumentparser_p.h +++ b/tools/xmlpatterns/qapplicationargumentparser_p.h @@ -40,15 +40,13 @@ #define QApplicationArgumentParser_H #include <QtCore/QVariant> /* Needed, because we can't forward declare QVariantList. */ +#include <qcontainerfwd.h> QT_BEGIN_NAMESPACE class QApplicationArgument; class QApplicationArgumentParserPrivate; class QStringList; -template<typename A, typename B> struct QPair; -template<typename T> class QList; -template<typename Value> class QList; class QApplicationArgumentParser { |