fix Qt5 build

Signed-off-by: Yuhang Zhao <2546789017@qq.com>
2022-07-07 16:22:34 +08:00 · 2022-07-07 16:22:34 +08:00 · 011b4a85f5
parent 389c8ad6d6
commit 011b4a85f5
28 changed files with 44 additions and 26 deletions
--- a/examples/deployqt.cmake
+++ b/examples/deployqt.cmake
@ -39,6 +39,10 @@ function(deploy_qt_libraries arg_target)
        return()
    endif()
    if(WIN32)
+        set(__old_deploy_params)
+        if(${QT_VERSION_MAJOR} LESS 6)
+            set(__old_deploy_params --no-webkit2 --no-angle)
+        endif()
        add_custom_command(TARGET ${arg_target} POST_BUILD COMMAND
            "${QT_DEPLOY_EXECUTABLE}"
            --dir "$<TARGET_FILE_DIR:${arg_target}>/qml"
@ -51,6 +55,8 @@ function(deploy_qt_libraries arg_target)
            --no-virtualkeyboard
            --no-compiler-runtime
            --no-opengl-sw
+            ${__old_deploy_params}
+            --verbose 2
            "$<TARGET_FILE:${arg_target}>"
        )
    elseif(APPLE)
--- a/include/FramelessHelper/Core/chromepalette.h
+++ b/include/FramelessHelper/Core/chromepalette.h
@ -125,4 +125,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(ChromePalette))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(ChromePalette))
--- a/include/FramelessHelper/Core/framelesshelper_qt.h
+++ b/include/FramelessHelper/Core/framelesshelper_qt.h
@ -46,4 +46,4 @@ protected:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessHelperQt))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessHelperQt))
--- a/include/FramelessHelper/Core/framelesshelper_win.h
+++ b/include/FramelessHelper/Core/framelesshelper_win.h
@ -44,4 +44,4 @@ public:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessHelperWin))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessHelperWin))
--- a/include/FramelessHelper/Core/framelesshelpercore_global.h
+++ b/include/FramelessHelper/Core/framelesshelpercore_global.h
@ -94,6 +94,14 @@ QT_END_NAMESPACE
 #  endif
 #endif

+#ifndef Q_DECLARE_METATYPE2
+#  if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+#    define Q_DECLARE_METATYPE2 Q_DECLARE_METATYPE
+#  else
+#    define Q_DECLARE_METATYPE2(Type)
+#  endif
+#endif
+
 #ifndef QUtf8String
 #  define QUtf8String(str) QString::fromUtf8(str)
 #endif
--- a/include/FramelessHelper/Core/framelessmanager.h
+++ b/include/FramelessHelper/Core/framelessmanager.h
@ -60,4 +60,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessManager))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessManager))
--- a/include/FramelessHelper/Core/private/chromepalette_p.h
+++ b/include/FramelessHelper/Core/private/chromepalette_p.h
@ -77,4 +77,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(ChromePalettePrivate))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(ChromePalettePrivate))
--- a/include/FramelessHelper/Core/private/framelessconfig_p.h
+++ b/include/FramelessHelper/Core/private/framelessconfig_p.h
@ -51,4 +51,4 @@ public:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessConfig))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessConfig))
--- a/include/FramelessHelper/Core/private/framelessmanager_p.h
+++ b/include/FramelessHelper/Core/private/framelessmanager_p.h
@ -67,4 +67,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessManagerPrivate))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessManagerPrivate))
--- a/include/FramelessHelper/Core/private/sysapiloader_p.h
+++ b/include/FramelessHelper/Core/private/sysapiloader_p.h
@ -63,7 +63,7 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(SysApiLoader))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(SysApiLoader))

 #ifdef Q_OS_WINDOWS
 #  define API_WIN_AVAILABLE(lib, func) (SysApiLoader::instance()->isAvailable(k##lib, k##func))
--- a/include/FramelessHelper/Quick/framelessquickhelper.h
+++ b/include/FramelessHelper/Quick/framelessquickhelper.h
@ -88,6 +88,6 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessQuickHelper))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessQuickHelper))
 QML_DECLARE_TYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessQuickHelper))
 QML_DECLARE_TYPEINFO(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessQuickHelper), QML_HAS_ATTACHED_PROPERTIES)
--- a/include/FramelessHelper/Quick/framelessquickutils.h
+++ b/include/FramelessHelper/Quick/framelessquickutils.h
@ -86,5 +86,5 @@ Q_SIGNALS:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessQuickUtils))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessQuickUtils))
 QML_DECLARE_TYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessQuickUtils))
--- a/include/FramelessHelper/Quick/private/framelessquickhelper_p.h
+++ b/include/FramelessHelper/Quick/private/framelessquickhelper_p.h
@ -88,4 +88,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessQuickHelperPrivate))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessQuickHelperPrivate))
--- a/include/FramelessHelper/Quick/quickchromepalette.h
+++ b/include/FramelessHelper/Quick/quickchromepalette.h
@ -45,5 +45,5 @@ public:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(QuickChromePalette))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(QuickChromePalette))
 QML_DECLARE_TYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(QuickChromePalette))
