From c9b7582a2e7ad9fcd03dd999c3b7a16b72803238 Mon Sep 17 00:00:00 2001 From: Matthew Vogt Date: Wed, 25 Jul 2012 16:59:17 +1000 Subject: 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 Reviewed-by: Roberto Raggi --- src/imports/folderlistmodel/qmldir | 1 + src/imports/localstorage/qmldir | 3 ++- src/imports/particles/qmldir | 1 + src/imports/qtquick2/qmldir | 1 + src/imports/testlib/qmldir | 1 + src/imports/window/qmldir | 1 + src/imports/xmllistmodel/qmldir | 3 ++- 7 files changed, 9 insertions(+), 2 deletions(-) (limited to 'src/imports') diff --git a/src/imports/folderlistmodel/qmldir b/src/imports/folderlistmodel/qmldir index 6e115bbc7e..bbd91356cf 100644 --- a/src/imports/folderlistmodel/qmldir +++ b/src/imports/folderlistmodel/qmldir @@ -1 +1,2 @@ +module Qt.labs.folderlistmodel plugin qmlfolderlistmodelplugin diff --git a/src/imports/localstorage/qmldir b/src/imports/localstorage/qmldir index 33288a1afa..8bb2c3bc68 100644 --- a/src/imports/localstorage/qmldir +++ b/src/imports/localstorage/qmldir @@ -1 +1,2 @@ -plugin qmllocalstorageplugin \ No newline at end of file +module QtQuick.LocalStorage +plugin qmllocalstorageplugin diff --git a/src/imports/particles/qmldir b/src/imports/particles/qmldir index 593915f83f..25d58dec0d 100644 --- a/src/imports/particles/qmldir +++ b/src/imports/particles/qmldir @@ -1 +1,2 @@ +module QtQuick.Particles plugin particlesplugin diff --git a/src/imports/qtquick2/qmldir b/src/imports/qtquick2/qmldir index bb4d33a5be..1fcbb13f3a 100644 --- a/src/imports/qtquick2/qmldir +++ b/src/imports/qtquick2/qmldir @@ -1 +1,2 @@ +module QtQuick plugin qtquick2plugin diff --git a/src/imports/testlib/qmldir b/src/imports/testlib/qmldir index 9e872f9683..d126464e9a 100644 --- a/src/imports/testlib/qmldir +++ b/src/imports/testlib/qmldir @@ -1,3 +1,4 @@ +module QtTest plugin qmltestplugin TestCase 1.0 TestCase.qml SignalSpy 1.0 SignalSpy.qml diff --git a/src/imports/window/qmldir b/src/imports/window/qmldir index 32844a6ed6..2dad388ba3 100644 --- a/src/imports/window/qmldir +++ b/src/imports/window/qmldir @@ -1 +1,2 @@ +module QtQuick.Window plugin windowplugin diff --git a/src/imports/xmllistmodel/qmldir b/src/imports/xmllistmodel/qmldir index dd39bcd7f8..945d15ac9f 100644 --- a/src/imports/xmllistmodel/qmldir +++ b/src/imports/xmllistmodel/qmldir @@ -1 +1,2 @@ -plugin qmlxmllistmodelplugin \ No newline at end of file +module QtQuick.XmlListModel +plugin qmlxmllistmodelplugin -- cgit v1.2.3