diff options
| author | Matthew Vogt <matthew.vogt@nokia.com> | 2012-07-25 16:59:17 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-31 00:22:36 +0200 |
| commit | c9b7582a2e7ad9fcd03dd999c3b7a16b72803238 (patch) | |
| tree | d1ffdb193576fef0c243600f46c69b180d2ad2a8 /tests/auto/qml/qqmldirparser/data | |
| parent | 2e6accbbbb9783ff6e5ad171f179d5021b0761af (diff) | |
Implement strict mode for qmldir modules
Allow a module's qmldir to contain a module directive, which when
present specifies 'strict mode' import processing. In strict mode,
type registrations are only permitted into the namespace identified
in the qmldir file's module directive. In addition, any type
registrations to that namespace originating from other modules are
treated as error conditions.
Task-number: QTBUG-26551
Change-Id: I081bde2d3b83d3f28524440177fb2cd1ccee34ad
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Diffstat (limited to 'tests/auto/qml/qqmldirparser/data')
17 files changed, 35 insertions, 0 deletions
diff --git a/tests/auto/qml/qqmldirparser/data/empty/qmldir b/tests/auto/qml/qqmldirparser/data/empty/qmldir new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/empty/qmldir diff --git a/tests/auto/qml/qqmldirparser/data/excessive-module/qmldir b/tests/auto/qml/qqmldirparser/data/excessive-module/qmldir new file mode 100644 index 0000000000..c4fdbd4e35 --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/excessive-module/qmldir @@ -0,0 +1 @@ +module foo bar diff --git a/tests/auto/qml/qqmldirparser/data/excessive-plugin/qmldir b/tests/auto/qml/qqmldirparser/data/excessive-plugin/qmldir new file mode 100644 index 0000000000..4acde714ac --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/excessive-plugin/qmldir @@ -0,0 +1 @@ +plugin foo bar baz diff --git a/tests/auto/qml/qqmldirparser/data/four-sections/qmldir b/tests/auto/qml/qqmldirparser/data/four-sections/qmldir new file mode 100644 index 0000000000..03b37a0d27 --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/four-sections/qmldir @@ -0,0 +1 @@ +foo bar baz qux diff --git a/tests/auto/qml/qqmldirparser/data/incomplete-module/qmldir b/tests/auto/qml/qqmldirparser/data/incomplete-module/qmldir new file mode 100644 index 0000000000..0cca093d7a --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/incomplete-module/qmldir @@ -0,0 +1 @@ +module diff --git a/tests/auto/qml/qqmldirparser/data/incomplete-plugin/qmldir b/tests/auto/qml/qqmldirparser/data/incomplete-plugin/qmldir new file mode 100644 index 0000000000..8cb205e9b3 --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/incomplete-plugin/qmldir @@ -0,0 +1 @@ +plugin diff --git a/tests/auto/qml/qqmldirparser/data/invalid-versioned-component/qmldir b/tests/auto/qml/qqmldirparser/data/invalid-versioned-component/qmldir new file mode 100644 index 0000000000..c322b0f278 --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/invalid-versioned-component/qmldir @@ -0,0 +1 @@ +foo 100 bar diff --git a/tests/auto/qml/qqmldirparser/data/multiple/qmldir b/tests/auto/qml/qqmldirparser/data/multiple/qmldir new file mode 100644 index 0000000000..e74bad5617 --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/multiple/qmldir @@ -0,0 +1,15 @@ + +# +# Comment + +module ModuleNamespace + +plugin PluginA plugina.so # More comment + +ComponentA 1.0 componenta-1_0.qml +ScriptA 1.0 scripta-1_0.js + +# +ComponentA 1.5 componenta-1_5.qml +ComponentB 1.5 componentb-1_5.qml + diff --git a/tests/auto/qml/qqmldirparser/data/name-path-plugin/qmldir b/tests/auto/qml/qqmldirparser/data/name-path-plugin/qmldir new file mode 100644 index 0000000000..5cf8bd345d --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/name-path-plugin/qmldir @@ -0,0 +1 @@ +plugin foo bar diff --git a/tests/auto/qml/qqmldirparser/data/name-plugin/qmldir b/tests/auto/qml/qqmldirparser/data/name-plugin/qmldir new file mode 100644 index 0000000000..fb12cab37d --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/name-plugin/qmldir @@ -0,0 +1 @@ +plugin foo diff --git a/tests/auto/qml/qqmldirparser/data/no-content/qmldir b/tests/auto/qml/qqmldirparser/data/no-content/qmldir new file mode 100644 index 0000000000..3ce87ada21 --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/no-content/qmldir @@ -0,0 +1,4 @@ + +# only empty lines + # and comments + diff --git a/tests/auto/qml/qqmldirparser/data/non-first-module/qmldir b/tests/auto/qml/qqmldirparser/data/non-first-module/qmldir new file mode 100644 index 0000000000..932e43a94c --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/non-first-module/qmldir @@ -0,0 +1,2 @@ +plugin foo +module bar diff --git a/tests/auto/qml/qqmldirparser/data/one-section/qmldir b/tests/auto/qml/qqmldirparser/data/one-section/qmldir new file mode 100644 index 0000000000..257cc5642c --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/one-section/qmldir @@ -0,0 +1 @@ +foo diff --git a/tests/auto/qml/qqmldirparser/data/repeated-module/qmldir b/tests/auto/qml/qqmldirparser/data/repeated-module/qmldir new file mode 100644 index 0000000000..80c3e0c750 --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/repeated-module/qmldir @@ -0,0 +1,2 @@ +module foo +module bar diff --git a/tests/auto/qml/qqmldirparser/data/unversioned-component/qmldir b/tests/auto/qml/qqmldirparser/data/unversioned-component/qmldir new file mode 100644 index 0000000000..d675fa44e5 --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/unversioned-component/qmldir @@ -0,0 +1 @@ +foo bar diff --git a/tests/auto/qml/qqmldirparser/data/versioned-component/qmldir b/tests/auto/qml/qqmldirparser/data/versioned-component/qmldir new file mode 100644 index 0000000000..a2afd1835e --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/versioned-component/qmldir @@ -0,0 +1 @@ +foo 33.66 bar diff --git a/tests/auto/qml/qqmldirparser/data/versioned-script/qmldir b/tests/auto/qml/qqmldirparser/data/versioned-script/qmldir new file mode 100644 index 0000000000..1345a6855b --- /dev/null +++ b/tests/auto/qml/qqmldirparser/data/versioned-script/qmldir @@ -0,0 +1 @@ +foo 33.66 bar.js |