shiboken: Add a way of specifying system includes to be parsed

Task-number: PYSIDE-454
Change-Id: I9302cf74544315875a65bc09b75741c7fe6399e8
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>

1 files changed, 20 insertions, 1 deletions

diff --git a/sources/shiboken2/ApiExtractor/typesystemparser.cpp b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
index 77c36df9a..a5d28c2e2 100644
--- a/sources/shiboken2/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
@@ -61,6 +61,7 @@ static inline QString deleteInMainThreadAttribute() { return QStringLiteral("del
 static inline QString deprecatedAttribute() { return QStringLiteral("deprecated"); }
 static inline QString exceptionHandlingAttribute() { return QStringLiteral("exception-handling"); }
 static inline QString extensibleAttribute() { return QStringLiteral("extensible"); }
+static inline QString fileNameAttribute() { return QStringLiteral("file-name"); }
 static inline QString flagsAttribute() { return QStringLiteral("flags"); }
 static inline QString forceAbstractAttribute() { return QStringLiteral("force-abstract"); }
 static inline QString forceIntegerAttribute() { return QStringLiteral("force-integer"); }
@@ -382,6 +383,7 @@ ENUM_LOOKUP_BEGIN(StackElement::ElementType, Qt::CaseInsensitive,
         {u"replace-type", StackElement::ReplaceType},
         {u"smart-pointer-type", StackElement::SmartPointerTypeEntry},
         {u"suppress-warning", StackElement::SuppressedWarning},
+        {u"system-include", StackElement::SystemInclude},
         {u"target-to-native", StackElement::TargetToNative},
         {u"template", StackElement::Template},
         {u"typedef-type", StackElement::TypedefTypeEntry},
@@ -2536,7 +2538,7 @@ bool TypeSystemParser::parseInclude(const QXmlStreamReader &,
     QString location;
     for (int i = attributes->size() - 1; i >= 0; --i) {
         const QStringRef name = attributes->at(i).qualifiedName();
-        if (name == QLatin1String("file-name"))
+        if (name == fileNameAttribute())
             fileName = attributes->takeAt(i).value().toString();
         else if (name == locationAttribute())
             location = attributes->takeAt(i).value().toString();
@@ -2564,6 +2566,18 @@ bool TypeSystemParser::parseInclude(const QXmlStreamReader &,
     return true;
 }
 
+bool TypeSystemParser::parseSystemInclude(const QXmlStreamReader &,
+                                          QXmlStreamAttributes *attributes)
+{
+    const int index = indexOfAttribute(*attributes, fileNameAttribute());
+    if (index == -1) {
+        m_error = msgMissingAttribute(fileNameAttribute());
+        return false;
+    }
+    TypeDatabase::instance()->addSystemInclude(attributes->takeAt(index).value().toString());
+    return true;
+}
+
 TemplateInstance *
     TypeSystemParser::parseTemplateInstanceEnum(const QXmlStreamReader &,
                                        const StackElement &topElement,
@@ -2849,6 +2863,7 @@ bool TypeSystemParser::startElement(const QXmlStreamReader &reader)
                         || element->type == StackElement::LoadTypesystem
                         || element->type == StackElement::InjectCode
                         || element->type == StackElement::ExtraIncludes
+                        || element->type == StackElement::SystemInclude
                         || element->type == StackElement::ConversionRule
                         || element->type == StackElement::AddFunction
                         || element->type == StackElement::Template;
@@ -3001,6 +3016,10 @@ bool TypeSystemParser::startElement(const QXmlStreamReader &reader)
             if (!addRejection(m_database, &attributes, &m_error))
                 return false;
             break;
+        case StackElement::SystemInclude:
+            if (!parseSystemInclude(reader, &attributes))
+                return false;
+            break;
         case StackElement::Template: {
             const int nameIndex = indexOfAttribute(attributes, nameAttribute());
             if (nameIndex == -1) {