[vlc-commits] [Git][videolan/vlc][master] 2 commits: Revert "contrib: qtbase: disable feature `mdiarea`"

Jean-Baptiste Kempf (@jbk) gitlab at videolan.org
Sun May 26 15:00:04 UTC 2024 


Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
bdad7d3d by Fatih Uzunoglu at 2024-05-26T14:15:07+00:00
Revert "contrib: qtbase: disable feature `mdiarea`"

This reverts commit e7a748baa97e47157620bceb6d16fa0977d70fe9.

This is required for Qt 6.7.1 Modern Windows Style.

- - - - -
71d385ab by Fatih Uzunoglu at 2024-05-26T14:15:07+00:00
contrib: qt: update to 6.7.1

- - - - -


12 changed files:

- contrib/src/qt/SHA512SUMS
- contrib/src/qt/rules.mak
- contrib/src/qt5compat/SHA512SUMS
- contrib/src/qt5compat/rules.mak
- contrib/src/qtdeclarative/SHA512SUMS
- contrib/src/qtdeclarative/rules.mak
- contrib/src/qtshadertools/SHA512SUMS
- contrib/src/qtshadertools/rules.mak
- contrib/src/qtsvg/SHA512SUMS
- contrib/src/qtsvg/rules.mak
- contrib/src/qtwayland/SHA512SUMS
- contrib/src/qtwayland/rules.mak


Changes:

=====================================
contrib/src/qt/SHA512SUMS
=====================================
@@ -1 +1 @@
-72896cc5a677361779f49d60dbdfc33a21d77bd479e0586b0beb03eee2016d613aee56e798143a489431a07a5e7a7db4c7c046105a11b63dd178768f3a7f195a qtbase-everywhere-src-6.7.0.tar.xz
+864bebfc3659907e52b8dc3f62a65d431573ef2bf406a9f71c688229083a2128c5474f75823275d11948be3d031de1d6427acf373f977df9ee9e73a27ef56efb qtbase-everywhere-src-6.7.1.tar.xz


=====================================
contrib/src/qt/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # qtbase
 
 QTBASE_VERSION_MAJOR := 6.7
-QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).0
+QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).1
 # Insert potential -betaX suffix here:
 QTBASE_VERSION_FULL := $(QTBASE_VERSION)
 QTBASE_URL := $(QT)/$(QTBASE_VERSION_MAJOR)/$(QTBASE_VERSION_FULL)/submodules/qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz
@@ -83,7 +83,7 @@ QTBASE_CONFIG += -static -opensource -confirm-license -no-pkg-config -no-openssl
 	-no-feature-xml -no-feature-printsupport -system-libpng -system-zlib -no-feature-network \
 	-no-feature-movie -no-feature-pdf -no-feature-whatsthis -no-feature-lcdnumber \
 	-no-feature-syntaxhighlighter -no-feature-undoview -no-feature-splashscreen \
-	-no-feature-dockwidget -no-feature-mdiarea -no-feature-statusbar -no-feature-statustip \
+	-no-feature-dockwidget -no-feature-statusbar -no-feature-statustip \
 	-no-feature-keysequenceedit -no-feature-pkg-config \
 	-nomake examples -prefix $(PREFIX) -qt-host-path $(BUILDPREFIX) \
 	-- -DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake)


=====================================
contrib/src/qt5compat/SHA512SUMS
=====================================
@@ -1 +1 @@
-92115ca88b839171cf69360e0c3add64bb84305fdc28b9459da5eb69df79bfc2884616991ada898242e3614ac4f188dd76aa17889b5fb7fa72316a11efd61c85 qt5compat-everywhere-src-6.7.0.tar.xz
+f6a3552f6aefab374bf3e483774dff10c9aaebee7085b81b1487a0ed6fb7cff072d9f97bd199ff3e9fef6838d93aa015dec58c5b5e11f6eb4fb062a0ca015e52 qt5compat-everywhere-src-6.7.1.tar.xz


=====================================
contrib/src/qt5compat/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # Qt5Compat
 
 QT5COMPAT_VERSION_MAJOR := 6.7
-QT5COMPAT_VERSION := $(QT5COMPAT_VERSION_MAJOR).0
+QT5COMPAT_VERSION := $(QT5COMPAT_VERSION_MAJOR).1
 QT5COMPAT_URL := $(QT)/$(QT5COMPAT_VERSION_MAJOR)/$(QT5COMPAT_VERSION)/submodules/qt5compat-everywhere-src-$(QT5COMPAT_VERSION).tar.xz
 
 DEPS_qt5compat += qtdeclarative $(DEPS_qtdeclarative)


=====================================
contrib/src/qtdeclarative/SHA512SUMS
=====================================
@@ -1 +1 @@
-b189f3fc4ae9ad3e5c26aa56696b97cb2f1894cb23110928a31e5a62fb779578b492bec2f4dda5b31958a33eb2571ec4e1085ae6864442507be3ae0da83c96ee qtdeclarative-everywhere-src-6.7.0.tar.xz
+77cdd31f2efa6e677755477b14c7770afa51b81cc7626ef21ebccf52ce69173a73b03851b0b491766f816e0cc946e6f238f8c7c70ad121d56428fe513e50a4d0 qtdeclarative-everywhere-src-6.7.1.tar.xz


