diff --git a/src/main.cpp b/src/main.cpp index fdfd195f3..2034816d4 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -29,7 +29,6 @@ int main(int argc, char *argv[]) QGuiApplication::setQuitOnLastWindowClosed(false); QGuiApplication app(argc, argv); - qRegisterMetaType("qw_buffer*"); app.setOrganizationName("deepin"); app.setApplicationName("treeland"); diff --git a/src/modules/prelaunch-splash/prelaunchsplash.h b/src/modules/prelaunch-splash/prelaunchsplash.h index 2b9d59404..9dc1d04d4 100644 --- a/src/modules/prelaunch-splash/prelaunchsplash.h +++ b/src/modules/prelaunch-splash/prelaunchsplash.h @@ -5,12 +5,12 @@ #include #include - #include +#include #include -#include +Q_MOC_INCLUDE() WAYLIB_SERVER_USE_NAMESPACE QW_USE_NAMESPACE @@ -23,7 +23,6 @@ QW_BEGIN_NAMESPACE class qw_display; class qw_buffer; QW_END_NAMESPACE -Q_DECLARE_OPAQUE_POINTER(QW_NAMESPACE::qw_buffer *) class PrelaunchSplashPrivate; struct wl_global; @@ -52,3 +51,5 @@ class PrelaunchSplash private: std::unique_ptr d; }; + +Q_DECLARE_OPAQUE_POINTER(QW_NAMESPACE::qw_buffer*) diff --git a/waylib/src/server/qtquick/wbufferitem.h b/waylib/src/server/qtquick/wbufferitem.h index d3f7caac8..6a5f69b2d 100644 --- a/waylib/src/server/qtquick/wbufferitem.h +++ b/waylib/src/server/qtquick/wbufferitem.h @@ -6,15 +6,13 @@ #include #include #include +#include + +Q_MOC_INCLUDE() #include #include -QW_BEGIN_NAMESPACE -class qw_buffer; -QW_END_NAMESPACE -Q_DECLARE_OPAQUE_POINTER(QW_NAMESPACE::qw_buffer*) - QT_BEGIN_NAMESPACE class QSGTextureProvider; QT_END_NAMESPACE @@ -60,3 +58,4 @@ class WAYLIB_SERVER_EXPORT WBufferItem : public QQuickItem, public virtual WText WAYLIB_SERVER_END_NAMESPACE Q_DECLARE_METATYPE(WAYLIB_SERVER_NAMESPACE::WBufferItem*) +Q_DECLARE_OPAQUE_POINTER(QW_NAMESPACE::qw_buffer*)