hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-12-01 01:44:09 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch 'staged' into dev

Browse source
This commit is contained in:
Xiao YiFang 2022-05-20 21:27:12 +08:00
parent bb2f114bcf f6a151ae6f
commit 2f7f29840b
7 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/macos-6.2.yml vendored
View file

@ -107,8 +107,8 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}} release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }} branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }} commit: ${{ steps.vars.outputs.sha_short }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }} Qt version: Qt5.15.2, Qt6.X
Windows built with: msvc64 Visual studio 2019 Windows built with: msvc64, Visual studio 2019
## goldendict.exe can not be used alone ## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle. if you have a previous version. replace this maybe ok. if not ,download the whole bundle.

8
.github/workflows/macos.yml vendored
View file

@ -110,15 +110,15 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}} release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }} branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }} commit: ${{ steps.vars.outputs.sha_short }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }} Qt version: Qt5.15.2, Qt6.X
Windows built with: msvc64 Visual studio 2019 Windows built with: msvc64, Visual studio 2019
## goldendict.exe can not be used alone ## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle. if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64 macos built with: macos-10.15,macos-11.0,clang_64 x86_64
qt6.X(Universal Build) Qt6.X(Universal Build)
qt5.15.2(Intel Kind) Qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-) auto built by github action. use on your on risk:-)
CHANGES: CHANGES:

8
.github/workflows/ubuntu-6.2.yml vendored
View file

@ -114,15 +114,15 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}} release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }} branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }} commit: ${{ steps.vars.outputs.sha_short }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }} Qt version: Qt5.15.2, Qt6.X
Windows built with: msvc64 Visual studio 2019 Windows built with: msvc64, Visual studio 2019
## goldendict.exe can not be used alone ## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle. if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64 macos built with: macos-10.15,macos-11.0,clang_64 x86_64
qt6.X(Universal Build) Qt6.X(Universal Build)
qt5.15.2(Intel Kind) Qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-) auto built by github action. use on your on risk:-)
CHANGES: CHANGES:

8
.github/workflows/ubuntu.yml vendored
View file

@ -111,15 +111,15 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}} release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }} branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }} commit: ${{ steps.vars.outputs.sha_short }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }} Qt version: Qt5.15.2, Qt6.X
Windows built with: msvc64 Visual studio 2019 Windows built with: msvc64, Visual studio 2019
## goldendict.exe can not be used alone ## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle. if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64 macos built with: macos-10.15,macos-11.0,clang_64 x86_64
qt6.X(Universal Build) Qt6.X(Universal Build)
qt5.15.2(Intel Kind) Qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-) auto built by github action. use on your on risk:-)
CHANGES: CHANGES:

8
.github/workflows/windows-6.2.yml vendored
View file

@ -121,10 +121,12 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}} release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }} branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }} commit: ${{ steps.vars.outputs.sha_short }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }} Qt version: Qt5.15.2, Qt6.X
Windows built with: msvc64 Visual studio 2019 Windows built with: msvc64, Visual studio 2019
AppImage built with: Ubuntu-20.04 ,latest gcc AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64
Qt6.X(Universal Build)
Qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-) auto built by github action. use on your on risk:-)
- name: upload goldendict.exe only - name: upload goldendict.exe only
# if: startsWith(github.event.ref, 'refs/tags/') # if: startsWith(github.event.ref, 'refs/tags/')

8
.github/workflows/windows.yml vendored
View file

@ -116,12 +116,14 @@ jobs:
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}} release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
branch: ${{ github.ref_name }} branch: ${{ github.ref_name }}
commit: ${{ steps.vars.outputs.sha_short }} commit: ${{ steps.vars.outputs.sha_short }}
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }} Qt version: Qt5.15.2, Qt6.X
Windows built with: msvc64 Visual studio 2019 Windows built with: msvc64, Visual studio 2019
## goldendict.exe can not be used alone ## goldendict.exe can not be used alone
if you have a previous version. replace this maybe ok. if not ,download the whole bundle. if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
AppImage built with: Ubuntu-20.04 ,latest gcc AppImage built with: Ubuntu-20.04 ,latest gcc
macos built with: macos-10.15,macos-11.0,clang_64 x86_64
Qt6.X(Universal Build)
Qt5.15.2(Intel Kind)
auto built by github action. use on your on risk:-) auto built by github action. use on your on risk:-)
CHANGES: CHANGES:

1
goldendict.pro
View file

@ -79,6 +79,7 @@ win32 {
QMAKE_CXXFLAGS += /wd4290 # silence the warning C4290: C++ exception specification ignored QMAKE_CXXFLAGS += /wd4290 # silence the warning C4290: C++ exception specification ignored
# QMAKE_LFLAGS_RELEASE += /OPT:REF /OPT:ICF # QMAKE_LFLAGS_RELEASE += /OPT:REF /OPT:ICF
# QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO /DEBUG # QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO /DEBUG
CONFIG+=force_debug_info
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
DEFINES += GD_NO_MANIFEST DEFINES += GD_NO_MANIFEST