diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2017-09-22 15:55:42 +0200 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-11-22 08:43:12 +0000 |
| commit | 36ce1490fc541489f9091e9d91234aeac4f9df90 (patch) | |
| tree | 4ec3963fcc6fe23fa4d848ec5d19855c5d3ee581 /tests/auto/qml/qqmltypeloader/data/test_intercept.qml | |
| parent | c9a6f55659bc054f835aa682a521425f8fa2bf07 (diff) | |
Don't reject plugin-only qmldir files
On QQmlImportsPrivate::updateQmldirContent we need to check if the new
module has actually been established after figuring out that it doesn't
have any components or scripts. If it has, then we shouldn't fail, as
obviously a plugin has been loaded. We don't need to check the component
and script versions in that case, as plugins don't have separate
versions.
Change-Id: Ie328b59038fe65c3f6a2eeecfe969927bba6cd68
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmltypeloader/data/test_intercept.qml')
| -rw-r--r-- | tests/auto/qml/qqmltypeloader/data/test_intercept.qml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qml/qqmltypeloader/data/test_intercept.qml b/tests/auto/qml/qqmltypeloader/data/test_intercept.qml index 091fbe7f49..0d64cb7e28 100644 --- a/tests/auto/qml/qqmltypeloader/data/test_intercept.qml +++ b/tests/auto/qml/qqmltypeloader/data/test_intercept.qml @@ -41,7 +41,7 @@ ListView { width: ListView.view.width height: 100 asynchronous: true - source: "Intercept.qml" + source: index == 0 ? "Intercept.qml" : "GenericView.qml" onLoaded: { test.loaded++ |