Merge commit 'bbd384dbef178d7334fd82eac2efb1f382ef6077' into dev/qt6

QQxiaoming · Jul 27, 2022 · 2b781cf · 2b781cf
2 parents 350b72d + bbd384d
commit 2b781cf
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -69,3 +69,9 @@ ttf\ttf_verbose
 ## Build
 
 　> [Build documentation](./DEVELOPNOTE.md)
+
+## Contributing
+
+If you have suggestions or ideas for this project, please submit issues and pull requests on GitHub or Gitee.
+
+At present, the project will be transferred to the development based on Qt6. The current branch dev/qt6 code has been completely migrated, and the replacement of the main branch may be completed in the next LTS version of Qt6.
diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -69,3 +69,9 @@ ttf\ttf_verbose
 ## 编译说明
 
 　> [编译说明](./DEVELOPNOTE.md)
+
+## 贡献
+
+如果您对本项目有建议或想法，欢迎在GitHub或Gitee上提交issue和pull requests。
+
+目前项目即将转移到基于Qt6开发，目前分支dev/qt6代码已完全完成迁移，也许会在下一个Qt6的LTS版本完成main分支的替换。
diff --git a/TTFviewer.pro b/TTFviewer.pro
@@ -95,6 +95,7 @@ unix:!macx:{
 
 macx:{
     QMAKE_RPATHDIR=$ORIGIN
+    ICON = "img\ico.icns"
 
     INCLUDEPATH += -I $${FREETPE2_DIR}/include
     INCLUDEPATH += -I $${FREETPE2_DIR}/include/freetype2

diff --git a/img/ico.icns b/img/ico.icns