=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # QtDeclarative
 
 QTDECLARATIVE_VERSION_MAJOR := 6.7
-QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).0
+QTDECLARATIVE_VERSION := $(QTDECLARATIVE_VERSION_MAJOR).1
 QTDECLARATIVE_URL := $(QT)/$(QTDECLARATIVE_VERSION_MAJOR)/$(QTDECLARATIVE_VERSION)/submodules/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz
 
 DEPS_qtdeclarative-tools = qt-tools $(DEPS_qt-tools) qtshadertools-tools $(DEPS_qtshadertools-tools)


=====================================
contrib/src/qtshadertools/SHA512SUMS
=====================================
@@ -1 +1 @@
-30f737093fcdba6b247425c21f15d5682454255fdcf04cbe9f822e5b549dcdbb6fa519bfbcd0f2ba8acfa775cec7c30a630b61d50e00afa8c017ae9a16a73497 qtshadertools-everywhere-src-6.7.0.tar.xz
+8de9659e11c8b0048fd0af7616aec9a3395a3844f5e24740a88ffd7c3acffba041150338e2a3b7986006edd77a557bb944992b082191d2d959aae511fbc35dc6 qtshadertools-everywhere-src-6.7.1.tar.xz


=====================================
contrib/src/qtshadertools/rules.mak
=====================================
@@ -2,7 +2,7 @@
 # required for Qt5Compat, and for qtdeclarative.
 
 QTSHADERTOOLS_VERSION_MAJOR := 6.7
-QTSHADERTOOLS_VERSION := $(QTSHADERTOOLS_VERSION_MAJOR).0
+QTSHADERTOOLS_VERSION := $(QTSHADERTOOLS_VERSION_MAJOR).1
 QTSHADERTOOLS_URL := $(QT)/$(QTSHADERTOOLS_VERSION_MAJOR)/$(QTSHADERTOOLS_VERSION)/submodules/qtshadertools-everywhere-src-$(QTSHADERTOOLS_VERSION).tar.xz
 
 DEPS_qtshadertools-tools = qt-tools $(DEPS_qt-tools)


=====================================
contrib/src/qtsvg/SHA512SUMS
=====================================
@@ -1 +1 @@
-b68e4e235f1a6b0ddbb130fbc06aa7ac06f074c5d33f588dd7049b5986ae070e1e4e976f22fba2bef81adc3beac8c4564a01c818b3594e06ab36d9939ce0e7b3 qtsvg-everywhere-src-6.7.0.tar.xz
+8c5b54886e8a9580c022229b8b6176eaf9f113890333e5d9ca558fe57e6f2acad2a2e01fb5154ddb67a48ac95727d744339512876fb8334077ca5af27506e106 qtsvg-everywhere-src-6.7.1.tar.xz


=====================================
contrib/src/qtsvg/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # qtsvg
 
 QTSVG_VERSION_MAJOR := 6.7
-QTSVG_VERSION := $(QTSVG_VERSION_MAJOR).0
+QTSVG_VERSION := $(QTSVG_VERSION_MAJOR).1
 QTSVG_URL := $(QT)/$(QTSVG_VERSION_MAJOR)/$(QTSVG_VERSION)/submodules/qtsvg-everywhere-src-$(QTSVG_VERSION).tar.xz
 
 DEPS_qtsvg += qt $(DEPS_qt)


=====================================
contrib/src/qtwayland/SHA512SUMS
=====================================
@@ -1 +1 @@
-cda0e0736f85656d05b2399970413ffc5082af4256c8b3087c3f1d06cad5ef5ad7cb8838513723569193df02cd3c3df3d5478d99464606c62c42629ef75c225f  qtwayland-everywhere-src-6.7.0.tar.xz
+9128ecd32319fd2ca154cb3d52726c80f96e2c906f9cf80cd67a3f91a4db49a853948489ec712061c6ef2c5abe70cd850c37f947659199678ac1482c77485a76  qtwayland-everywhere-src-6.7.1.tar.xz


=====================================
contrib/src/qtwayland/rules.mak
=====================================
@@ -1,7 +1,7 @@
 # qtwayland
 
 QTWAYLAND_VERSION_MAJOR := 6.7
-QTWAYLAND_VERSION := $(QTWAYLAND_VERSION_MAJOR).0
+QTWAYLAND_VERSION := $(QTWAYLAND_VERSION_MAJOR).1
 QTWAYLAND_URL := $(QT)/$(QTWAYLAND_VERSION_MAJOR)/$(QTWAYLAND_VERSION)/submodules/qtwayland-everywhere-src-$(QTWAYLAND_VERSION).tar.xz
 
 ifdef HAVE_LINUX



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/677e4d447ec45b8b990e79e1993f5743e2cd604e...71d385aba8336aac24576e407869697c6297612e

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/677e4d447ec45b8b990e79e1993f5743e2cd604e...71d385aba8336aac24576e407869697c6297612e
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance

More information about the vlc-commits mailing list