diff options
| author | Michael Brasser <mbrasser@ford.com> | 2017-04-20 15:59:31 +0200 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@live.com> | 2017-07-13 21:00:55 +0000 |
| commit | 22a2cc43387ec3b9f74a6c01f8665378a4541147 (patch) | |
| tree | 33acf5a5367302eb3f488b688aba7c85959035ae /tests/auto/qml/qqmlengine | |
| parent | 286f14f1e29e7f4e2db4517d087dd5c92606f971 (diff) | |
Add support for enum declarations in QML
Enums can be declared with the following syntax:
enum MyEnum {
Value1,
Value2
}
Grammar changes done by Simon Hausmann.
[ChangeLog][QtQml] Enums can now be declared directly in QML.
Task-number: QTBUG-14861
Change-Id: Ic6b6e032651d01ee2ecf9d5ce5734976cb3ad7ab
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlengine')
| -rw-r--r-- | tests/auto/qml/qqmlengine/tst_qqmlengine.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp index dac6ddaebd..7aca830297 100644 --- a/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp +++ b/tests/auto/qml/qqmlengine/tst_qqmlengine.cpp @@ -741,6 +741,9 @@ public: if (url.path().endsWith("Test.2/qmldir"))//Special case return QUrl::fromLocalFile(m_base.path() + "interception/module/intercepted/qmldir"); + // Special case: with 5.10 we always add the implicit import, so we need to explicitly handle this case now + if (url.path().endsWith("intercepted/qmldir")) + return url; QString alteredPath = url.path(); int a = alteredPath.lastIndexOf('/'); |