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 /src/qml/qml/qqmldirparser_p.h | |
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 'src/qml/qml/qqmldirparser_p.h')
-rw-r--r-- | src/qml/qml/qqmldirparser_p.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/qml/qml/qqmldirparser_p.h b/src/qml/qml/qqmldirparser_p.h index c38a3e1791..7a9078180e 100644 --- a/src/qml/qml/qqmldirparser_p.h +++ b/src/qml/qml/qqmldirparser_p.h @@ -62,7 +62,7 @@ QT_BEGIN_NAMESPACE class QQmlError; class QQmlEngine; -class QQmlDirParser +class Q_AUTOTEST_EXPORT QQmlDirParser { Q_DISABLE_COPY(QQmlDirParser) @@ -76,6 +76,9 @@ public: void setError(const QQmlError &); QList<QQmlError> errors(const QString &uri) const; + QString typeNamespace() const; + void setTypeNamespace(const QString &s); + struct Plugin { Plugin() {} @@ -139,6 +142,7 @@ private: private: QList<QQmlError> _errors; + QString _typeNamespace; QHash<QHashedStringRef,Component> _components; // multi hash QList<Script> _scripts; QList<Plugin> _plugins; |