diff --git a/CMakeLists.txt b/CMakeLists.txt index 8f7857dc..678ce12e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -221,6 +221,20 @@ add_project_config(KEY "system_button" CONDITION NOT FRAMELESSHELPER_NO_SYSTEM_B add_project_config(KEY "native_impl" CONDITION FRAMELESSHELPER_NATIVE_IMPL) generate_project_config(PATH "${FRAMELESSHELPER_CONFIG_FILE}") +function(setup_custom_moc_macros) + cmake_parse_arguments(arg "" "" "TARGETS" ${ARGN}) + if(arg_UNPARSED_ARGUMENTS) + message(AUTHOR_WARNING "setup_custom_moc_macros: Unrecognized arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + foreach(__target ${arg_TARGETS}) + if(NOT TARGET ${__target}) + message(AUTHOR_WARNING "${__target} is not a valid CMake target!") + continue() + endif() + set_property(TARGET ${__target} APPEND PROPERTY AUTOMOC_MACRO_NAMES "FRAMELESSHELPER_QT_CLASS;FRAMELESSHELPER_PUBLIC_QT_CLASS;FRAMELESSHELPER_PRIVATE_QT_CLASS") + endforeach() +endfunction() + if(FRAMELESSHELPER_BUILD_WIDGETS OR FRAMELESSHELPER_BUILD_QUICK) add_subdirectory(src) endif() diff --git a/include/FramelessHelper/Core/chromepalette.h b/include/FramelessHelper/Core/chromepalette.h index ac20da87..e26a226d 100644 --- a/include/FramelessHelper/Core/chromepalette.h +++ b/include/FramelessHelper/Core/chromepalette.h @@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class ChromePalettePrivate; class FRAMELESSHELPER_CORE_API ChromePalette : public QObject { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(ChromePalette) Q_PROPERTY(QColor titleBarActiveBackgroundColor READ titleBarActiveBackgroundColor diff --git a/include/FramelessHelper/Core/framelesshelper_qt.h b/include/FramelessHelper/Core/framelesshelper_qt.h index a8d27409..7f00dd80 100644 --- a/include/FramelessHelper/Core/framelesshelper_qt.h +++ b/include/FramelessHelper/Core/framelesshelper_qt.h @@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FramelessHelperQtPrivate; class FRAMELESSHELPER_CORE_API FramelessHelperQt : public QObject { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessHelperQt) public: diff --git a/include/FramelessHelper/Core/framelesshelpercore_global.h b/include/FramelessHelper/Core/framelesshelpercore_global.h index 886f030a..26eec15f 100644 --- a/include/FramelessHelper/Core/framelesshelpercore_global.h +++ b/include/FramelessHelper/Core/framelesshelpercore_global.h @@ -316,6 +316,7 @@ QT_END_NAMESPACE #ifndef FRAMELESSHELPER_QT_CLASS # define FRAMELESSHELPER_QT_CLASS(Class) \ private: \ + Q_OBJECT \ FRAMELESSHELPER_CLASS_INFO \ FRAMELESSHELPER_CLASS(Class) #endif diff --git a/include/FramelessHelper/Core/framelessmanager.h b/include/FramelessHelper/Core/framelessmanager.h index a254a423..8adb8836 100644 --- a/include/FramelessHelper/Core/framelessmanager.h +++ b/include/FramelessHelper/Core/framelessmanager.h @@ -32,7 +32,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FramelessManagerPrivate; class FRAMELESSHELPER_CORE_API FramelessManager : public QObject { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessManager) Q_PROPERTY(Global::SystemTheme systemTheme READ systemTheme WRITE setOverrideTheme NOTIFY systemThemeChanged FINAL) Q_PROPERTY(QColor systemAccentColor READ systemAccentColor NOTIFY systemThemeChanged FINAL) diff --git a/include/FramelessHelper/Core/micamaterial.h b/include/FramelessHelper/Core/micamaterial.h index 5d244931..d00a1295 100644 --- a/include/FramelessHelper/Core/micamaterial.h +++ b/include/FramelessHelper/Core/micamaterial.h @@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class MicaMaterialPrivate; class FRAMELESSHELPER_CORE_API MicaMaterial : public QObject { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(MicaMaterial) Q_PROPERTY(QColor tintColor READ tintColor WRITE setTintColor NOTIFY tintColorChanged FINAL) diff --git a/include/FramelessHelper/Core/private/chromepalette_p.h b/include/FramelessHelper/Core/private/chromepalette_p.h index f18cc5b9..f69b9f53 100644 --- a/include/FramelessHelper/Core/private/chromepalette_p.h +++ b/include/FramelessHelper/Core/private/chromepalette_p.h @@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class ChromePalette; class FRAMELESSHELPER_CORE_API ChromePalettePrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(ChromePalette) public: diff --git a/include/FramelessHelper/Core/private/framelessconfig_p.h b/include/FramelessHelper/Core/private/framelessconfig_p.h index 1f330e71..f4bd9ef4 100644 --- a/include/FramelessHelper/Core/private/framelessconfig_p.h +++ b/include/FramelessHelper/Core/private/framelessconfig_p.h @@ -30,7 +30,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FRAMELESSHELPER_CORE_API FramelessConfig : public QObject { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(FramelessConfig) public: diff --git a/include/FramelessHelper/Core/private/framelessmanager_p.h b/include/FramelessHelper/Core/private/framelessmanager_p.h index 95e10c8b..81ba9859 100644 --- a/include/FramelessHelper/Core/private/framelessmanager_p.h +++ b/include/FramelessHelper/Core/private/framelessmanager_p.h @@ -36,7 +36,6 @@ using FramelessDataPtr = std::shared_ptr; class FramelessManager; class FRAMELESSHELPER_CORE_API FramelessManagerPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessManager) public: diff --git a/include/FramelessHelper/Core/private/micamaterial_p.h b/include/FramelessHelper/Core/private/micamaterial_p.h index a7677fae..21592d43 100644 --- a/include/FramelessHelper/Core/private/micamaterial_p.h +++ b/include/FramelessHelper/Core/private/micamaterial_p.h @@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class MicaMaterial; class FRAMELESSHELPER_CORE_API MicaMaterialPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(MicaMaterial) public: diff --git a/include/FramelessHelper/Core/private/registrykey_p.h b/include/FramelessHelper/Core/private/registrykey_p.h index 8290bacf..edb31038 100644 --- a/include/FramelessHelper/Core/private/registrykey_p.h +++ b/include/FramelessHelper/Core/private/registrykey_p.h @@ -60,7 +60,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FRAMELESSHELPER_CORE_API RegistryKey : public QObject { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(RegistryKey) public: diff --git a/include/FramelessHelper/Core/private/sysapiloader_p.h b/include/FramelessHelper/Core/private/sysapiloader_p.h index e855047e..808454a1 100644 --- a/include/FramelessHelper/Core/private/sysapiloader_p.h +++ b/include/FramelessHelper/Core/private/sysapiloader_p.h @@ -30,7 +30,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FRAMELESSHELPER_CORE_API SysApiLoader : public QObject { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(SysApiLoader) public: diff --git a/include/FramelessHelper/Core/private/windowborderpainter_p.h b/include/FramelessHelper/Core/private/windowborderpainter_p.h index a494ef46..95ebe8b4 100644 --- a/include/FramelessHelper/Core/private/windowborderpainter_p.h +++ b/include/FramelessHelper/Core/private/windowborderpainter_p.h @@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class WindowBorderPainter; class FRAMELESSHELPER_CORE_API WindowBorderPainterPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(WindowBorderPainter) public: diff --git a/include/FramelessHelper/Core/windowborderpainter.h b/include/FramelessHelper/Core/windowborderpainter.h index 62eb0493..daca70ad 100644 --- a/include/FramelessHelper/Core/windowborderpainter.h +++ b/include/FramelessHelper/Core/windowborderpainter.h @@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class WindowBorderPainterPrivate; class FRAMELESSHELPER_CORE_API WindowBorderPainter : public QObject { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(WindowBorderPainter) Q_PROPERTY(int thickness READ thickness WRITE setThickness NOTIFY thicknessChanged FINAL) diff --git a/include/FramelessHelper/Quick/framelesshelperquick_global.h b/include/FramelessHelper/Quick/framelesshelperquick_global.h index 4c922a53..afbc8eee 100644 --- a/include/FramelessHelper/Quick/framelesshelperquick_global.h +++ b/include/FramelessHelper/Quick/framelesshelperquick_global.h @@ -87,7 +87,6 @@ FRAMELESSHELPER_QUICK_API void FramelessHelperQuickRegisterTypes(QQmlEngine *); class FRAMELESSHELPER_QUICK_API QuickGlobal : public QObject { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(QuickGlobal) #ifdef QML_NAMED_ELEMENT QML_NAMED_ELEMENT(FramelessHelperConstants) diff --git a/include/FramelessHelper/Quick/framelessquickhelper.h b/include/FramelessHelper/Quick/framelessquickhelper.h index 77a2dcef..c49155ab 100644 --- a/include/FramelessHelper/Quick/framelessquickhelper.h +++ b/include/FramelessHelper/Quick/framelessquickhelper.h @@ -41,7 +41,6 @@ class QuickWindowBorder; class FramelessQuickHelperPrivate; class FRAMELESSHELPER_QUICK_API FramelessQuickHelper : public QQuickItem { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickHelper) #ifdef QML_NAMED_ELEMENT QML_NAMED_ELEMENT(FramelessHelper) diff --git a/include/FramelessHelper/Quick/framelessquickutils.h b/include/FramelessHelper/Quick/framelessquickutils.h index a2851ff0..3950fc02 100644 --- a/include/FramelessHelper/Quick/framelessquickutils.h +++ b/include/FramelessHelper/Quick/framelessquickutils.h @@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FRAMELESSHELPER_QUICK_API FramelessQuickUtils : public QObject, public QQmlParserStatus { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(FramelessQuickUtils) Q_INTERFACES(QQmlParserStatus) #ifdef QML_NAMED_ELEMENT diff --git a/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h b/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h index bb8499b3..3212b68d 100644 --- a/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h +++ b/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p.h @@ -36,7 +36,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FramelessQuickApplicationWindowPrivate; class FRAMELESSHELPER_QUICK_API FramelessQuickApplicationWindow : public QQuickApplicationWindow { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickApplicationWindow) #ifdef QML_NAMED_ELEMENT QML_NAMED_ELEMENT(FramelessApplicationWindow) diff --git a/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p_p.h b/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p_p.h index ab9a9762..58fb926e 100644 --- a/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p_p.h +++ b/include/FramelessHelper/Quick/private/framelessquickapplicationwindow_p_p.h @@ -39,7 +39,6 @@ class QuickWindowBorder; class FramelessQuickApplicationWindow; class FRAMELESSHELPER_QUICK_API FramelessQuickApplicationWindowPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickApplicationWindow) public: diff --git a/include/FramelessHelper/Quick/private/framelessquickhelper_p.h b/include/FramelessHelper/Quick/private/framelessquickhelper_p.h index 037b28d1..d7ac9b10 100644 --- a/include/FramelessHelper/Quick/private/framelessquickhelper_p.h +++ b/include/FramelessHelper/Quick/private/framelessquickhelper_p.h @@ -44,7 +44,6 @@ class QuickWindowBorder; class FramelessQuickHelper; class FRAMELESSHELPER_QUICK_API FramelessQuickHelperPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickHelper) public: diff --git a/include/FramelessHelper/Quick/private/framelessquickwindow_p.h b/include/FramelessHelper/Quick/private/framelessquickwindow_p.h index 9052cd0e..9e6aca93 100644 --- a/include/FramelessHelper/Quick/private/framelessquickwindow_p.h +++ b/include/FramelessHelper/Quick/private/framelessquickwindow_p.h @@ -36,7 +36,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FramelessQuickWindowPrivate; class FRAMELESSHELPER_QUICK_API FramelessQuickWindow : public QQuickWindowQmlImpl { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessQuickWindow) #ifdef QML_NAMED_ELEMENT QML_NAMED_ELEMENT(FramelessWindow) diff --git a/include/FramelessHelper/Quick/private/framelessquickwindow_p_p.h b/include/FramelessHelper/Quick/private/framelessquickwindow_p_p.h index e645be54..dfe418bd 100644 --- a/include/FramelessHelper/Quick/private/framelessquickwindow_p_p.h +++ b/include/FramelessHelper/Quick/private/framelessquickwindow_p_p.h @@ -39,7 +39,6 @@ class QuickWindowBorder; class FramelessQuickWindow; class FRAMELESSHELPER_QUICK_API FramelessQuickWindowPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessQuickWindow) public: diff --git a/include/FramelessHelper/Quick/private/quickimageitem_p.h b/include/FramelessHelper/Quick/private/quickimageitem_p.h index 9e0a5f9c..4f5bf45d 100644 --- a/include/FramelessHelper/Quick/private/quickimageitem_p.h +++ b/include/FramelessHelper/Quick/private/quickimageitem_p.h @@ -32,7 +32,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FRAMELESSHELPER_QUICK_API QuickImageItem : public QQuickPaintedItem { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(QuickImageItem) #ifdef QML_NAMED_ELEMENT QML_NAMED_ELEMENT(ImageItem) diff --git a/include/FramelessHelper/Quick/private/quickmicamaterial_p.h b/include/FramelessHelper/Quick/private/quickmicamaterial_p.h index ea56a117..4c654e11 100644 --- a/include/FramelessHelper/Quick/private/quickmicamaterial_p.h +++ b/include/FramelessHelper/Quick/private/quickmicamaterial_p.h @@ -35,7 +35,6 @@ class MicaMaterial; class QuickMicaMaterial; class FRAMELESSHELPER_QUICK_API QuickMicaMaterialPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(QuickMicaMaterial) public: diff --git a/include/FramelessHelper/Quick/private/quickstandardsystembutton_p.h b/include/FramelessHelper/Quick/private/quickstandardsystembutton_p.h index b0bc75dd..a26cdbfa 100644 --- a/include/FramelessHelper/Quick/private/quickstandardsystembutton_p.h +++ b/include/FramelessHelper/Quick/private/quickstandardsystembutton_p.h @@ -39,7 +39,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FRAMELESSHELPER_QUICK_API QuickStandardSystemButton : public QQuickButton { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(QuickStandardSystemButton) #ifdef QML_NAMED_ELEMENT QML_NAMED_ELEMENT(StandardSystemButton) diff --git a/include/FramelessHelper/Quick/private/quickstandardtitlebar_p.h b/include/FramelessHelper/Quick/private/quickstandardtitlebar_p.h index 2d8681f8..c6e00b8b 100644 --- a/include/FramelessHelper/Quick/private/quickstandardtitlebar_p.h +++ b/include/FramelessHelper/Quick/private/quickstandardtitlebar_p.h @@ -45,7 +45,6 @@ class QuickImageItem; class FRAMELESSHELPER_QUICK_API QuickStandardTitleBar : public QQuickRectangle { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(QuickStandardTitleBar) #ifdef QML_NAMED_ELEMENT QML_NAMED_ELEMENT(StandardTitleBar) diff --git a/include/FramelessHelper/Quick/private/quickwindowborder_p.h b/include/FramelessHelper/Quick/private/quickwindowborder_p.h index 74dd31fd..013142af 100644 --- a/include/FramelessHelper/Quick/private/quickwindowborder_p.h +++ b/include/FramelessHelper/Quick/private/quickwindowborder_p.h @@ -35,7 +35,6 @@ class WindowBorderPainter; class QuickWindowBorder; class FRAMELESSHELPER_QUICK_API QuickWindowBorderPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(QuickWindowBorder) public: diff --git a/include/FramelessHelper/Quick/quickchromepalette.h b/include/FramelessHelper/Quick/quickchromepalette.h index 2d1c91b8..25c564e7 100644 --- a/include/FramelessHelper/Quick/quickchromepalette.h +++ b/include/FramelessHelper/Quick/quickchromepalette.h @@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FRAMELESSHELPER_QUICK_API QuickChromePalette : public ChromePalette, public QQmlParserStatus { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(QuickChromePalette) Q_INTERFACES(QQmlParserStatus) #ifdef QML_ANONYMOUS diff --git a/include/FramelessHelper/Quick/quickmicamaterial.h b/include/FramelessHelper/Quick/quickmicamaterial.h index 69abe6ef..8f8b8bc7 100644 --- a/include/FramelessHelper/Quick/quickmicamaterial.h +++ b/include/FramelessHelper/Quick/quickmicamaterial.h @@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class QuickMicaMaterialPrivate; class FRAMELESSHELPER_QUICK_API QuickMicaMaterial : public QQuickPaintedItem { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(QuickMicaMaterial) #ifdef QML_NAMED_ELEMENT QML_NAMED_ELEMENT(MicaMaterial) diff --git a/include/FramelessHelper/Quick/quickwindowborder.h b/include/FramelessHelper/Quick/quickwindowborder.h index d3a61460..c4afc477 100644 --- a/include/FramelessHelper/Quick/quickwindowborder.h +++ b/include/FramelessHelper/Quick/quickwindowborder.h @@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class QuickWindowBorderPrivate; class FRAMELESSHELPER_QUICK_API QuickWindowBorder : public QQuickPaintedItem { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(QuickWindowBorder) #ifdef QML_NAMED_ELEMENT QML_NAMED_ELEMENT(WindowBorder) diff --git a/include/FramelessHelper/Widgets/framelessdialog.h b/include/FramelessHelper/Widgets/framelessdialog.h index 1060969a..a2242820 100644 --- a/include/FramelessHelper/Widgets/framelessdialog.h +++ b/include/FramelessHelper/Widgets/framelessdialog.h @@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FramelessDialogPrivate; class FRAMELESSHELPER_WIDGETS_API FramelessDialog : public QDialog { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessDialog) public: diff --git a/include/FramelessHelper/Widgets/framelessmainwindow.h b/include/FramelessHelper/Widgets/framelessmainwindow.h index 36913405..2f6511f3 100644 --- a/include/FramelessHelper/Widgets/framelessmainwindow.h +++ b/include/FramelessHelper/Widgets/framelessmainwindow.h @@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FramelessMainWindowPrivate; class FRAMELESSHELPER_WIDGETS_API FramelessMainWindow : public QMainWindow { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessMainWindow) Q_PROPERTY(bool hidden READ isHidden NOTIFY hiddenChanged FINAL) Q_PROPERTY(bool normal READ isNormal NOTIFY normalChanged FINAL) diff --git a/include/FramelessHelper/Widgets/framelesswidget.h b/include/FramelessHelper/Widgets/framelesswidget.h index cc55c165..8be48a78 100644 --- a/include/FramelessHelper/Widgets/framelesswidget.h +++ b/include/FramelessHelper/Widgets/framelesswidget.h @@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class FramelessWidgetPrivate; class FRAMELESSHELPER_WIDGETS_API FramelessWidget : public QWidget { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessWidget) Q_PROPERTY(bool hidden READ isHidden NOTIFY hiddenChanged FINAL) Q_PROPERTY(bool normal READ isNormal NOTIFY normalChanged FINAL) diff --git a/include/FramelessHelper/Widgets/framelesswidgetshelper.h b/include/FramelessHelper/Widgets/framelesswidgetshelper.h index 16f68cd8..9c992aef 100644 --- a/include/FramelessHelper/Widgets/framelesswidgetshelper.h +++ b/include/FramelessHelper/Widgets/framelesswidgetshelper.h @@ -40,7 +40,6 @@ class WindowBorderPainter; class FramelessWidgetsHelperPrivate; class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelper : public QObject { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(FramelessWidgetsHelper) Q_PROPERTY(QWidget* titleBarWidget READ titleBarWidget WRITE setTitleBarWidget NOTIFY titleBarWidgetChanged FINAL) Q_PROPERTY(bool windowFixedSize READ isWindowFixedSize WRITE setWindowFixedSize NOTIFY windowFixedSizeChanged FINAL) diff --git a/include/FramelessHelper/Widgets/private/framelessdialog_p.h b/include/FramelessHelper/Widgets/private/framelessdialog_p.h index 4ca5789e..3a02425c 100644 --- a/include/FramelessHelper/Widgets/private/framelessdialog_p.h +++ b/include/FramelessHelper/Widgets/private/framelessdialog_p.h @@ -35,7 +35,6 @@ class WidgetsSharedHelper; class FramelessDialog; class FRAMELESSHELPER_WIDGETS_API FramelessDialogPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessDialog) public: diff --git a/include/FramelessHelper/Widgets/private/framelessmainwindow_p.h b/include/FramelessHelper/Widgets/private/framelessmainwindow_p.h index 0beff06d..754df3ea 100644 --- a/include/FramelessHelper/Widgets/private/framelessmainwindow_p.h +++ b/include/FramelessHelper/Widgets/private/framelessmainwindow_p.h @@ -35,7 +35,6 @@ class WidgetsSharedHelper; class FramelessMainWindow; class FRAMELESSHELPER_WIDGETS_API FramelessMainWindowPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessMainWindow) public: diff --git a/include/FramelessHelper/Widgets/private/framelesswidget_p.h b/include/FramelessHelper/Widgets/private/framelesswidget_p.h index aebb0545..58ec75d1 100644 --- a/include/FramelessHelper/Widgets/private/framelesswidget_p.h +++ b/include/FramelessHelper/Widgets/private/framelesswidget_p.h @@ -35,7 +35,6 @@ class WidgetsSharedHelper; class FramelessWidget; class FRAMELESSHELPER_WIDGETS_API FramelessWidgetPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessWidget) public: diff --git a/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h b/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h index cd9c2f60..d544d037 100644 --- a/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h +++ b/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h @@ -42,7 +42,6 @@ class WidgetsSharedHelper; class FramelessWidgetsHelper; class FRAMELESSHELPER_WIDGETS_API FramelessWidgetsHelperPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(FramelessWidgetsHelper) public: diff --git a/include/FramelessHelper/Widgets/private/standardsystembutton_p.h b/include/FramelessHelper/Widgets/private/standardsystembutton_p.h index 976c56f5..1d97656f 100644 --- a/include/FramelessHelper/Widgets/private/standardsystembutton_p.h +++ b/include/FramelessHelper/Widgets/private/standardsystembutton_p.h @@ -34,7 +34,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class StandardSystemButton; class FRAMELESSHELPER_WIDGETS_API StandardSystemButtonPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(StandardSystemButton) public: diff --git a/include/FramelessHelper/Widgets/private/standardtitlebar_p.h b/include/FramelessHelper/Widgets/private/standardtitlebar_p.h index 0ea8bcd5..892a974e 100644 --- a/include/FramelessHelper/Widgets/private/standardtitlebar_p.h +++ b/include/FramelessHelper/Widgets/private/standardtitlebar_p.h @@ -44,7 +44,6 @@ class ChromePalette; class StandardTitleBar; class FRAMELESSHELPER_WIDGETS_API StandardTitleBarPrivate : public QObject { - Q_OBJECT FRAMELESSHELPER_PRIVATE_QT_CLASS(StandardTitleBar) public: diff --git a/include/FramelessHelper/Widgets/private/widgetssharedhelper_p.h b/include/FramelessHelper/Widgets/private/widgetssharedhelper_p.h index 6b567789..16224385 100644 --- a/include/FramelessHelper/Widgets/private/widgetssharedhelper_p.h +++ b/include/FramelessHelper/Widgets/private/widgetssharedhelper_p.h @@ -38,7 +38,6 @@ class WindowBorderPainter; class FRAMELESSHELPER_WIDGETS_API WidgetsSharedHelper : public QObject { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(WidgetsSharedHelper) #if FRAMELESSHELPER_CONFIG(mica_material) Q_PROPERTY(bool micaEnabled READ isMicaEnabled WRITE setMicaEnabled NOTIFY micaEnabledChanged FINAL) diff --git a/include/FramelessHelper/Widgets/standardsystembutton.h b/include/FramelessHelper/Widgets/standardsystembutton.h index e8cc8cbb..6de9753c 100644 --- a/include/FramelessHelper/Widgets/standardsystembutton.h +++ b/include/FramelessHelper/Widgets/standardsystembutton.h @@ -35,7 +35,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class StandardSystemButtonPrivate; class FRAMELESSHELPER_WIDGETS_API StandardSystemButton : public QPushButton { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(StandardSystemButton) Q_PROPERTY(Global::SystemButtonType buttonType READ buttonType WRITE setButtonType NOTIFY buttonTypeChanged FINAL) Q_PROPERTY(QString glyph READ glyph WRITE setGlyph NOTIFY glyphChanged FINAL) diff --git a/include/FramelessHelper/Widgets/standardtitlebar.h b/include/FramelessHelper/Widgets/standardtitlebar.h index 050e6e37..ff8870ae 100644 --- a/include/FramelessHelper/Widgets/standardtitlebar.h +++ b/include/FramelessHelper/Widgets/standardtitlebar.h @@ -40,7 +40,6 @@ FRAMELESSHELPER_BEGIN_NAMESPACE class StandardTitleBarPrivate; class FRAMELESSHELPER_WIDGETS_API StandardTitleBar : public QWidget { - Q_OBJECT FRAMELESSHELPER_PUBLIC_QT_CLASS(StandardTitleBar) Q_PROPERTY(Qt::Alignment titleLabelAlignment READ titleLabelAlignment WRITE setTitleLabelAlignment NOTIFY titleLabelAlignmentChanged FINAL) #if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button)) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 504ea00d..c0009475 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -281,6 +281,7 @@ if(NOT FRAMELESSHELPER_BUILD_STATIC) endif() setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET}) +setup_custom_moc_macros(TARGETS ${SUB_MODULE_TARGET}) set(__extra_flags "") if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS) diff --git a/src/core/framelessmanager.cpp b/src/core/framelessmanager.cpp index 53df4e8e..a871426c 100644 --- a/src/core/framelessmanager.cpp +++ b/src/core/framelessmanager.cpp @@ -45,7 +45,6 @@ #include #include #include -#include #if (QT_VERSION >= QT_VERSION_CHECK(6, 5, 0)) # include # include @@ -108,7 +107,6 @@ Q_GLOBAL_STATIC(InternalData, g_internalData) class InternalEventFilter : public QObject { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(InternalEventFilter) public: diff --git a/src/core/micamaterial.cpp b/src/core/micamaterial.cpp index 5dc5db61..f5fadcd8 100644 --- a/src/core/micamaterial.cpp +++ b/src/core/micamaterial.cpp @@ -492,7 +492,6 @@ static inline void expblur(QImage &img, qreal radius, const bool improvedQuality class WallpaperThread : public FramelessHelperThreadClass { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(WallpaperThread) public: diff --git a/src/core/utils_mac.mm b/src/core/utils_mac.mm index 7093254f..379f8d03 100644 --- a/src/core/utils_mac.mm +++ b/src/core/utils_mac.mm @@ -222,7 +222,6 @@ static void notifySystemThemeChange() class NSWindowProxy : public QObject { - Q_OBJECT FRAMELESSHELPER_QT_CLASS(NSWindowProxy) public: diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt index ef270e9c..71f3f9f5 100644 --- a/src/quick/CMakeLists.txt +++ b/src/quick/CMakeLists.txt @@ -261,6 +261,7 @@ if(NOT FRAMELESSHELPER_BUILD_STATIC) endif() setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET} ALLOW_KEYWORD) +setup_custom_moc_macros(TARGETS ${SUB_MODULE_TARGET}) set(__extra_flags "") if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index a23013ef..91a1a5ce 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -153,6 +153,7 @@ if(NOT FRAMELESSHELPER_BUILD_STATIC) endif() setup_qt_stuff(TARGETS ${SUB_MODULE_TARGET}) +setup_custom_moc_macros(TARGETS ${SUB_MODULE_TARGET}) set(__extra_flags "") if(NOT FRAMELESSHELPER_NO_PERMISSIVE_CHECKS)