mirror of
https://github.com/xiaoyifang/goldendict-ng.git
synced 2024-11-27 23:34:06 +00:00
Merge branch 'staged' into dev
This commit is contained in:
commit
2f7f29840b
4
.github/workflows/macos-6.2.yml
vendored
4
.github/workflows/macos-6.2.yml
vendored
|
@ -107,8 +107,8 @@ jobs:
|
|||
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
|
||||
branch: ${{ github.ref_name }}
|
||||
commit: ${{ steps.vars.outputs.sha_short }}
|
||||
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
|
||||
Windows built with: msvc64 Visual studio 2019
|
||||
Qt version: Qt5.15.2, Qt6.X
|
||||
Windows built with: msvc64, Visual studio 2019
|
||||
## goldendict.exe can not be used alone
|
||||
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
|
||||
|
||||
|
|
8
.github/workflows/macos.yml
vendored
8
.github/workflows/macos.yml
vendored
|
@ -110,15 +110,15 @@ jobs:
|
|||
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
|
||||
branch: ${{ github.ref_name }}
|
||||
commit: ${{ steps.vars.outputs.sha_short }}
|
||||
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
|
||||
Windows built with: msvc64 Visual studio 2019
|
||||
Qt version: Qt5.15.2, Qt6.X
|
||||
Windows built with: msvc64, Visual studio 2019
|
||||
## goldendict.exe can not be used alone
|
||||
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
|
||||
|
||||
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)
|
||||
Qt6.X(Universal Build)
|
||||
Qt5.15.2(Intel Kind)
|
||||
auto built by github action. use on your on risk:-)
|
||||
|
||||
CHANGES:
|
||||
|
|
8
.github/workflows/ubuntu-6.2.yml
vendored
8
.github/workflows/ubuntu-6.2.yml
vendored
|
@ -114,15 +114,15 @@ jobs:
|
|||
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
|
||||
branch: ${{ github.ref_name }}
|
||||
commit: ${{ steps.vars.outputs.sha_short }}
|
||||
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
|
||||
Windows built with: msvc64 Visual studio 2019
|
||||
Qt version: Qt5.15.2, Qt6.X
|
||||
Windows built with: msvc64, Visual studio 2019
|
||||
## goldendict.exe can not be used alone
|
||||
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
|
||||
|
||||
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)
|
||||
Qt6.X(Universal Build)
|
||||
Qt5.15.2(Intel Kind)
|
||||
auto built by github action. use on your on risk:-)
|
||||
|
||||
CHANGES:
|
||||
|
|
8
.github/workflows/ubuntu.yml
vendored
8
.github/workflows/ubuntu.yml
vendored
|
@ -111,15 +111,15 @@ jobs:
|
|||
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
|
||||
branch: ${{ github.ref_name }}
|
||||
commit: ${{ steps.vars.outputs.sha_short }}
|
||||
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
|
||||
Windows built with: msvc64 Visual studio 2019
|
||||
Qt version: Qt5.15.2, Qt6.X
|
||||
Windows built with: msvc64, Visual studio 2019
|
||||
## goldendict.exe can not be used alone
|
||||
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
|
||||
|
||||
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)
|
||||
Qt6.X(Universal Build)
|
||||
Qt5.15.2(Intel Kind)
|
||||
auto built by github action. use on your on risk:-)
|
||||
|
||||
CHANGES:
|
||||
|
|
8
.github/workflows/windows-6.2.yml
vendored
8
.github/workflows/windows-6.2.yml
vendored
|
@ -121,10 +121,12 @@ jobs:
|
|||
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
|
||||
branch: ${{ github.ref_name }}
|
||||
commit: ${{ steps.vars.outputs.sha_short }}
|
||||
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
|
||||
Windows built with: msvc64 Visual studio 2019
|
||||
Qt version: Qt5.15.2, Qt6.X
|
||||
Windows built with: msvc64, Visual studio 2019
|
||||
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:-)
|
||||
- name: upload goldendict.exe only
|
||||
# if: startsWith(github.event.ref, 'refs/tags/')
|
||||
|
|
8
.github/workflows/windows.yml
vendored
8
.github/workflows/windows.yml
vendored
|
@ -116,12 +116,14 @@ jobs:
|
|||
release on date: ${{steps.vars.outputs.release_date}} time: ${{steps.vars.outputs.release_time_clock}}
|
||||
branch: ${{ github.ref_name }}
|
||||
commit: ${{ steps.vars.outputs.sha_short }}
|
||||
Qt version: Qt5.15.2,Qt6.X ${{ matrix.qt_arch }}
|
||||
Windows built with: msvc64 Visual studio 2019
|
||||
Qt version: Qt5.15.2, Qt6.X
|
||||
Windows built with: msvc64, Visual studio 2019
|
||||
## goldendict.exe can not be used alone
|
||||
if you have a previous version. replace this maybe ok. if not ,download the whole bundle.
|
||||
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:-)
|
||||
|
||||
CHANGES:
|
||||
|
|
|
@ -79,6 +79,7 @@ win32 {
|
|||
QMAKE_CXXFLAGS += /wd4290 # silence the warning C4290: C++ exception specification ignored
|
||||
# QMAKE_LFLAGS_RELEASE += /OPT:REF /OPT:ICF
|
||||
# QMAKE_LFLAGS_RELEASE = /INCREMENTAL:NO /DEBUG
|
||||
CONFIG+=force_debug_info
|
||||
QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO
|
||||
QMAKE_LFLAGS_RELEASE = $$QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO
|
||||
DEFINES += GD_NO_MANIFEST
|
||||
|
|
Loading…
Reference in a new issue