diff options
| -rw-r--r-- | src/tools/moc/generator.cpp | 3 | ||||
| -rw-r--r-- | src/tools/moc/moc.h | 1 | ||||
| -rw-r--r-- | tests/auto/tools/moc/cxx11-enums.h | 7 | ||||
| -rw-r--r-- | tests/auto/tools/moc/tst_moc.cpp | 2 |
4 files changed, 12 insertions, 1 deletions
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp index aa02fc0af5..3dddbe907d 100644 --- a/src/tools/moc/generator.cpp +++ b/src/tools/moc/generator.cpp @@ -202,6 +202,7 @@ void Generator::generateCode() } QByteArray alias = cdef->flagAliases.value(def.name); if (cdef->enumDeclarations.contains(alias)) { + def.className = def.name; def.name = alias; enumList += def; } @@ -922,7 +923,7 @@ void Generator::generateEnums(int index) const QByteArray &val = e.values.at(j); QByteArray code = cdef->qualified.constData(); if (e.isEnumClass) - code += "::" + e.name; + code += "::" + (e.className.isNull() ? e.name : e.className); code += "::" + val; fprintf(out, " %4d, uint(%s),\n", stridx(val), code.constData()); diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h index 5f8cdfcf2c..190fdfb733 100644 --- a/src/tools/moc/moc.h +++ b/src/tools/moc/moc.h @@ -64,6 +64,7 @@ Q_DECLARE_TYPEINFO(Type, Q_MOVABLE_TYPE); struct EnumDef { QByteArray name; + QByteArray className; QList<QByteArray> values; bool isEnumClass; // c++11 enum class EnumDef() : isEnumClass(false) {} diff --git a/tests/auto/tools/moc/cxx11-enums.h b/tests/auto/tools/moc/cxx11-enums.h index 47a4857cd0..209ec4eb43 100644 --- a/tests/auto/tools/moc/cxx11-enums.h +++ b/tests/auto/tools/moc/cxx11-enums.h @@ -39,10 +39,14 @@ public: enum TypedEnum : char { B0, B1 , B2, B3 }; enum class TypedEnumClass : char { C0, C1, C2, C3 }; enum NormalEnum { D2 = 2, D3, D0 =0 , D1 }; + enum class ClassFlag { F0, F1, F2, F3 }; + Q_DECLARE_FLAGS(ClassFlags, ClassFlag) + Q_ENUM(EnumClass) Q_ENUM(TypedEnum) Q_ENUM(TypedEnumClass) Q_ENUM(NormalEnum) + Q_FLAG(ClassFlags) }; // Also test the Q_ENUMS macro @@ -54,7 +58,10 @@ public: enum TypedEnum : char { B0, B1 , B2, B3 }; enum class TypedEnumClass : char { C0, C1, C2, C3 }; enum NormalEnum { D2 = 2, D3, D0 =0 , D1 }; + enum class ClassFlag { F0, F1, F2, F3 }; + Q_DECLARE_FLAGS(ClassFlags, ClassFlag) Q_ENUMS(EnumClass TypedEnum TypedEnumClass NormalEnum) + Q_FLAGS(ClassFlags) }; #else diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp index 753da401a2..8a08de9bc6 100644 --- a/tests/auto/tools/moc/tst_moc.cpp +++ b/tests/auto/tools/moc/tst_moc.cpp @@ -2263,6 +2263,8 @@ void tst_Moc::cxx11Enums_data() QTest::newRow("TypedEnumClass 2") << meta2 << QByteArray("TypedEnumClass") << 'C' << true; QTest::newRow("NormalEnum") << meta1 << QByteArray("NormalEnum") << 'D' << false; QTest::newRow("NormalEnum 2") << meta2 << QByteArray("NormalEnum") << 'D' << false; + QTest::newRow("ClassFlags") << meta1 << QByteArray("ClassFlags") << 'F' << true; + QTest::newRow("ClassFlags 2") << meta2 << QByteArray("ClassFlags") << 'F' << true; } void tst_Moc::cxx11Enums() |