diff --git a/src/SARibbonBar/SARibbonBar.pri b/src/SARibbonBar/SARibbonBar.pri index b1ce321..e30f65c 100644 --- a/src/SARibbonBar/SARibbonBar.pri +++ b/src/SARibbonBar/SARibbonBar.pri @@ -1,21 +1,4 @@ -# 这里要做如下改动: -# 1.framelesshelper/qmake/inc/core/framelesshelper.config中的FRAMELESSHELPER_FEATURE_static_build设置为-1 -# 2.要预定义FRAMELESSHELPER_CORE_LIBRARY宏,这样才能导出符号 -# 3.要预定义FRAMELESSHELPER_WIDGETS_LIBRARY宏,这样才能导出符号 -!contains( SA_RIBBON_CONFIG, use_frameless ) { - equals(QT_MAJOR_VERSION, 5){ - greaterThan(QT_MINOR_VERSION, 13){ - SA_RIBBON_CONFIG += use_frameless - } - }else{ - # qt6.0不支持 - greaterThan(QT_MINOR_VERSION, 0){ - SA_RIBBON_CONFIG += use_frameless - } - } -} - contains( SA_RIBBON_CONFIG, use_frameless ) { message("use frameless lib,compile with c+=17") # 引入第三方库frameless后,必须要求c++17 diff --git a/src/SARibbonBar/SARibbonBar.pro b/src/SARibbonBar/SARibbonBar.pro index f77ecad..37faa5a 100644 --- a/src/SARibbonBar/SARibbonBar.pro +++ b/src/SARibbonBar/SARibbonBar.pro @@ -28,4 +28,7 @@ DESTDIR = $${SARIBBON_BIN_DIR}/bin # 使用frameless库,需要定义QWindowKit的安装目录,默认在SARIBBON_BIN_DIR # SA_RIBBON_QWindowKit_Install_DIR = $$SARIBBON_BIN_DIR ###################################### +# SA_RIBBON_CONFIG += use_frameless + + include($$PWD/SARibbonBar.pri)