fix: incorrect registering way for qt6

Removing warning. pms: BUG-368399
linuxdeepin · Jan 3, 2025 · ee6314e · ee6314e
1 parent 0e0e63d
commit ee6314e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/qt6/src/dquickextendregister_p.h b/qt6/src/dquickextendregister_p.h
@@ -5,6 +5,7 @@
 
 #include <dtkdeclarative_global.h>
 
+#include "dqmlglobalobject_p.h"
 #include <DWindowManagerHelper>
 #include <DGuiApplicationHelper>
 #include <DFontManager>
@@ -15,6 +16,13 @@
 DQUICK_BEGIN_NAMESPACE
 DGUI_USE_NAMESPACE
 
+namespace DColorForeign
+{
+    Q_NAMESPACE
+    QML_NAMED_ELEMENT(Color)
+    QML_FOREIGN_NAMESPACE(DTK_QUICK_NAMESPACE::DColor)
+};
+
 struct WindowManagerHelperForeign
 {
     Q_GADGET
@@ -57,6 +65,7 @@ struct DPlatformHandleForeign
     Q_GADGET
     QML_FOREIGN(DPlatformHandle)
     QML_NAMED_ELEMENT(PlatformHandle)
+    QML_UNCREATABLE("PlatformHandle")
 };
 
 DQUICK_END_NAMESPACE
diff --git a/src/private/dqmlglobalobject_p.h b/src/private/dqmlglobalobject_p.h
@@ -36,11 +36,7 @@ DQUICK_BEGIN_NAMESPACE
 class DColor
 {
     Q_GADGET
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-    QML_ANONYMOUS
-    QML_NAMED_ELEMENT(Color)
-    QML_UNCREATABLE("Color is only available as enums.")
-#endif
+    QML_VALUE_TYPE(color)
 public:
     enum Type : quint8 {
         Invalid = 0,