From b827ea42ef333fd805fcf47aa8810750e9e9cb3f Mon Sep 17 00:00:00 2001 From: deepin-ci-robot Date: Tue, 7 Jan 2025 06:33:24 +0000 Subject: [PATCH] sync: from linuxdeepin/dtkdeclarative Synchronize source files from linuxdeepin/dtkdeclarative. Source-pull-request: https://github.com/linuxdeepin/dtkdeclarative/pull/449 --- qt6/src/dquickextendregister_p.h | 9 +++++++++ src/private/dqmlglobalobject_p.h | 4 +--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/qt6/src/dquickextendregister_p.h b/qt6/src/dquickextendregister_p.h index 605d9b42..bb583603 100644 --- a/qt6/src/dquickextendregister_p.h +++ b/qt6/src/dquickextendregister_p.h @@ -5,6 +5,7 @@ #include +#include "dqmlglobalobject_p.h" #include #include #include @@ -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 index 06b1e0d7..f7372406 100644 --- a/src/private/dqmlglobalobject_p.h +++ b/src/private/dqmlglobalobject_p.h @@ -37,9 +37,7 @@ 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.") + QML_VALUE_TYPE(dcolor) #endif public: enum Type : quint8 {