diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-07 16:01:30 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2020-09-15 13:32:47 +0200 |
| commit | 98a31ff6b9673b020a688d7d035f03a6497a6f5f (patch) | |
| tree | 110e6c3d8e1880b99b4624d678828b930988e406 /tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | |
| parent | 62b94166cc99dd5fb663c76cfa38e9e888baae59 (diff) | |
Adapt to changes in qtbase
Due to qiterable.h specializing a template declared in qmetatype.h we
temporarily need to include it in a few tests so that the iterables
work.
Change-Id: Ia32392419dead76eaf2b91b2ec4157b726d8de74
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp')
| -rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index fe14964b7e..942284388a 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -29,6 +29,7 @@ #include <QtQml/qqmlengine.h> #include <QtQml/qqmlcomponent.h> #include <QtQml/qqmlincubator.h> +#include <QtCore/qiterable.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qfile.h> #include <QtCore/qdebug.h> @@ -5863,6 +5864,7 @@ void tst_qqmllanguage::arrayToContainer() QCOMPARE(root->m_points.at(0), QPointF (2.0, 3.0) ); QVERIFY(root->m_barrays.contains("hello")); QVERIFY(root->m_barrays.contains("world")); + QCOMPARE(root->m_convertibles.size(), 2); QCOMPARE(root->m_convertibles.at(0).msg, QLatin1String("hello")); QCOMPARE(root->m_convertibles.at(1).msg, QLatin1String("world")); } |