--- a/include/FramelessHelper/Widgets/framelessmainwindow.h
+++ b/include/FramelessHelper/Widgets/framelessmainwindow.h
@ -62,4 +62,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessMainWindow))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessMainWindow))
--- a/include/FramelessHelper/Widgets/framelesswidget.h
+++ b/include/FramelessHelper/Widgets/framelesswidget.h
@ -62,4 +62,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidget))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidget))
--- a/include/FramelessHelper/Widgets/framelesswidgetshelper.h
+++ b/include/FramelessHelper/Widgets/framelesswidgetshelper.h
@ -78,4 +78,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidgetsHelper))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidgetsHelper))
--- a/include/FramelessHelper/Widgets/private/framelessmainwindow_p.h
+++ b/include/FramelessHelper/Widgets/private/framelessmainwindow_p.h
@ -62,4 +62,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessMainWindowPrivate))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessMainWindowPrivate))
--- a/include/FramelessHelper/Widgets/private/framelesswidget_p.h
+++ b/include/FramelessHelper/Widgets/private/framelesswidget_p.h
@ -62,4 +62,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidgetPrivate))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidgetPrivate))
--- a/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h
+++ b/include/FramelessHelper/Widgets/private/framelesswidgetshelper_p.h
@ -85,4 +85,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidgetsHelperPrivate))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(FramelessWidgetsHelperPrivate))
--- a/include/FramelessHelper/Widgets/private/standardsystembutton_p.h
+++ b/include/FramelessHelper/Widgets/private/standardsystembutton_p.h
@ -93,4 +93,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(StandardSystemButtonPrivate))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(StandardSystemButtonPrivate))
--- a/include/FramelessHelper/Widgets/private/standardtitlebar_p.h
+++ b/include/FramelessHelper/Widgets/private/standardtitlebar_p.h
@ -94,4 +94,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(StandardTitleBarPrivate))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(StandardTitleBarPrivate))
--- a/include/FramelessHelper/Widgets/private/widgetssharedhelper_p.h
+++ b/include/FramelessHelper/Widgets/private/widgetssharedhelper_p.h
@ -62,4 +62,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(WidgetsSharedHelper))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(WidgetsSharedHelper))
--- a/include/FramelessHelper/Widgets/standardsystembutton.h
+++ b/include/FramelessHelper/Widgets/standardsystembutton.h
@ -91,4 +91,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(StandardSystemButton))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(StandardSystemButton))
--- a/include/FramelessHelper/Widgets/standardtitlebar.h
+++ b/include/FramelessHelper/Widgets/standardtitlebar.h
@ -84,4 +84,4 @@ private:

 FRAMELESSHELPER_END_NAMESPACE

-Q_DECLARE_METATYPE(FRAMELESSHELPER_PREPEND_NAMESPACE(StandardTitleBar))
+Q_DECLARE_METATYPE2(FRAMELESSHELPER_PREPEND_NAMESPACE(StandardTitleBar))
--- a/src/core/global.cpp
+++ b/src/core/global.cpp
@ -140,12 +140,14 @@ void initialize()
    qRegisterMetaType<VersionNumber>();
    qRegisterMetaType<SystemParameters>();
    qRegisterMetaType<VersionInfo>();
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
    qRegisterMetaType<FramelessManager>();
-#ifdef Q_OS_WINDOWS
+#  ifdef Q_OS_WINDOWS
    qRegisterMetaType<FramelessHelperWin>();
-#endif
+#  endif
    qRegisterMetaType<FramelessHelperQt>();
    qRegisterMetaType<ChromePalette>();
+#endif
 }

 void uninitialize()
--- a/src/quick/framelessquickmodule.cpp
+++ b/src/quick/framelessquickmodule.cpp
@ -72,10 +72,10 @@ void FramelessHelper::Quick::registerTypes(QQmlEngine *engine)
    qRegisterMetaType<QuickGlobal::BlurMode>();

    qRegisterMetaType<QuickGlobal>();
+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
    qRegisterMetaType<FramelessQuickUtils>();
    qRegisterMetaType<QuickChromePalette>();
    qRegisterMetaType<FramelessQuickHelper>();
-#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
    qRegisterMetaType<QuickStandardSystemButton>();
    qRegisterMetaType<QuickStandardTitleBar>();
    qRegisterMetaType<FramelessQuickWindow>();
--- a/src/widgets/global.cpp
+++ b/src/widgets/global.cpp
@ -44,11 +44,13 @@ void initialize()

    FramelessHelper::Core::initialize();

+#if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
    qRegisterMetaType<StandardTitleBar>();
    qRegisterMetaType<StandardSystemButton>();
    qRegisterMetaType<FramelessWidgetsHelper>();
    qRegisterMetaType<FramelessWidget>();
    qRegisterMetaType<FramelessMainWindow>();
+#endif
 }

 void uninitialize()