diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2022-01-03 18:56:09 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2022-02-05 07:25:19 +0100 |
| commit | db98b0d52b1ebd388bf9fc0ed2b1fefd01515927 (patch) | |
| tree | 9ee34f16582b614dd261de0d883de6f18a79fedb /src/compositor | |
| parent | 88bc19d0f7eb04d43cef6c5be0e0e31ad4ecf8fc (diff) | |
| download | qtwayland-db98b0d52b1ebd388bf9fc0ed2b1fefd01515927.tar.gz | |
Adapt to moving of type registrations into the Qt namespace
... and make the type registration function private. As we already have
a private global header, let's use it. The public global header should
not have the "We mean it" warning either.
Change-Id: If4424652528c7886ce56e676d633aa3968f3772b
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/compositor')
| -rw-r--r-- | src/compositor/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/compositor/global/qtwaylandcompositorglobal.h | 15 | ||||
| -rw-r--r-- | src/compositor/global/qtwaylandcompositorglobal_p.h | 8 |
3 files changed, 9 insertions, 16 deletions
diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt index 560597bb..e2113629 100644 --- a/src/compositor/CMakeLists.txt +++ b/src/compositor/CMakeLists.txt @@ -42,7 +42,7 @@ qt_internal_add_module(WaylandCompositor extensions/qwaylandxdgshell.cpp extensions/qwaylandxdgshell.h extensions/qwaylandxdgshell_p.h extensions/qwlqtkey.cpp extensions/qwlqtkey_p.h extensions/qwlqttouch.cpp extensions/qwlqttouch_p.h - global/qtwaylandcompositorglobal.h + global/qtwaylandcompositorglobal.h global/qtwaylandcompositorglobal_p.h global/qtwaylandqmlinclude.h global/qwaylandcompositorextension.cpp global/qwaylandcompositorextension.h global/qwaylandcompositorextension_p.h global/qwaylandquickextension.h diff --git a/src/compositor/global/qtwaylandcompositorglobal.h b/src/compositor/global/qtwaylandcompositorglobal.h index 4c5e51ed..5afeb4bf 100644 --- a/src/compositor/global/qtwaylandcompositorglobal.h +++ b/src/compositor/global/qtwaylandcompositorglobal.h @@ -30,17 +30,6 @@ #ifndef QWAYLANDCOMPOSITORGLOBAL_H #define QWAYLANDCOMPOSITORGLOBAL_H -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - #include <QtGui/qtguiglobal.h> #include <QtWaylandCompositor/qtwaylandcompositor-config.h> @@ -58,9 +47,5 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -#if QT_CONFIG(wayland_compositor_quick) -void Q_WAYLAND_COMPOSITOR_EXPORT qml_register_types_QtWayland_Compositor(); -#endif - #endif // QWAYLANDCOMPOSITORGLOBAL_H diff --git a/src/compositor/global/qtwaylandcompositorglobal_p.h b/src/compositor/global/qtwaylandcompositorglobal_p.h index 102e738e..aa7784bd 100644 --- a/src/compositor/global/qtwaylandcompositorglobal_p.h +++ b/src/compositor/global/qtwaylandcompositorglobal_p.h @@ -46,5 +46,13 @@ #include <QtGui/private/qtguiglobal_p.h> #include <QtWaylandCompositor/private/qtwaylandcompositor-config_p.h> +QT_BEGIN_NAMESPACE + +#if QT_CONFIG(wayland_compositor_quick) +void Q_WAYLAND_COMPOSITOR_EXPORT qml_register_types_QtWayland_Compositor(); +#endif + +QT_END_NAMESPACE + #endif // QWAYLANDCOMPOSITORGLOBAL_P_H |