Skip to content

Commit

Permalink
Update Qt to 5.12.2 (#1019)
Browse files Browse the repository at this point in the history
IB-6907

Signed-off-by: Raul Metsma <[email protected]>
  • Loading branch information
metsma authored Dec 6, 2021
1 parent cde7fb8 commit 639cebe
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
container: ${{ matrix.container }}
strategy:
matrix:
container: ['ubuntu:20.04', 'ubuntu:21.04']
container: ['ubuntu:20.04', 'ubuntu:21.10']
env:
DEBIAN_FRONTEND: noninteractive
DEBFULLNAME: 'github-actions'
Expand Down
4 changes: 3 additions & 1 deletion prepare_osx_build_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
set -e

######### Versions of libraries/frameworks to be compiled
QT_VER="5.12.11"
QT_VER="5.12.12"
OPENSSL_VER="1.1.1l"
OPENLDAP_VER="2.6.0"
REBUILD=false
BUILD_PATH=~/cmake_builds
: ${MACOSX_DEPLOYMENT_TARGET:="10.14"}
export MACOSX_DEPLOYMENT_TARGET
SCRIPTPATH=$(exec 2>/dev/null;cd -- $(dirname "$0"); unset PWD; /usr/bin/pwd || /bin/pwd || pwd)

while [[ $# -gt 0 ]]
do
Expand Down Expand Up @@ -124,6 +125,7 @@ if [[ "$REBUILD" = true || ! -d ${QT_PATH} ]] ; then
if [[ "${ARCH}" == "arm64" ]] ; then
CROSSCOMPILE="-device-option QMAKE_APPLE_DEVICE_ARCHS=${ARCH}"
fi
patch -Np1 -i ${SCRIPTPATH}/qt-macos12.patch
./configure -prefix ${QT_PATH} -opensource -nomake tests -nomake examples -no-securetransport -openssl -openssl-linked -confirm-license OPENSSL_PREFIX=${OPENSSL_PATH} ${CROSSCOMPILE}
else
"${QT_PATH}"/bin/qmake
Expand Down
11 changes: 11 additions & 0 deletions qt-macos12.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
--- qtbase-everywhere-src-5.12.11.orig/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h 2021-05-18 09:43:52.000000000 +0300
+++ qtbase-everywhere-src-5.12.11/src/plugins/platforms/cocoa/qiosurfacegraphicsbuffer.h 2021-11-26 19:44:43.000000000 +0200
@@ -43,6 +43,8 @@
#include <qpa/qplatformgraphicsbuffer.h>
#include <private/qcore_mac_p.h>

+#include <CoreGraphics/CGColorSpace.h>
+
QT_BEGIN_NAMESPACE

class QIOSurfaceGraphicsBuffer : public QPlatformGraphicsBuffer

0 comments on commit 639cebe

Please sign in to comment.