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 /tests | |
| parent | 63b58773d56ecfddfe6d25cb13c06f3dff9737e9 (diff) | |
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 'tests')
| -rw-r--r-- | tests/auto/xmlpatternssdk/ErrorHandler.h | 3 | ||||
| -rw-r--r-- | tests/auto/xmlpatternssdk/TestBaseLine.h | 2 | ||||
| -rw-r--r-- | tests/auto/xmlpatternssdk/TreeItem.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/xmlpatternssdk/TreeItem.h | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/xmlpatternssdk/ErrorHandler.h b/tests/auto/xmlpatternssdk/ErrorHandler.h index 0e79cda7..448655da 100644 --- a/tests/auto/xmlpatternssdk/ErrorHandler.h +++ b/tests/auto/xmlpatternssdk/ErrorHandler.h @@ -31,12 +31,11 @@ #include "Global.h" #include "qabstractmessagehandler.h" +#include <qcontainerfwd.h> QT_BEGIN_NAMESPACE -template<typename T> class QList; - namespace QPatternistSDK { /** diff --git a/tests/auto/xmlpatternssdk/TestBaseLine.h b/tests/auto/xmlpatternssdk/TestBaseLine.h index 5e757faa..da1e1025 100644 --- a/tests/auto/xmlpatternssdk/TestBaseLine.h +++ b/tests/auto/xmlpatternssdk/TestBaseLine.h @@ -30,6 +30,7 @@ #define PatternistSDK_TestBaseLine_H #include <QString> +#include <qcontainerfwd.h> #include "Global.h" #include "TestResult.h" @@ -39,7 +40,6 @@ QT_BEGIN_NAMESPACE class QDomNamedNodeMap; class QDomNode; class QDomNodeList; -template<typename T> class QList; namespace QPatternistSDK { diff --git a/tests/auto/xmlpatternssdk/TreeItem.cpp b/tests/auto/xmlpatternssdk/TreeItem.cpp index 696693ca..68803dab 100644 --- a/tests/auto/xmlpatternssdk/TreeItem.cpp +++ b/tests/auto/xmlpatternssdk/TreeItem.cpp @@ -30,6 +30,8 @@ #include "TreeItem.h" +#include <limits.h> + using namespace QPatternistSDK; int TreeItem::row() const diff --git a/tests/auto/xmlpatternssdk/TreeItem.h b/tests/auto/xmlpatternssdk/TreeItem.h index dbc203e7..09eed5ab 100644 --- a/tests/auto/xmlpatternssdk/TreeItem.h +++ b/tests/auto/xmlpatternssdk/TreeItem.h @@ -30,13 +30,13 @@ #define PatternistSDK_TreeItem_H #include <QObject> +#include <qcontainerfwd.h> #include "Global.h" QT_BEGIN_NAMESPACE class QVariant; -template<typename T> class QList; template<typename T> class QPointer; namespace QPatternistSDK |