diff options
Diffstat (limited to 'src/qml')
| -rw-r--r-- | src/qml/qml/qqmldirparser.cpp | 6 | ||||
| -rw-r--r-- | src/qml/qml/qqmlimport.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/qml/qqmldirparser.cpp b/src/qml/qml/qqmldirparser.cpp index 705f715a00..0bfc4eb4bd 100644 --- a/src/qml/qml/qqmldirparser.cpp +++ b/src/qml/qml/qqmldirparser.cpp @@ -150,17 +150,17 @@ bool QQmlDirParser::parse(const QString &source) } else if (sections[0] == QLatin1String("module")) { if (sectionCount != 2) { reportError(lineNumber, -1, - QString::fromUtf8("module directive requires one argument, but %1 were provided").arg(sectionCount - 1)); + QString::fromUtf8("module identifier directive requires one argument, but %1 were provided").arg(sectionCount - 1)); continue; } if (!_typeNamespace.isEmpty()) { reportError(lineNumber, -1, - QString::fromUtf8("only one module directive may be defined in a qmldir file")); + QString::fromUtf8("only one module identifier directive may be defined in a qmldir file")); continue; } if (!firstLine) { reportError(lineNumber, -1, - QString::fromUtf8("module directive must be the first directive in a qmldir file")); + QString::fromUtf8("module identifier directive must be the first command in a qmldir file")); continue; } 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); |