Skip to content

Commit

Permalink
Increase Qt version
Browse files Browse the repository at this point in the history
IB-6722

Signed-off-by: Raul Metsma <raul@metsma.ee>
  • Loading branch information
metsma committed Nov 11, 2020
1 parent c25c1c6 commit b691fa8
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 7 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: c++
sudo: false
dist: bionic
osx_image: xcode11.6
dist: focal
osx_image: xcode12.2
services:
- docker
matrix:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.10)
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
project(qdigidoc4 VERSION 4.2.7)
project(qdigidoc4 VERSION 4.2.8)

set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
set(CMAKE_INCLUDE_CURRENT_DIR ON)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

mkdir build
cd build
cmake -DQt5_DIR="~/cmake_builds/Qt-5.12.9-OpenSSL/lib/cmake/Qt5" -DCMAKE_EXE_LINKER_FLAGS="-F/Library/Frameworks" ..
cmake -DQt5_DIR="~/cmake_builds/Qt-5.12.10-OpenSSL/lib/cmake/Qt5" -DCMAKE_EXE_LINKER_FLAGS="-F/Library/Frameworks" ..

4. Build

Expand Down Expand Up @@ -103,7 +103,7 @@

mkdir build
cd build
cmake -G"NMAKE Makefiles" -DQt5_DIR="C:\Qt\5.12.9\msvc2017\lib\cmake\Qt5" ..
cmake -G"NMAKE Makefiles" -DQt5_DIR="C:\Qt\5.12.10\msvc2017\lib\cmake\Qt5" ..

4. Build

Expand Down
18 changes: 18 additions & 0 deletions RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,21 @@
DigiDoc4 version [4.2.7](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.7) release notes
--------------------------------------
- Fix Mobile-ID signing with Russian translations

[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.2.6...v4.2.7)

DigiDoc4 version [4.2.6](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.6) release notes
--------------------------------------
- Code, Text and translation improvements and updates

[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.2.5...v4.2.6)

DigiDoc4 version [4.2.5](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.5) release notes
--------------------------------------
- Code, Text and translation improvements and updates

[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.2.4...v4.2.5)

DigiDoc4 version [4.2.4](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.2.4) release notes
--------------------------------------
- Workaround Fin driver issues (#569)
Expand Down
4 changes: 2 additions & 2 deletions prepare_osx_build_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
set -e

######### Versions of libraries/frameworks to be compiled
QT_VER="5.12.9"
OPENLDAP_VER="2.4.50"
QT_VER="5.12.10"
OPENLDAP_VER="2.4.56"
REBUILD=false
BUILD_PATH=~/cmake_builds
OPENSSL_PATH="/usr/local/opt/openssl"
Expand Down

0 comments on commit b691fa8

Please sign in to comment.