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

Change-Id: Ia31df23a16575f9ecefe13ec85fb70197d103278

2 files changed, 7 insertions, 11 deletions

diff --git a/sources/shiboken2/ApiExtractor/typesystem.h b/sources/shiboken2/ApiExtractor/typesystem.h
index 3fb326b76..f82b0a2ba 100644
--- a/sources/shiboken2/ApiExtractor/typesystem.h
+++ b/sources/shiboken2/ApiExtractor/typesystem.h
@@ -1527,6 +1527,9 @@ public:
     void formatDebug(QDebug &d) const override;
 #endif
 
+    bool generateUsing() const { return m_generateUsing; }
+    void setGenerateUsing(bool generateUsing) { m_generateUsing = generateUsing; }
+
 protected:
     NamespaceTypeEntry(const NamespaceTypeEntry &);
 
@@ -1536,6 +1539,7 @@ private:
     TypeSystem::Visibility m_visibility = TypeSystem::Visibility::Auto;
     bool m_hasPattern = false;
     bool m_inlineNamespace = false;
+    bool m_generateUsing = true; // Whether to generate "using namespace" into wrapper
 };
 
 class ValueTypeEntry : public ComplexTypeEntry
diff --git a/sources/shiboken2/ApiExtractor/typesystemparser.cpp b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
index d23e96c77..948a28796 100644
--- a/sources/shiboken2/ApiExtractor/typesystemparser.cpp
+++ b/sources/shiboken2/ApiExtractor/typesystemparser.cpp
@@ -67,6 +67,7 @@ static inline QString flagsAttribute() { return QStringLiteral("flags"); }
 static inline QString forceAbstractAttribute() { return QStringLiteral("force-abstract"); }
 static inline QString forceIntegerAttribute() { return QStringLiteral("force-integer"); }
 static inline QString formatAttribute() { return QStringLiteral("format"); }
+static inline QString generateUsingAttribute() { return QStringLiteral("generate-using"); }
 static inline QString classAttribute() { return QStringLiteral("class"); }
 static inline QString generateAttribute() { return QStringLiteral("generate"); }
 static inline QString genericClassAttribute() { return QStringLiteral("generic-class"); }
@@ -1020,7 +1021,6 @@ bool TypeSystemParser::importFileElement(const QXmlStreamAttributes &atts)
 
 static bool convertBoolean(QStringView value, const QString &attributeName, bool defaultValue)
 {
-#ifdef QTBUG_69389_FIXED
     if (value.compare(trueAttributeValue(), Qt::CaseInsensitive) == 0
         || value.compare(yesAttributeValue(), Qt::CaseInsensitive) == 0) {
         return true;
@@ -1029,16 +1029,6 @@ static bool convertBoolean(QStringView value, const QString &attributeName, bool
         || value.compare(noAttributeValue(), Qt::CaseInsensitive) == 0) {
         return false;
     }
-#else
-    if (QtPrivate::compareStrings(value, trueAttributeValue(), Qt::CaseInsensitive) == 0
-        || QtPrivate::compareStrings(value, yesAttributeValue(), Qt::CaseInsensitive) == 0) {
-        return true;
-    }
-    if (QtPrivate::compareStrings(value, falseAttributeValue(), Qt::CaseInsensitive) == 0
-        || QtPrivate::compareStrings(value, noAttributeValue(), Qt::CaseInsensitive) == 0) {
-        return false;
-    }
-#endif
     const QString warn = QStringLiteral("Boolean value '%1' not supported in attribute '%2'. Use 'yes' or 'no'. Defaulting to '%3'.")
                                       .arg(value)
                                       .arg(attributeName,
@@ -1376,6 +1366,8 @@ NamespaceTypeEntry *
         } else if (attributeName == generateAttribute()) {
             if (!convertBoolean(attributes->takeAt(i).value(), generateAttribute(), true))
                 visibility = TypeSystem::Visibility::Invisible;
+        } else if (attributeName == generateUsingAttribute()) {
+            result->setGenerateUsing(convertBoolean(attributes->takeAt(i).value(), generateUsingAttribute(), true));
         }
     }