Merge remote-tracking branch 'origin/5.15' into dev

Change-Id: I7e4c7f9378706438715362b1e2da9a3cd2794562

1 files changed, 18 insertions, 1 deletions

diff --git a/sources/shiboken2/ApiExtractor/messages.cpp b/sources/shiboken2/ApiExtractor/messages.cpp
index f218faace..55c51ffa4 100644
--- a/sources/shiboken2/ApiExtractor/messages.cpp
+++ b/sources/shiboken2/ApiExtractor/messages.cpp
@@ -1,4 +1,4 @@
-/****************************************************************************
+/****************************************************************************
 **
 ** Copyright (C) 2018 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
@@ -368,6 +368,23 @@ QString msgNamespaceToBeExtendedNotFound(const QString &namespaceName, const QSt
         + packageName + QLatin1Char('.');
 }
 
+QString msgPropertyTypeParsingFailed(const QString &name, const QString &typeName,
+                                     const QString &why)
+{
+    QString result;
+    QTextStream str(&result);
+    str << "Unable to decide type of property: \"" << name << "\" (" << typeName
+        << "): " << why;
+    return result;
+}
+
+QString msgPropertyExists(const QString &className, const QString &name)
+{
+    return QLatin1String("class ") + className
+        + QLatin1String(" already has a property \"") + name
+        + QLatin1String("\" (defined by Q_PROPERTY).");
+}
+
 // docparser.cpp
 
 QString msgCannotFindDocumentation(const QString &fileName,