From 8d5ea9654875ab147389d2197edb665a51fd5f1d Mon Sep 17 00:00:00 2001 From: Fatih Uzunoglu Date: Tue, 19 Sep 2023 16:07:17 +0300 Subject: [PATCH] qt: add missing Q_MOC_INCLUDE --- modules/gui/qt/dialogs/dialogs/dialogmodel.hpp | 4 ++++ modules/gui/qt/dialogs/toolbar/controlbar_profile.hpp | 4 ++++ modules/gui/qt/maininterface/mainctx.hpp | 7 +++++++ modules/gui/qt/maininterface/videosurface.hpp | 4 ++++ modules/gui/qt/medialibrary/mlbookmarkmodel.hpp | 4 ++++ modules/gui/qt/menus/qml_menu_wrapper.hpp | 9 +++++++++ modules/gui/qt/network/networkdevicemodel.hpp | 4 ++++ modules/gui/qt/network/networkmediamodel.hpp | 4 ++++ modules/gui/qt/player/control_list_filter.hpp | 6 ++++++ modules/gui/qt/player/player_controlbar_model.hpp | 4 ++++ modules/gui/qt/style/colorcontext.hpp | 4 ++++ modules/gui/qt/style/systempalette.hpp | 3 +++ modules/gui/qt/util/csdbuttonmodel.hpp | 4 ++++ 13 files changed, 61 insertions(+) diff --git a/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp b/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp index 97c5c2dd30..e5b77acfeb 100644 --- a/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp +++ b/modules/gui/qt/dialogs/dialogs/dialogmodel.hpp @@ -35,6 +35,10 @@ #include "qt.hpp" #include "util/singleton.hpp" +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE("maininterface/mainctx.hpp") +#endif + class DialogId { Q_GADGET diff --git a/modules/gui/qt/dialogs/toolbar/controlbar_profile.hpp b/modules/gui/qt/dialogs/toolbar/controlbar_profile.hpp index fb1a22e73c..2a537b46de 100644 --- a/modules/gui/qt/dialogs/toolbar/controlbar_profile.hpp +++ b/modules/gui/qt/dialogs/toolbar/controlbar_profile.hpp @@ -23,6 +23,10 @@ #include #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE( "player/player_controlbar_model.hpp" ) +#endif + class PlayerControlbarModel; class ControlbarProfile : public QObject diff --git a/modules/gui/qt/maininterface/mainctx.hpp b/modules/gui/qt/maininterface/mainctx.hpp index 0db3013a71..f34b838e27 100644 --- a/modules/gui/qt/maininterface/mainctx.hpp +++ b/modules/gui/qt/maininterface/mainctx.hpp @@ -42,6 +42,13 @@ #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE( "dialogs/toolbar/controlbar_profile_model.hpp" ) +Q_MOC_INCLUDE( "util/csdbuttonmodel.hpp" ) +Q_MOC_INCLUDE( "playlist/playlist_controller.hpp" ) +Q_MOC_INCLUDE( "maininterface/mainctx_submodels.hpp" ) +#endif + class CSDButtonModel; class QSettings; class QCloseEvent; diff --git a/modules/gui/qt/maininterface/videosurface.hpp b/modules/gui/qt/maininterface/videosurface.hpp index 72ab9f9799..6e75893ca8 100644 --- a/modules/gui/qt/maininterface/videosurface.hpp +++ b/modules/gui/qt/maininterface/videosurface.hpp @@ -30,6 +30,10 @@ extern "C" { typedef struct vlc_window vlc_window_t; } +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE( "maininterface/mainctx.hpp") +#endif + class MainCtx; class WindowResizer : diff --git a/modules/gui/qt/medialibrary/mlbookmarkmodel.hpp b/modules/gui/qt/medialibrary/mlbookmarkmodel.hpp index b0a011e983..ea4ce07918 100644 --- a/modules/gui/qt/medialibrary/mlbookmarkmodel.hpp +++ b/modules/gui/qt/medialibrary/mlbookmarkmodel.hpp @@ -35,6 +35,10 @@ #include "mlhelper.hpp" #include "mlevent.hpp" +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE( "medialibrary/medialib.hpp" ) +Q_MOC_INCLUDE( "player/player_controller.hpp" ) +#endif class PlayerController; class MediaLib; diff --git a/modules/gui/qt/menus/qml_menu_wrapper.hpp b/modules/gui/qt/menus/qml_menu_wrapper.hpp index ac6c9ce2b1..ba6095c64a 100644 --- a/modules/gui/qt/menus/qml_menu_wrapper.hpp +++ b/modules/gui/qt/menus/qml_menu_wrapper.hpp @@ -27,6 +27,15 @@ #include "maininterface/mainctx.hpp" #include "util/list_selection_model.hpp" +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE("playlist/playlist_controller.hpp") +Q_MOC_INCLUDE("playlist/playlist_model.hpp") +Q_MOC_INCLUDE("network/networkdevicemodel.hpp") +Q_MOC_INCLUDE("network/networkmediamodel.hpp") +Q_MOC_INCLUDE("medialibrary/mlplaylistlistmodel.hpp") +Q_MOC_INCLUDE("medialibrary/mlplaylistmodel.hpp") +#endif + class MediaLib; class MLPlaylistListModel; class MLPlaylistModel; diff --git a/modules/gui/qt/network/networkdevicemodel.hpp b/modules/gui/qt/network/networkdevicemodel.hpp index 82466207b2..b2a81a7d71 100644 --- a/modules/gui/qt/network/networkdevicemodel.hpp +++ b/modules/gui/qt/network/networkdevicemodel.hpp @@ -33,6 +33,10 @@ #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE("maininterface/mainctx.hpp") +#endif + class MainCtx; class NetworkDeviceModelPrivate; diff --git a/modules/gui/qt/network/networkmediamodel.hpp b/modules/gui/qt/network/networkmediamodel.hpp index 8c95b64f68..16aac0b0e0 100644 --- a/modules/gui/qt/network/networkmediamodel.hpp +++ b/modules/gui/qt/network/networkmediamodel.hpp @@ -34,6 +34,10 @@ #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE( "maininterface/mainctx.hpp" ) +#endif + class MainCtx; using MediaSourcePtr = vlc_shared_data_ptr_type(vlc_media_source_t, diff --git a/modules/gui/qt/player/control_list_filter.hpp b/modules/gui/qt/player/control_list_filter.hpp index c7c30505b5..edc2eb5058 100644 --- a/modules/gui/qt/player/control_list_filter.hpp +++ b/modules/gui/qt/player/control_list_filter.hpp @@ -24,6 +24,12 @@ // Qt includes #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE("maininterface/mainctx.hpp") +Q_MOC_INCLUDE("player/player_controller.hpp") +Q_MOC_INCLUDE("player/control_list_model.hpp") +#endif + // Forward declarations class PlayerController; class MainCtx; diff --git a/modules/gui/qt/player/player_controlbar_model.hpp b/modules/gui/qt/player/player_controlbar_model.hpp index 39eb6ff428..1977630cd5 100644 --- a/modules/gui/qt/player/player_controlbar_model.hpp +++ b/modules/gui/qt/player/player_controlbar_model.hpp @@ -25,6 +25,10 @@ #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE( "player/control_list_model.hpp" ) +#endif + class ControlListModel; class PlayerControlbarModel : public QObject diff --git a/modules/gui/qt/style/colorcontext.hpp b/modules/gui/qt/style/colorcontext.hpp index f4dd357c55..75c849f62d 100644 --- a/modules/gui/qt/style/colorcontext.hpp +++ b/modules/gui/qt/style/colorcontext.hpp @@ -28,6 +28,10 @@ #include "qtthemeprovider.hpp" +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE("style/systempalette.hpp") +#endif + class SystemPalette; class ColorContext; class ColorContextState; diff --git a/modules/gui/qt/style/systempalette.hpp b/modules/gui/qt/style/systempalette.hpp index 806a77b094..e6b88881aa 100644 --- a/modules/gui/qt/style/systempalette.hpp +++ b/modules/gui/qt/style/systempalette.hpp @@ -37,6 +37,9 @@ class SystemPalette; class ColorProperty; class ColorContextState; +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE("maininterface/mainctx.hpp") +#endif class CSDMetrics : public QObject { Q_OBJECT diff --git a/modules/gui/qt/util/csdbuttonmodel.hpp b/modules/gui/qt/util/csdbuttonmodel.hpp index 2b95e76dc6..7accd15a4f 100644 --- a/modules/gui/qt/util/csdbuttonmodel.hpp +++ b/modules/gui/qt/util/csdbuttonmodel.hpp @@ -25,6 +25,10 @@ #include #include +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) +Q_MOC_INCLUDE("maininterface/mainctx.hpp") +#endif + class CSDButton : public QObject { Q_OBJECT