diff --git a/src/corelib/kernel/qtmochelpers.h b/src/corelib/kernel/qtmochelpers.h
index 8ee9d6940f1..e4eba1a1375 100644
--- a/src/corelib/kernel/qtmochelpers.h
+++ b/src/corelib/kernel/qtmochelpers.h
@@ -446,6 +446,33 @@ constexpr auto metaObjectData(uint flags, const Methods &methods, const Properti
 
 #define QT_MOC_HAS_UINTDATA    1
 
+template <typename T> inline std::enable_if_t<std::is_enum_v<T>> assignFlags(void *v, T t) noexcept
+{
+    *static_cast<T *>(v) = t;
+}
+
+template <typename T> inline std::enable_if_t<QtPrivate::IsQFlags<T>::value> assignFlags(void *v, T t) noexcept
+{
+    *static_cast<T *>(v) = t;
+}
+
+#if QT_VERSION < QT_VERSION_CHECK(7, 0, 0)
+template <typename T>
+Q_DECL_DEPRECATED_X("Returning int/uint from a Q_PROPERTY that is a Q_FLAG is deprecated; "
+                    "please update to return the actual property's type")
+inline void assignFlagsFromInteger(QFlags<T> &f, int i) noexcept
+{
+     f = QFlag(i);
+}
+
+template <typename T, typename I>
+inline std::enable_if_t<QtPrivate::IsQFlags<T>::value && sizeof(T) == sizeof(int) && std::is_integral_v<I>>
+assignFlags(void *v, I i) noexcept
+{
+    assignFlagsFromInteger(*static_cast<T *>(v), i);
+}
+#endif  // Qt 7
+
 } // namespace QtMocHelpers
 QT_END_NAMESPACE
 
diff --git a/src/tools/moc/generator.cpp b/src/tools/moc/generator.cpp
index 6d8f98b51b4..efd8ced3bc1 100644
--- a/src/tools/moc/generator.cpp
+++ b/src/tools/moc/generator.cpp
@@ -1535,9 +1535,11 @@ void Generator::generateStaticMetacall()
                 else if (p.gspec == PropertyDef::ReferenceSpec)
                     fprintf(out, "        case %d: _a[0] = const_cast<void*>(reinterpret_cast<const void*>(&%s%s())); break;\n",
                             propindex, prefix.constData(), p.read.constData());
+#if QT_VERSION <= QT_VERSION_CHECK(7, 0, 0)
                 else if (auto eflags = cdef->enumDeclarations.value(p.type); eflags & EnumIsFlag)
-                    fprintf(out, "        case %d: *reinterpret_cast<int*>(_v) = QFlag(%s%s()); break;\n",
-                            propindex, prefix.constData(), p.read.constData());
+                    fprintf(out, "        case %d: QtMocHelpers::assignFlags<%s>(_v, %s%s()); break;\n",
+                            propindex, p.type.constData(), prefix.constData(), p.read.constData());
+#endif
                 else if (p.read == "default")
                     fprintf(out, "        case %d: *reinterpret_cast< %s*>(_v) = %s%s().value(); break;\n",
                             propindex, p.type.constData(), prefix.constData(), p.bind.constData());
@@ -1567,10 +1569,7 @@ void Generator::generateStaticMetacall()
                 if (p.inPrivateClass.size()) {
                     prefix += p.inPrivateClass + "->";
                 }
-                if (auto eflags = cdef->enumDeclarations.value(p.type); eflags & EnumIsFlag) {
-                    fprintf(out, "        case %d: %s%s(QFlag(*reinterpret_cast<int*>(_v))); break;\n",
-                            propindex, prefix.constData(), p.write.constData());
-                } else if (p.write == "default") {
+                if (p.write == "default") {
                     fprintf(out, "        case %d: {\n", propindex);
                     fprintf(out, "            %s%s().setValue(*reinterpret_cast< %s*>(_v));\n",
                             prefix.constData(), p.bind.constData(), p.type.constData());
diff --git a/tests/auto/tools/moc/CMakeLists.txt b/tests/auto/tools/moc/CMakeLists.txt
index 92d022c5559..d4491b103b8 100644
--- a/tests/auto/tools/moc/CMakeLists.txt
+++ b/tests/auto/tools/moc/CMakeLists.txt
@@ -93,7 +93,17 @@ qt_internal_extend_target(tst_moc CONDITION CMAKE_CROSSCOMPILING
 )
 
 if (${PROJECT_VERSION_MAJOR} LESS 7)
-    qt_internal_extend_target(tst_moc SOURCES flags-property-integer-access.h)
+    # This file intentional produces a warning, so we use qt_wrap_cpp so we can
+    # suppress it.
+    qt_wrap_cpp(flags_property_moc flags-property-integer-access.h)
+    qt_internal_extend_target(tst_moc SOURCES ${flags_property_moc})
+    if (CLANG OR GCC)
+        set(Wno_deprecated "-Wno-deprecated-declarations")
+    elseif (MSVC)
+        # warning isn't triggering
+        set(Wno_deprecated "-wd4996")
+    endif()
+    set_source_files_properties(${flags_property_moc} COMPILE_FLAGS "${Wno_deprecated}")
 endif()
 
 if (UNIX AND (CLANG OR GCC OR QCC))