Skip to content

sync: from linuxdeepin/dtkdeclarative #218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
18202781743 merged 1 commit into from
Jan 7, 2025
Merged

sync: from linuxdeepin/dtkdeclarative #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions qt6/src/dquickextendregister_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

#include <dtkdeclarative_global.h>

#include "dqmlglobalobject_p.h"
#include <DWindowManagerHelper>
#include <DGuiApplicationHelper>
#include <DFontManager>
Expand All @@ -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
Expand Down Expand Up @@ -57,6 +65,7 @@ struct DPlatformHandleForeign
Q_GADGET
QML_FOREIGN(DPlatformHandle)
QML_NAMED_ELEMENT(PlatformHandle)
QML_UNCREATABLE("PlatformHandle")
};

DQUICK_END_NAMESPACE
4 changes: 1 addition & 3 deletions src/private/dqmlglobalobject_p.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading