From e8fc8744569ed0f740f867e448b7fb3cecf4fdde Mon Sep 17 00:00:00 2001 From: John Preston Date: Wed, 11 Aug 2021 19:55:47 +0300 Subject: [PATCH] Build and link with QtSvg. --- cmake | 2 +- docs/building-mac.md | 4 ++-- docs/building-win-x64.md | 8 +++++--- docs/building-win.md | 4 ++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/cmake b/cmake index b02fc9061..fb595431a 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit b02fc90612b3a22525e47ad4c404a7e432b6803f +Subproject commit fb595431a95f4848966fb2d0854744d11f593b62 diff --git a/docs/building-mac.md b/docs/building-mac.md index 982883b0f..ec2594dd7 100644 --- a/docs/building-mac.md +++ b/docs/building-mac.md @@ -274,9 +274,9 @@ Go to ***BuildPath*** and run git clone git://code.qt.io/qt/qt5.git qt_5_15_2 cd qt_5_15_2 - perl init-repository --module-subset=qtbase,qtimageformats + perl init-repository --module-subset=qtbase,qtimageformats,qtsvg git checkout v5.15.2 - git submodule update qtbase qtimageformats + git submodule update qtbase qtimageformats qtsvg cd qtbase find ../../patches/qtbase_5_15_2 -type f -print0 | sort -z | xargs -0 git apply cd .. diff --git a/docs/building-win-x64.md b/docs/building-win-x64.md index c091e67b7..c2fc0ae51 100644 --- a/docs/building-win-x64.md +++ b/docs/building-win-x64.md @@ -197,14 +197,16 @@ Open **x64 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** SET LibrariesPath=%cd% git clone git://code.qt.io/qt/qt5.git qt_5_15_2 cd qt_5_15_2 - perl init-repository --module-subset=qtbase,qtimageformats + perl init-repository --module-subset=qtbase,qtimageformats,qtsvg git checkout v5.15.2 - git submodule update qtbase qtimageformats + git submodule update qtbase qtimageformats qtsvg cd qtbase for /r %i in (..\..\patches\qtbase_5_15_2\*) do git apply %i cd .. + mkdir build + cd build - configure ^ + ..\configure ^ -prefix "%LibrariesPath%\Qt-5.15.2" ^ -debug-and-release ^ -force-debug-info ^ diff --git a/docs/building-win.md b/docs/building-win.md index b2de5e4e3..8772ff964 100644 --- a/docs/building-win.md +++ b/docs/building-win.md @@ -200,9 +200,9 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath*** SET LibrariesPath=%cd% git clone git://code.qt.io/qt/qt5.git qt_5_15_2 cd qt_5_15_2 - perl init-repository --module-subset=qtbase,qtimageformats + perl init-repository --module-subset=qtbase,qtimageformats,qtsvg git checkout v5.15.2 - git submodule update qtbase qtimageformats + git submodule update qtbase qtimageformats qtsvg cd qtbase for /r %i in (..\..\patches\qtbase_5_15_2\*) do git apply %i cd ..