diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-24 08:11:02 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2019-05-24 08:12:38 +0200 |
| commit | 8c772c12612b408b42e66ad0627d37477f42255a (patch) | |
| tree | 93e6f1f594206e6167c3996cca5a702ad1f600bc /sources/shiboken2/ApiExtractor/messages.cpp | |
| parent | c134129bd55ebf91d3a74c720b8bd659f13bd93d (diff) | |
| parent | 0f9b8cf0f2873e1697ab56c50087a81f1dd61415 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'sources/shiboken2/ApiExtractor/messages.cpp')
| -rw-r--r-- | sources/shiboken2/ApiExtractor/messages.cpp | 29 |
1 files changed, 27 insertions, 2 deletions
diff --git a/sources/shiboken2/ApiExtractor/messages.cpp b/sources/shiboken2/ApiExtractor/messages.cpp index fdae2359b..a6e75aac3 100644 --- a/sources/shiboken2/ApiExtractor/messages.cpp +++ b/sources/shiboken2/ApiExtractor/messages.cpp @@ -206,8 +206,6 @@ QString msgCannotTranslateTemplateArgument(int i, return result; } -// abstractmetalang.cpp - QString msgDisallowThread(const AbstractMetaFunction *f) { QString result; @@ -219,6 +217,13 @@ QString msgDisallowThread(const AbstractMetaFunction *f) return result; } +QString msgNamespaceToBeExtendedNotFound(const QString &namespaceName, const QString &packageName) +{ + return QLatin1String("The namespace '") + namespaceName + + QLatin1String("' to be extended cannot be found in package ") + + packageName + QLatin1Char('.'); +} + // docparser.cpp QString msgCannotFindDocumentation(const QString &fileName, @@ -421,6 +426,26 @@ QString msgRejectReason(const TypeRejection &r, const QString &needle) return result; } +// typesystem.cpp + +QString msgCannotFindNamespaceToExtend(const QString &name, + const QStringRef &extendsPackage) +{ + return QLatin1String("Cannot find namespace ") + name + + QLatin1String(" in package ") + extendsPackage; +} + +QString msgExtendingNamespaceRequiresPattern(const QString &name) +{ + return QLatin1String("Namespace ") + name + + QLatin1String(" requires a file pattern since it extends another namespace."); +} + +QString msgInvalidRegularExpression(const QString &pattern, const QString &why) +{ + return QLatin1String("Invalid pattern \"") + pattern + QLatin1String("\": ") + why; +} + // qtdocgenerator.cpp QString msgTagWarning(const QXmlStreamReader &reader, const QString &context, |