Skip to content

Commit

Permalink
Update libraries and minimum OS versions (#1261)
Browse files Browse the repository at this point in the history
IB-7825, IB-8026, IB-8094, IB-8095

Signed-off-by: Raul Metsma <raul@metsma.ee>
  • Loading branch information
metsma authored Jun 18, 2024
1 parent afd3ae1 commit a3843c2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ jobs:
- name: Install Qt
uses: jurplel/install-qt-action@v3
with:
version: 6.6.3
version: 6.7.1
arch: win64_msvc2019_64
- name: Setup dev env
uses: ilammy/msvc-dev-cmd@v1
Expand Down
6 changes: 3 additions & 3 deletions prepare_osx_build_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
set -e

######### Versions of libraries/frameworks to be compiled
QT_VER="6.6.3"
QT_VER="6.7.1"
OPENSSL_VER="3.0.13"
OPENLDAP_VER="2.6.7"
OPENLDAP_VER="2.6.8"
REBUILD=false
BUILD_PATH=~/cmake_builds
: ${MACOSX_DEPLOYMENT_TARGET:="11.0"}
: ${MACOSX_DEPLOYMENT_TARGET:="12.0"}
export MACOSX_DEPLOYMENT_TARGET

while [[ $# -gt 0 ]]
Expand Down
2 changes: 1 addition & 1 deletion qdigidoc4.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@
<File Source="$(var.qt_path)\..\plugins\tls\qopensslbackend$(var.qt_suffix).dll" />
</Directory>
<Directory Name="styles">
<File Source="$(var.qt_path)\..\plugins\styles\qwindowsvistastyle$(var.qt_suffix).dll" />
<File Source="$(var.qt_path)\..\plugins\styles\qmodernwindowsstyle$(var.qt_suffix).dll" />
</Directory>
<Directory Name="imageformats">
<File Source="$(var.qt_path)\..\plugins\imageformats\qsvg$(var.qt_suffix).dll" />
Expand Down

0 comments on commit a3843c2

Please sign in to comment.