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

Change-Id: I1b6fdc6b0ac59dd726a9977620f1070bebf237a6

1 files changed, 7 insertions, 2 deletions

diff --git a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
index 568b5fd27..a9556fa4c 100644
--- a/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
+++ b/sources/shiboken2/generator/shiboken2/cppgenerator.cpp
@@ -4483,8 +4483,13 @@ void CppGenerator::writeEnumInitialization(QTextStream& s, const AbstractMetaEnu
     if (!cppEnum->isAnonymous()) {
         FlagsTypeEntry* flags = enumTypeEntry->flags();
         if (flags) {
-            s << INDENT << cpythonTypeNameExt(flags) << " = PySide::QFlags::create(\"" << flags->flagsName() << "\", "
-              << cpythonEnumName(cppEnum) << "_number_slots);" << endl;
+            // The following could probably be made nicer:
+            // We need 'flags->flagsName()' with the full module/class path.
+            QString fullPath = getClassTargetFullName(cppEnum);
+            fullPath.truncate(fullPath.lastIndexOf(QLatin1Char('.')) + 1);
+            s << INDENT << cpythonTypeNameExt(flags) << " = PySide::QFlags::create(\""
+                << fullPath << flags->flagsName() << "\", "
+                << cpythonEnumName(cppEnum) << "_number_slots);" << endl;
         }
 
         enumVarTypeObj = cpythonTypeNameExt(enumTypeEntry);