diff options
author | Chris Adams <christopher.adams@nokia.com> | 2012-08-08 16:31:50 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-09 07:58:06 +0200 |
commit | aeb4a38ebcf9325423ef0259e70ee8bb11a5a30c (patch) | |
tree | 0dfa0fb1d4affc67b6a9261b7249d70635272681 /src/qml/qml/qqmlimport.cpp | |
parent | 42f9444e983b5257241c17242471ca63f208c3f6 (diff) |
Change error messages to reflect new module terminology
Previously, modules which registered types into a protected type
namespace were known as "strict" modules; now they are known as
"identified" modules.
This commit also adds a unit test to ensure that the module identifier
directive is the first command in the qmldir file.
Change-Id: I90e9d2c5b51ecb2b9d058c9fe9d9310fd3cd4f45
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Diffstat (limited to 'src/qml/qml/qqmlimport.cpp')
-rw-r--r-- | src/qml/qml/qqmlimport.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp index 6475621bee..739492b3d3 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1655,7 +1655,7 @@ bool QQmlImportDatabase::importPlugin(const QString &filePath, const QString &ur QWriteLocker lock(QQmlMetaType::typeRegistrationLock()); if (!typeNamespace.isEmpty()) { - // This is a 'strict' module + // This is an 'identified' module if (typeNamespace != uri) { // The namespace for type registrations must match the URI for locating the module QQmlError error; @@ -1674,8 +1674,8 @@ bool QQmlImportDatabase::importPlugin(const QString &filePath, const QString &ur QQmlMetaType::protectNamespace(typeNamespace); } } else { - // This is not a stict module - provide a warning - qWarning().nospace() << qPrintable(tr("Module '%1' does not contain a module directive - it cannot be protected from external registrations.").arg(uri)); + // This is not an identified module - provide a warning + qWarning().nospace() << qPrintable(tr("Module '%1' does not contain a module identifier directive - it cannot be protected from external registrations.").arg(uri)); } QQmlMetaType::setTypeRegistrationNamespace(typeNamespace); |