[vlc-commits] contrib: qt: Update Qt to 5.12.7
Steve Lhomme
git at videolan.org
Tue Mar 10 08:36:26 CET 2020
vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Mar 9 08:50:52 2020 +0100| [452c75c8f1c7fa31478931f1d8074cb242546b90] | committer: Steve Lhomme
contrib: qt: Update Qt to 5.12.7
Co-authored-by: Pierre Lamot <pierre at videolabs.io>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=452c75c8f1c7fa31478931f1d8074cb242546b90
---
...fferent-pkg-config-files-for-debug-and-re.patch | 34 ----------------
...ULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch | 30 --------------
...s-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch | 46 ----------------------
...PMurHash.c-mingw-clang-64-bit-compilation.patch | 25 ------------
contrib/src/qt/SHA512SUMS | 2 +-
contrib/src/qt/rules.mak | 10 ++---
...ble-the-JIT-on-ARM-on-specific-known-OSes.patch | 38 ------------------
contrib/src/qtdeclarative/SHA512SUMS | 2 +-
contrib/src/qtdeclarative/rules.mak | 3 +-
contrib/src/qtgraphicaleffects/SHA512SUMS | 2 +-
contrib/src/qtgraphicaleffects/rules.mak | 2 +-
contrib/src/qtquickcontrols2/SHA512SUMS | 2 +-
contrib/src/qtquickcontrols2/rules.mak | 2 +-
contrib/src/qtsvg/SHA512SUMS | 2 +-
contrib/src/qtsvg/rules.mak | 2 +-
15 files changed, 12 insertions(+), 190 deletions(-)
diff --git a/contrib/src/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch b/contrib/src/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch
deleted file mode 100644
index feaa0fa972..0000000000
--- a/contrib/src/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 533641dced8e5a630940490a30812ee299ef880f Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Mon, 29 Apr 2019 08:16:39 +0200
-Subject: [PATCH] generate different pkg-config files for debug and release
- targets
-
-When generating a release-only build the release and debug makefiles are
-generated, in that order. So the debug .pc file overwrites the release one,
-making pkg-config using debug targets that are not even built.
-
-This is only needed on Windows targets where debug and release builds have
-different suffixes.
-
-Fixes QTBUG-75468
----
- qmake/generators/makefile.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/qmake/generators/makefile.cpp b/qmake/generators/makefile.cpp
-index b634ec622b..761212ebec 100644
---- a/qmake/generators/makefile.cpp
-+++ b/qmake/generators/makefile.cpp
-@@ -3244,6 +3244,8 @@ MakefileGenerator::pkgConfigFileName(bool fixify)
- if (dot != -1)
- ret = ret.left(dot);
- }
-+ if (project->isActiveConfig("debug") && project->isActiveConfig("win32"))
-+ ret += "d";
- ret += Option::pkgcfg_ext;
- QString subdir = project->first("QMAKE_PKGCONFIG_DESTDIR").toQString();
- if(!subdir.isEmpty()) {
---
-2.19.1.windows.1
-
diff --git a/contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch b/contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch
deleted file mode 100644
index 5f00050167..0000000000
--- a/contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 41833ff2e8918cf776b7849fd4ab1eab03dd6592 Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4 at ycbcr.xyz>
-Date: Mon, 29 Apr 2019 10:49:01 +0200
-Subject: [PATCH] include MODULE_AUX_INCLUDES in the generated .pc files
-
-QtANGLE is set on MODULE_AUX_INCLUDES so the headers can be found when building
-with angle (gui.pro) but the pkg-config file is missing this header and the Qt
-headers cannot be compiled with the path from this config.
-
-Fixes QTBUG-75495
----
- mkspecs/features/qt_module.prf | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
-index 8bd2d92421..7963356c82 100644
---- a/mkspecs/features/qt_module.prf
-+++ b/mkspecs/features/qt_module.prf
-@@ -278,6 +278,8 @@ load(qt_targets)
- QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
- QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME
- }
-+ !isEmpty(MODULE_AUX_INCLUDES): \
-+ QMAKE_PKGCONFIG_CFLAGS += -I${includedir}/$$section(MODULE_AUX_INCLUDES, /, 1, 1)
- QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ")
- QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION)
- for(i, MODULE_DEPENDS): \
---
-2.19.1.windows.1
-
diff --git a/contrib/src/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch b/contrib/src/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch
deleted file mode 100644
index a624f7d7cd..0000000000
--- a/contrib/src/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From d6854fe5fc456cedfa40f91e9a8b62ae18ad19c8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Thu, 25 Apr 2019 12:13:13 +0300
-Subject: [PATCH] qmake: Always split QMAKE_DEFAULT_LIBDIRS using ; with clang
- on windows
-
-When building in a unix style build system (i.e. msys), QMAKE_DIRLIST_SEP
-is a colon, not a semicolon. Thus, always split the incoming string
-(after the fixup regex) using semicolons on windows.
-
-This matches the code for gcc, further up, which does:
-
- equals(QMAKE_HOST.os, Windows): \
- paths = $$split(line, ;)
- else: \
- paths = $$split(line, $$QMAKE_DIRLIST_SEP)
-
-Change-Id: I6a0175f9d14ae9ca188553483b7868f0549c784a
----
- mkspecs/features/toolchain.prf | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/mkspecs/features/toolchain.prf b/mkspecs/features/toolchain.prf
-index 9c3a64aa8b..03612e5689 100644
---- a/mkspecs/features/toolchain.prf
-+++ b/mkspecs/features/toolchain.prf
-@@ -267,9 +267,13 @@ isEmpty($${target_prefix}.INCDIRS) {
- for (line, output) {
- contains(line, "^libraries: .*") {
- line ~= s,^libraries: ,,
-- # clang (7.x) on Windows uses the wrong path list separator ...
-- equals(QMAKE_HOST.os, Windows): line ~= s,:(?![/\\\\]),;,
-- paths = $$split(line, $$QMAKE_DIRLIST_SEP)
-+ equals(QMAKE_HOST.os, Windows) {
-+ # clang (7.x) on Windows uses the wrong path list separator ...
-+ line ~= s,:(?![/\\\\]),;,
-+ paths = $$split(line, ;)
-+ } else {
-+ paths = $$split(line, $$QMAKE_DIRLIST_SEP)
-+ }
- for (path, paths): \
- QMAKE_DEFAULT_LIBDIRS += $$clean_path($$replace(path, ^=, $$[SYSROOT]))
- }
---
-2.20.1 (Apple Git-117)
-
diff --git a/contrib/src/qt/0004-Fix-PMurHash.c-mingw-clang-64-bit-compilation.patch b/contrib/src/qt/0004-Fix-PMurHash.c-mingw-clang-64-bit-compilation.patch
deleted file mode 100644
index 47f98a5014..0000000000
--- a/contrib/src/qt/0004-Fix-PMurHash.c-mingw-clang-64-bit-compilation.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7e0e146443663db23ea0164e0b72694b8f9a1b69 Mon Sep 17 00:00:00 2001
-From: LLVM MinGW <root at localhost>
-Date: Fri, 21 Dec 2018 14:41:36 +0000
-Subject: [PATCH] Fix PMurHash.c mingw clang 64-bit compilation.
-
----
- .../angle/src/common/third_party/smhasher/src/PMurHash.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp b/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp
-index 071bc31..ff75759 100644
---- a/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp
-+++ b/src/3rdparty/angle/src/common/third_party/smhasher/src/PMurHash.cpp
-@@ -208,7 +208,7 @@ void PMurHash32_Process(uint32_t *ph1, uint32_t *pcarry, const void *key, int le
- /* This CPU does not handle unaligned word access */
-
- /* Consume enough so that the next data byte is word aligned */
-- int i = -(long)ptr & 3;
-+ int i = -(intptr_t)ptr & 3;
- if(i && i <= len) {
- DOBYTES(i, h1, c, n, ptr, len);
- }
---
-2.20.0.rc1
-
diff --git a/contrib/src/qt/SHA512SUMS b/contrib/src/qt/SHA512SUMS
index 5b722f03c8..72ee6cc797 100644
--- a/contrib/src/qt/SHA512SUMS
+++ b/contrib/src/qt/SHA512SUMS
@@ -1 +1 @@
-6752ecc096f8baf8e14e56f0d1f139e8a0d75967ab61bf1734ad5f4f4609a7cc707ab080f5f85f2230bbbb1454a0669be60a14d57d9a93aef553ce6f85f71613 qtbase-everywhere-src-5.12.2.tar.xz
+c8b90e50ec1824236541273b81024f1332c604748a038a48bc377b4c8e0886bfc27132990758abfd8ab9ea2aa5f1e42181ff369a0df4bc879dad0ef95868fde3 qtbase-everywhere-src-5.12.7.tar.xz
\ No newline at end of file
diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak
index 126f7a5a6d..6bc3d01320 100644
--- a/contrib/src/qt/rules.mak
+++ b/contrib/src/qt/rules.mak
@@ -1,7 +1,7 @@
# Qt
QT_VERSION_MAJOR := 5.12
-QT_VERSION := $(QT_VERSION_MAJOR).2
+QT_VERSION := $(QT_VERSION_MAJOR).7
# Insert potential -betaX suffix here:
QT_VERSION_FULL := $(QT_VERSION)
QT_URL := https://download.qt.io/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION_FULL)/submodules/qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz
@@ -31,7 +31,6 @@ qt: qtbase-everywhere-src-$(QT_VERSION_FULL).tar.xz .sum-qt
ifdef HAVE_WIN32
$(APPLY) $(SRC)/qt/0001-Windows-QPA-prefer-lower-value-when-rounding-fractio.patch
$(APPLY) $(SRC)/qt/0002-Windows-QPA-Disable-systray-notification-sounds.patch
- $(APPLY) $(SRC)/qt/0004-Fix-PMurHash.c-mingw-clang-64-bit-compilation.patch
ifndef HAVE_WIN64
$(APPLY) $(SRC)/qt/0001-disable-qt_random_cpu.patch
endif
@@ -48,9 +47,6 @@ else
endif
endif
- $(APPLY) $(SRC)/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch
- $(APPLY) $(SRC)/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch
- $(APPLY) $(SRC)/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch
$(MOVE)
@@ -112,8 +108,8 @@ ENV_VARS := $(HOSTVARS) DXSDK_DIR=$(PREFIX)/bin
cd $< && $(MAKE) -C src -C plugins sub-imageformats-install_subtargets sub-platforms-install_subtargets sub-styles-install_subtargets
$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Gui plugins/imageformats qjpeg
ifdef HAVE_WIN32
- # Add the private include to our project (similar to using "gui-private" in a qmake project)
- sed -i.orig -e 's#-I$${includedir}/QtGui#-I$${includedir}/QtGui -I$${includedir}/QtGui/$(QT_VERSION)/QtGui#' $(PREFIX)/lib/pkgconfig/Qt5Gui.pc
+ # Add the private include to our project (similar to using "gui-private" in a qmake project) as well as ANGLE headers
+ sed -i.orig -e 's#-I$${includedir}/QtGui#-I$${includedir}/QtGui -I$${includedir}/QtGui/$(QT_VERSION)/QtGui -I$${includedir}/QtANGLE#' $(PREFIX)/lib/pkgconfig/Qt5Gui.pc
$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Gui plugins/platforms qwindows
# Vista styling
$(SRC)/qt/AddStaticLink.sh "$(PREFIX)" Qt5Widgets plugins/styles qwindowsvistastyle
diff --git a/contrib/src/qtdeclarative/0001-V4-Only-enable-the-JIT-on-ARM-on-specific-known-OSes.patch b/contrib/src/qtdeclarative/0001-V4-Only-enable-the-JIT-on-ARM-on-specific-known-OSes.patch
deleted file mode 100644
index 0901ff6464..0000000000
--- a/contrib/src/qtdeclarative/0001-V4-Only-enable-the-JIT-on-ARM-on-specific-known-OSes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 259c958e21c63f227a1bb678867210e0f6af0991 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin at martin.st>
-Date: Mon, 15 Apr 2019 13:36:46 +0300
-Subject: [PATCH] V4: Only enable the JIT on ARM on specific known OSes
-
-On all other architectures, the JIT is only enabled for explicitly
-mentioned OSes.
-
-This fixes build errors for Windows on 32 bit ARM, about the
-cacheFlush function being unimplemented for that target.
-
-This keeps all other OSes enabled that are mentioned in conditionals
-for other architectures, except for windows.
-
-Change-Id: I8c29a9399a05a57d23b4fee506c3d04859a08a76
-Reviewed-by: Ulf Hermann <ulf.hermann at qt.io>
-Upstream-Commit: 259c958e21c63f227a1bb678867210e0f6af0991
----
- src/qml/jsruntime/qv4global_p.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h
-index 162fb66cb..58bffdf2d 100644
---- a/src/qml/jsruntime/qv4global_p.h
-+++ b/src/qml/jsruntime/qv4global_p.h
-@@ -94,7 +94,8 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); }
- #elif defined(Q_PROCESSOR_X86_64) && (QT_POINTER_SIZE == 8) \
- && (defined(Q_OS_WIN) || defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_MAC) || defined(Q_OS_FREEBSD))
- # define V4_ENABLE_JIT
--#elif defined(Q_PROCESSOR_ARM_32) && (QT_POINTER_SIZE == 4)
-+#elif defined(Q_PROCESSOR_ARM_32) && (QT_POINTER_SIZE == 4) \
-+ && (defined(Q_OS_LINUX) || defined(Q_OS_QNX) || defined(Q_OS_FREEBSD) || defined(Q_OS_INTEGRITY))
- # if defined(thumb2) || defined(__thumb2__) || ((defined(__thumb) || defined(__thumb__)) && __TARGET_ARCH_THUMB-0 == 4)
- # define V4_ENABLE_JIT
- # elif defined(__ARM_ARCH_ISA_THUMB) && __ARM_ARCH_ISA_THUMB == 2 // clang 3.5 and later will set this if the core supports the Thumb-2 ISA.
---
-2.17.1
-
diff --git a/contrib/src/qtdeclarative/SHA512SUMS b/contrib/src/qtdeclarative/SHA512SUMS
index ac7ae83a11..23789ee5bd 100644
--- a/contrib/src/qtdeclarative/SHA512SUMS
+++ b/contrib/src/qtdeclarative/SHA512SUMS
@@ -1 +1 @@
-0c0dd27acf452e72d70d214cf1960309a9282dc7f324214c734bb2e66e8f8279db0c3e0f61a431f6c70dc683467c2a17ad37b9c5d0aa75d7f82ae9d838918dd0 qtdeclarative-everywhere-src-5.12.2.tar.xz
+119155aed8ad6e74f7be2d0e44bf630fc493227c6ad0fdbd9a85bba8770939a0dd6c21a8583851e5adf243d51bdeb64bf79e1c4898176898e05a3897052315b6 qtdeclarative-everywhere-src-5.12.7.tar.xz
\ No newline at end of file
diff --git a/contrib/src/qtdeclarative/rules.mak b/contrib/src/qtdeclarative/rules.mak
index 40909479da..fc005b4cb2 100644
--- a/contrib/src/qtdeclarative/rules.mak
+++ b/contrib/src/qtdeclarative/rules.mak
@@ -1,7 +1,7 @@
# QtDeclarative
QTDECLARATIVE_VERSION_MAJOR := 5.12
-QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).2
+QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).7
QTDECLARATIVE_URL := http://download.qt.io/official_releases/qt/$(QTDECLARATIVE_VERSION_MAJOR)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
DEPS_qtdeclarative += qt $(DEPS_qt)
@@ -21,7 +21,6 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
$(UNPACK)
- $(APPLY) $(SRC)/qtdeclarative/0001-V4-Only-enable-the-JIT-on-ARM-on-specific-known-OSes.patch
$(MOVE)
.qtdeclarative: qtdeclarative
diff --git a/contrib/src/qtgraphicaleffects/SHA512SUMS b/contrib/src/qtgraphicaleffects/SHA512SUMS
index 1ad3439270..7fdf0f3920 100644
--- a/contrib/src/qtgraphicaleffects/SHA512SUMS
+++ b/contrib/src/qtgraphicaleffects/SHA512SUMS
@@ -1 +1 @@
-13ed4d5fd6004cef408e2ab0fc815ff8187813efe3836c9bca0eedd550ab06df85e30978b0adab74b0075ef8262ae49f182263add00f33820456c44349ea75af qtgraphicaleffects-everywhere-src-5.12.2.tar.xz
+fd6b59198e834a9e36e58445055610ac6dcfcb96d405d2dc294e0397460d6fdd119cfd4b0f29f43009154d623071dcb335223e33872fbfb5b6004abe9b6f5a55 qtgraphicaleffects-everywhere-src-5.12.7.tar.xz
\ No newline at end of file
diff --git a/contrib/src/qtgraphicaleffects/rules.mak b/contrib/src/qtgraphicaleffects/rules.mak
index 043d28670b..3d2842adcc 100644
--- a/contrib/src/qtgraphicaleffects/rules.mak
+++ b/contrib/src/qtgraphicaleffects/rules.mak
@@ -1,7 +1,7 @@
# QtGraphicalEffects
QTGE_VERSION_MAJOR := 5.12
-QTGE_VERSION := $(QTGE_VERSION_MAJOR).2
+QTGE_VERSION := $(QTGE_VERSION_MAJOR).7
QTGE_URL := http://download.qt.io/official_releases/qt/$(QTGE_VERSION_MAJOR)/$(QTGE_VERSION)/submodules/qtgraphicaleffects-everywhere-src-$(QTGE_VERSION).tar.xz
DEPS_qtgraphicaleffects += qtdeclarative $(DEPS_qtdeclarative)
diff --git a/contrib/src/qtquickcontrols2/SHA512SUMS b/contrib/src/qtquickcontrols2/SHA512SUMS
index 1138e57de4..b61611d884 100644
--- a/contrib/src/qtquickcontrols2/SHA512SUMS
+++ b/contrib/src/qtquickcontrols2/SHA512SUMS
@@ -1 +1 @@
-ec8648a75f72425ebbf67ebf974c0c6aa2e94fe409c0a030fc36a8cbdaab68157aa12454ae9f0e723474a21d0b661a32cf971ac494e718859d36679bb9b43735 qtquickcontrols2-everywhere-src-5.12.2.tar.xz
+bd469316594e09da064fc6792c08ee87f345ab8c27bd33ae3fc38d184bebabf1ed824147eb960ac2700c67a683097c7615aebb0f717dc1a5ff1b330f27554ae9 qtquickcontrols2-everywhere-src-5.12.7.tar.xz
\ No newline at end of file
diff --git a/contrib/src/qtquickcontrols2/rules.mak b/contrib/src/qtquickcontrols2/rules.mak
index e92fec4a0e..db0695e43d 100644
--- a/contrib/src/qtquickcontrols2/rules.mak
+++ b/contrib/src/qtquickcontrols2/rules.mak
@@ -1,7 +1,7 @@
# QtQuickControls 2
QTQC2_VERSION_MAJOR := 5.12
-QTQC2_VERSION := $(QTQC2_VERSION_MAJOR).2
+QTQC2_VERSION := $(QTQC2_VERSION_MAJOR).7
QTQC2_URL := http://download.qt.io/official_releases/qt/$(QTQC2_VERSION_MAJOR)/$(QTQC2_VERSION)/submodules/qtquickcontrols2-everywhere-src-$(QTQC2_VERSION).tar.xz
ifdef HAVE_WIN32
diff --git a/contrib/src/qtsvg/SHA512SUMS b/contrib/src/qtsvg/SHA512SUMS
index 81138cd69d..40a1300d02 100644
--- a/contrib/src/qtsvg/SHA512SUMS
+++ b/contrib/src/qtsvg/SHA512SUMS
@@ -1 +1 @@
-6dd7bce8d24aaeb9ec4ff4006381b03c86cbb818b38264be0a947e862b122f0ba82cd14888efedf26f2c67219058842af071851f19d4767371e14bc009439249 qtsvg-everywhere-src-5.12.2.tar.xz
+13e6053c99cc0f5b31bc48df0a8b93cfa26e49f3aa2732850747c7a8b3e78ff0a1c620e2a8729d291b5a6cf935d9a481f361ec9f6a78ae090ca997b344786f47 qtsvg-everywhere-src-5.12.7.tar.xz
\ No newline at end of file
diff --git a/contrib/src/qtsvg/rules.mak b/contrib/src/qtsvg/rules.mak
index 1c94ed6e70..d3eeade887 100644
--- a/contrib/src/qtsvg/rules.mak
+++ b/contrib/src/qtsvg/rules.mak
@@ -1,7 +1,7 @@
# Qt
QTSVG_VERSION_MAJOR := 5.12
-QTSVG_VERSION := $(QTSVG_VERSION_MAJOR).2
+QTSVG_VERSION := $(QTSVG_VERSION_MAJOR).7
QTSVG_URL := https://download.qt.io/official_releases/qt/$(QTSVG_VERSION_MAJOR)/$(QTSVG_VERSION)/submodules/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
DEPS_qtsvg += qt $(DEPS_qt)
More information about the vlc-commits
mailing list