[vlc-commits] [Git][videolan/vlc][master] 15 commits: contrib: qtbase: revert altered author and subject of a patch
Steve Lhomme (@robUx4)
gitlab at videolan.org
Mon Nov 4 07:07:57 UTC 2024
Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
06ffb306 by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qtbase: revert altered author and subject of a patch
Patch 846a13b3703dc4bac6f7a9f3bbb6aa31fa5660f7 got its author
and subject mistakenly changed during Qt 6 update during re-
basing the patch.
- - - - -
fbbfd646 by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qtbase: add description for patch
... `Try DCompositionCreateDevice3() first if available`
- - - - -
e922ccd0 by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qtbase: add description for patch
... `Expose QRhiImplementation in QRhi`
- - - - -
65bcf747 by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qtbase: add description for patch
... `Do not include D3D12MemAlloc.h in header file`
- - - - -
0e316029 by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qtbase: add description for patch
... `Revert "QMutex: remove qmutex_win.cpp"`
- - - - -
66b8476f by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qt5compat: add description for patch
... `Revert "Auxiliary commit to revert individual
files from 0ba059c6dc8b7c0f6ac4a277c96b6b16e43053a2"`
- - - - -
f5c1e259 by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qtdeclarative: add description for patch
... `Fix incorrect library inclusion`
- - - - -
89c6dedb by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
qt: do not import QtQmlMetaPlugin with Qt 6.8
This plugin is not available starting with Qt 6.8.
- - - - -
04462b6f by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
qt: do not init resource `qmake_QtQml_Base` with Qt 6.8
This resource is not available starting with Qt 6.8.
- - - - -
cca5f11c by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: mingw64: update uiautomation if MinGW-w64 is older than 11
uiautomation is used by Qt
- - - - -
629b4cc4 by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qtbase: disable stack clash protection for win32 without clang
"-fstack-clash-protection" is reportedly not relevant on Windows due to
SEH, and it causes the following internal compiler error with the win64
build where an old compiler is used:
In file included from /builds/fuzun/vlc/contrib/contrib-win64/qt/src/3rdparty/pcre2/src/pcre2_jit_compile.c:14969:
/builds/fuzun/vlc/contrib/contrib-win64/qt/src/3rdparty/pcre2/src/pcre2_jit_match.c: In function ‘jit_machine_stack_exec’:
/builds/fuzun/vlc/contrib/contrib-win64/qt/src/3rdparty/pcre2/src/pcre2_jit_match.c:64:1: internal compiler error: in i386_pe_seh_unwind_emit, at config/i386/winnt.cc:1274
64 | }
| ^
0x19c58a7 internal_error(char const*, ...)
???:0
0x664b2e fancy_abort(char const*, int, char const*)
???:0
0x8cb74b final_scan_insn(rtx_insn*, _IO_FILE*, int, int, int*)
???:0
Please submit a full bug report, with preprocessed source (by using -freport-bug).
Please include the complete backtrace with any bug report.
See <https://gcc.gnu.org/bugs/> for instructions.
- - - - -
74ed28a8 by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qtbase: add uiautomationcore as dependency
If MinGW-w64 is too old, uiautomation needs to
be updated.
Ref. Qt commit: d25d9f2c2673bc287590d9a83bd7ef1357d7021a
- - - - -
b874dd90 by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qt: update to 6.8.0
- - - - -
91d992fa by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
Reapply "contrib: qtbase: disable feature `mdiarea`"
Qt 6.8 allows disabling the mdiarea feature without
affecting the modern windows style
This reverts commit bdad7d3d1cd74ae3b8a2d5ddb1bd62effd0667f5.
- - - - -
6de7998f by Fatih Uzunoglu at 2024-11-04T05:56:15+00:00
contrib: qtbase: disable building the unused direct2d platform plugin
Currently `direct2d` platform plugin is not used in
favor of `windows` platform plugin. So, it is not
necessary to build that platform plugin at the
moment. The matching feature for the platform plugin
is `direct2d1_1`.
The reason `direct2d` platform plugin is not used is
because it is not the default by Qt (as of Qt 6.8),
and it is not possible to statically link to both
`direct2d` and `windows` platform plugins due to
symbol clash, and `direct2d` menus are not supported
by Wine.
It should be noted that we still need `direct2d`
feature itself (`direct2d`), particularly because
of directwrite that is used for the font engine
and font database.
- - - - -
24 changed files:
- contrib/src/main.mak
- contrib/src/mingw64/rules.mak
- contrib/src/qt/0005-Do-not-include-D3D12MemAlloc.h-in-header-file.patch → contrib/src/qt/0001-Do-not-include-D3D12MemAlloc.h-in-header-file.patch
- contrib/src/qt/0004-Expose-QRhiImplementation-in-QRhi.patch → contrib/src/qt/0001-Expose-QRhiImplementation-in-QRhi.patch
- contrib/src/qt/0003-Revert-QMutex-remove-qmutex_win.cpp.patch → contrib/src/qt/0001-Revert-QMutex-remove-qmutex_win.cpp.patch
- contrib/src/qt/0006-Try-DCompositionCreateDevice3-first-if-available.patch → contrib/src/qt/0001-Try-DCompositionCreateDevice3-first-if-available.patch
- + contrib/src/qt/0001-Use-DirectWrite-font-database-only-with-Windows-10-a.patch
- contrib/src/qt/0001-Windows-Tray-Icon-Set-NOSOUND.patch → contrib/src/qt/0001-Windows-QPA-Disable-systray-notification-sounds.patch
- contrib/src/qt/0007-Try-to-satisfy-Windows-7-compatibility.patch → contrib/src/qt/0002-Satisfy-Windows-7-compatibility.patch
- contrib/src/qt/0001-Do-not-link-D3D9.patch → contrib/src/qt/0003-Do-not-link-D3D9.patch
- contrib/src/qt/SHA512SUMS
- contrib/src/qt/rules.mak
- contrib/src/qt5compat/0001-Revert-Auxiliary-commit-to-revert-individual-files-f.patch
- contrib/src/qt5compat/SHA512SUMS
- contrib/src/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch
- − contrib/src/qtdeclarative/0001-Take-care-of-asyncResponses-when-qml_network-is-disa.patch
- − contrib/src/qtdeclarative/0002-Fix-build-with-no-feature-network.patch
- contrib/src/qtdeclarative/SHA512SUMS
- contrib/src/qtdeclarative/rules.mak
- contrib/src/qtshadertools/SHA512SUMS
- contrib/src/qtsvg/SHA512SUMS
- contrib/src/qtwayland/SHA512SUMS
- modules/gui/qt/plugins.hpp
- modules/gui/qt/qt.cpp
Changes:
=====================================
contrib/src/main.mak
=====================================
@@ -17,8 +17,8 @@ DATE := $(shell date +%Y%m%d)
VPATH := $(TARBALLS)
# Default Qt version
-QTBASE_VERSION_MAJOR := 6.7
-QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).1
+QTBASE_VERSION_MAJOR := 6.8
+QTBASE_VERSION := $(QTBASE_VERSION_MAJOR).0
# Common download locations
GNU ?= http://ftp.gnu.org/gnu
=====================================
contrib/src/mingw64/rules.mak
=====================================
@@ -14,7 +14,7 @@ PKGS += winrt_headers alloweduwp
else # !HAVE_WINSTORE
PKGS += dcomp
endif # !HAVE_WINSTORE
-PKGS += dxva dxvahd mingw11-fixes mingw12-fixes mft10 d3d12
+PKGS += dxva dxvahd mingw11-fixes mingw12-fixes mft10 d3d12 uiautomationcore
ifdef HAVE_WINSTORE
PKGS_FOUND += winrt_headers
@@ -26,7 +26,7 @@ ifeq ($(call mingw_at_least, 10), true)
PKGS_FOUND += dcomp
endif
ifeq ($(call mingw_at_least, 11), true)
-PKGS_FOUND += dxvahd
+PKGS_FOUND += dxvahd uiautomationcore
endif # MINGW 11
ifeq ($(call mingw_at_least, 12), true)
PKGS_FOUND += mingw11-fixes d3d12
@@ -43,7 +43,7 @@ endif
endif # HAVE_WIN32
-PKGS_ALL += winpthreads winrt_headers dxva dxvahd dcomp mingw11-fixes mingw12-fixes alloweduwp mft10 d3d12
+PKGS_ALL += winpthreads winrt_headers dxva dxvahd dcomp mingw11-fixes mingw12-fixes alloweduwp mft10 d3d12 uiautomationcore
# $(TARBALLS)/mingw-w64-$(MINGW64_HASH).tar.xz:
# $(call download_git,$(MINGW64_GITURL),,$(MINGW64_HASH))
@@ -195,3 +195,21 @@ endif
+$(MAKEBUILD) -C mingw-w64-crt LIBRARIES=$(MINGW64_BUILDDIR)/libd3d12.a DATA= HEADERS=
+$(MAKEBUILD) -C mingw-w64-crt $(MINGW64_BUILDDIR)_LIBRARIES=$(MINGW64_BUILDDIR)/libd3d12.a install-$(MINGW64_BUILDDIR)LIBRARIES
touch $@
+
+.sum-uiautomationcore: .sum-mingw64
+ touch $@
+
+.uiautomationcore: mingw64
+ install -d "$(PREFIX)/include"
+ install $</mingw-w64-headers/include/uiautomation.h "$(PREFIX)/include"
+ install $</mingw-w64-headers/include/uiautomationcore.h "$(PREFIX)/include"
+ install $</mingw-w64-headers/include/uiautomationcoreapi.h "$(PREFIX)/include"
+ install $</mingw-w64-headers/include/uiautomationclient.h "$(PREFIX)/include"
+
+ # Trick mingw-w64 into just building libuiautomationcore.a
+ $(MAKEBUILDDIR)
+ $(MAKECONFIGURE) $(MINGW64_MINIMALCRT_CONF)
+ mkdir -p $(BUILD_DIR)/mingw-w64-crt/$(MINGW64_BUILDDIR)
+ +$(MAKEBUILD) -C mingw-w64-crt LIBRARIES=$(MINGW64_BUILDDIR)/libuiautomationcore.a DATA= HEADERS=
+ +$(MAKEBUILD) -C mingw-w64-crt $(MINGW64_BUILDDIR)_LIBRARIES=$(MINGW64_BUILDDIR)/libuiautomationcore.a install-$(MINGW64_BUILDDIR)LIBRARIES
+ touch $@
=====================================
contrib/src/qt/0005-Do-not-include-D3D12MemAlloc.h-in-header-file.patch → contrib/src/qt/0001-Do-not-include-D3D12MemAlloc.h-in-header-file.patch
=====================================
@@ -1,8 +1,11 @@
From 94a120d3668a29b3f08b3dcba68656038888a60d Mon Sep 17 00:00:00 2001
From: Fatih Uzunoglu <fuzun54 at outlook.com>
Date: Mon, 22 Jan 2024 21:19:55 +0200
-Subject: [PATCH 5/7] Do not include D3D12MemAlloc.h in header file
+Subject: [PATCH] Do not include D3D12MemAlloc.h in header file
+D3D12MemAlloc.h is a third-party header and is not deployed with
+the Qt installation, which makes `qrhid3d12_p.h` useless. This is
+fixed by including D3D12MemAlloc.h in the source file instead.
---
src/gui/rhi/qrhid3d12.cpp | 11 +++++++++++
src/gui/rhi/qrhid3d12_p.h | 17 +++++++----------
=====================================
contrib/src/qt/0004-Expose-QRhiImplementation-in-QRhi.patch → contrib/src/qt/0001-Expose-QRhiImplementation-in-QRhi.patch
=====================================
@@ -3,6 +3,10 @@ From: Fatih Uzunoglu <fuzun54 at outlook.com>
Date: Thu, 18 Jan 2024 17:30:26 +0200
Subject: [PATCH 4/7] Expose QRhiImplementation in QRhi
+Exposing QRhiImplementation is necessary, because that
+is how the IDCompositionDevice instance created by Qt
+is accessed. This is only relevant for the Direct
+Composition integration.
---
src/gui/rhi/qrhi.h | 3 +++
1 file changed, 3 insertions(+)
=====================================
contrib/src/qt/0003-Revert-QMutex-remove-qmutex_win.cpp.patch → contrib/src/qt/0001-Revert-QMutex-remove-qmutex_win.cpp.patch
=====================================
@@ -1,7 +1,10 @@
From a566b1d5192a99b41ae13706668b7c8bf786e204 Mon Sep 17 00:00:00 2001
From: Fatih Uzunoglu <fuzun54 at outlook.com>
Date: Sun, 14 Jan 2024 23:34:29 +0200
-Subject: [PATCH 3/7] Revert "QMutex: remove qmutex_win.cpp"
+Subject: [PATCH] Revert "QMutex: remove qmutex_win.cpp"
+
+qmutex_win.cpp is useful for Windows 7 where futex is not
+available.
This reverts commit b6e30e9fee98f9cdfec4c54c980864f65632519c.
---
=====================================
contrib/src/qt/0006-Try-DCompositionCreateDevice3-first-if-available.patch → contrib/src/qt/0001-Try-DCompositionCreateDevice3-first-if-available.patch
=====================================
@@ -1,8 +1,11 @@
From 2e74ca54c146bda95482900faba547e96ece24a1 Mon Sep 17 00:00:00 2001
From: Fatih Uzunoglu <fuzun54 at outlook.com>
Date: Wed, 24 Jan 2024 16:31:06 +0200
-Subject: [PATCH 6/7] Try DCompositionCreateDevice3() first if available
+Subject: [PATCH] Try DCompositionCreateDevice3() first if available
+When the native acrylic effect is not available, the application uses
+effects that can be created through IDCompositionDevice3 with the
+Direct Composition integration.
---
src/gui/rhi/qrhid3dhelpers.cpp | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
=====================================
contrib/src/qt/0001-Use-DirectWrite-font-database-only-with-Windows-10-a.patch
=====================================
@@ -0,0 +1,34 @@
+From 0c0f01b6481ba58035e1115e732cf1dadfc4dddc Mon Sep 17 00:00:00 2001
+From: Fatih Uzunoglu <fuzun54 at outlook.com>
+Date: Tue, 8 Oct 2024 19:29:32 +0300
+Subject: [PATCH] Use DirectWrite font database only with Windows 10 and above
+
+Functionalities used by Qt are not provided with Windows
+versions that are not officially supported by Qt (Windows
+7, Windows 8) but supported by VLC media player.
+
+For example, IDWriteFontFace3 is only reportedly available
+starting with Windows 10. This change is necessary starting
+with Qt 6.8, where DirectWrite is used by default to populate
+the font database.
+---
+ src/plugins/platforms/windows/qwindowsintegration.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp
+index 487e1d47b6..9e879815dc 100644
+--- a/src/plugins/platforms/windows/qwindowsintegration.cpp
++++ b/src/plugins/platforms/windows/qwindowsintegration.cpp
+@@ -485,7 +485,8 @@ QPlatformFontDatabase *QWindowsIntegration::fontDatabase() const
+ else
+ #endif // QT_NO_FREETYPE
+ #if QT_CONFIG(directwrite3)
+- if (!(d->m_options & (QWindowsIntegration::FontDatabaseGDI | QWindowsIntegration::DontUseDirectWriteFonts)))
++ if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::Windows10 &&
++ !(d->m_options & (QWindowsIntegration::FontDatabaseGDI | QWindowsIntegration::DontUseDirectWriteFonts)))
+ d->m_fontDatabase = new QWindowsDirectWriteFontDatabase;
+ else
+ #endif
+--
+2.46.2
+
=====================================
contrib/src/qt/0001-Windows-Tray-Icon-Set-NOSOUND.patch → contrib/src/qt/0001-Windows-QPA-Disable-systray-notification-sounds.patch
=====================================
@@ -1,7 +1,7 @@
From 846a13b3703dc4bac6f7a9f3bbb6aa31fa5660f7 Mon Sep 17 00:00:00 2001
-From: Fatih Uzunoglu <fuzun54 at outlook.com>
+From: =?UTF-8?q?Hugo=20Beauz=C3=A9e-Luyssen?= <hugo at beauzee.fr>
Date: Tue, 9 Jan 2024 20:59:45 +0200
-Subject: [PATCH 1/7] Windows Tray Icon Set NOSOUND
+Subject: [PATCH] Windows QPA: Disable systray notification sounds
---
src/plugins/platforms/windows/qwindowssystemtrayicon.cpp | 3 +++
=====================================
contrib/src/qt/0007-Try-to-satisfy-Windows-7-compatibility.patch → contrib/src/qt/0002-Satisfy-Windows-7-compatibility.patch
=====================================
@@ -1,7 +1,7 @@
-From 0ecf855405af7ab941e5ddeac85373549e733fdc Mon Sep 17 00:00:00 2001
+From 0d41cd0bfcd02af594a1b9da9f6784cdb019b334 Mon Sep 17 00:00:00 2001
From: Fatih Uzunoglu <fuzun54 at outlook.com>
Date: Mon, 22 Jan 2024 21:37:39 +0200
-Subject: [PATCH 7/7] Try to satisfy Windows 7 compatibility
+Subject: [PATCH] Satisfy Windows 7 compatibility
---
cmake/QtBaseConfigureTests.cmake | 10 +-
@@ -12,9 +12,10 @@ Subject: [PATCH 7/7] Try to satisfy Windows 7 compatibility
src/corelib/kernel/qfunctions_win.cpp | 13 +-
src/corelib/thread/qfutex_win_p.h | 42 +++++-
src/corelib/thread/qmutex_win.cpp | 4 +-
+ src/corelib/thread/qthread_win.cpp | 25 ++--
src/gui/CMakeLists.txt | 1 -
src/gui/rhi/qrhid3d11.cpp | 5 +-
- src/gui/rhi/qrhid3d12.cpp | 68 +++++++++-
+ src/gui/rhi/qrhid3d12.cpp | 87 ++++++++++---
.../text/windows/qwindowsfontdatabasebase.cpp | 14 +-
.../networklistmanager/CMakeLists.txt | 1 -
src/plugins/platforms/direct2d/CMakeLists.txt | 2 -
@@ -22,8 +23,8 @@ Subject: [PATCH 7/7] Try to satisfy Windows 7 compatibility
src/plugins/platforms/windows/CMakeLists.txt | 2 -
.../platforms/windows/qtwindowsglobal.h | 4 +
.../platforms/windows/qwin10helpers.cpp | 24 +++-
- .../platforms/windows/qwindowscontext.cpp | 126 +++++++++++++++---
- .../platforms/windows/qwindowscontext.h | 95 +++++++++++++
+ .../platforms/windows/qwindowscontext.cpp | 120 +++++++++++++++---
+ .../platforms/windows/qwindowscontext.h | 95 ++++++++++++++
.../platforms/windows/qwindowsdrag.cpp | 10 +-
.../platforms/windows/qwindowskeymapper.cpp | 17 ++-
.../windows/qwindowspointerhandler.cpp | 33 +++--
@@ -31,10 +32,10 @@ Subject: [PATCH 7/7] Try to satisfy Windows 7 compatibility
.../platforms/windows/qwindowstheme.cpp | 6 +-
.../platforms/windows/qwindowswindow.cpp | 48 +++++--
src/widgets/styles/qwindowsstyle.cpp | 26 +++-
- 27 files changed, 518 insertions(+), 93 deletions(-)
+ 28 files changed, 535 insertions(+), 114 deletions(-)
diff --git a/cmake/QtBaseConfigureTests.cmake b/cmake/QtBaseConfigureTests.cmake
-index ebfd17bddf..34c067cd35 100644
+index 66a0b3b6dd..80b1e2c640 100644
--- a/cmake/QtBaseConfigureTests.cmake
+++ b/cmake/QtBaseConfigureTests.cmake
@@ -163,16 +163,16 @@ function(qt_internal_ensure_latest_win_nt_api)
@@ -60,10 +61,10 @@ index ebfd17bddf..34c067cd35 100644
CACHE STRING "Qt platform specific pre-processor defines" FORCE)
endif()
diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
-index c03d3d9e73..f1f9abce74 100644
+index e17048ce3e..242fb1f6e5 100644
--- a/src/corelib/CMakeLists.txt
+++ b/src/corelib/CMakeLists.txt
-@@ -517,17 +517,17 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_animation
+@@ -528,17 +528,17 @@ qt_internal_extend_target(Core CONDITION QT_FEATURE_animation
animation/qvariantanimation.cpp animation/qvariantanimation.h animation/qvariantanimation_p.h
)
@@ -87,7 +88,7 @@ index c03d3d9e73..f1f9abce74 100644
)
qt_internal_extend_target(Core CONDITION WIN32
-@@ -821,10 +821,10 @@ qt_internal_extend_target(Core CONDITION WASM
+@@ -852,10 +852,10 @@ qt_internal_extend_target(Core CONDITION WASM
)
# On MS-Win, clang has two flavors, one of which immitates MSVC (so claims to be it)
@@ -127,7 +128,7 @@ index 5586d0b927..eb0264b4ee 100644
#ifndef NOMINMAX
diff --git a/src/corelib/io/qfilesystemengine_win.cpp b/src/corelib/io/qfilesystemengine_win.cpp
-index 3ec32e31a1..106c479fc7 100644
+index bdcac20dd3..a2ec288240 100644
--- a/src/corelib/io/qfilesystemengine_win.cpp
+++ b/src/corelib/io/qfilesystemengine_win.cpp
@@ -1,6 +1,11 @@
@@ -164,7 +165,7 @@ index a7663b2481..78ad3d3ede 100644
if (!ok)
ok = SetTimer(internalHwnd, t->timerId, interval, nullptr);
diff --git a/src/corelib/kernel/qfunctions_win.cpp b/src/corelib/kernel/qfunctions_win.cpp
-index d5ce3e5894..a712a1a74f 100644
+index 048fdbc934..c176186888 100644
--- a/src/corelib/kernel/qfunctions_win.cpp
+++ b/src/corelib/kernel/qfunctions_win.cpp
@@ -4,6 +4,7 @@
@@ -175,7 +176,7 @@ index d5ce3e5894..a712a1a74f 100644
#include <combaseapi.h>
#include <objbase.h>
-@@ -46,7 +47,17 @@ bool qt_win_hasPackageIdentity()
+@@ -47,7 +48,17 @@ bool qt_win_hasPackageIdentity()
#if defined(HAS_APPMODEL)
static const bool hasPackageIdentity = []() {
UINT32 length = 0;
@@ -287,20 +288,70 @@ index 8c7741c113..ce3586a90b 100644
}
void QMutexPrivate::wakeUp() noexcept
+diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
+index 0fba38d250..78197b4044 100644
+--- a/src/corelib/thread/qthread_win.cpp
++++ b/src/corelib/thread/qthread_win.cpp
+@@ -11,6 +11,7 @@
+
+ #include <private/qcoreapplication_p.h>
+ #include <private/qeventdispatcher_win_p.h>
++#include <private/qsystemlibrary_p.h>
+
+ #include <qt_windows.h>
+
+@@ -19,17 +20,6 @@
+ #endif // _MT
+ #include <process.h>
+
+-extern "C" {
+-// MinGW is missing the declaration of SetThreadDescription:
+-WINBASEAPI
+-HRESULT
+-WINAPI
+-SetThreadDescription(
+- _In_ HANDLE hThread,
+- _In_ PCWSTR lpThreadDescription
+- );
+-}
+-
+ QT_BEGIN_NAMESPACE
+
+ #if QT_CONFIG(thread)
+@@ -263,7 +253,18 @@ unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(voi
+ QString threadName = std::exchange(thr->d_func()->objectName, {});
+ if (Q_LIKELY(threadName.isEmpty()))
+ threadName = QString::fromUtf8(thr->metaObject()->className());
+- SetThreadDescription(GetCurrentThread(), reinterpret_cast<const wchar_t *>(threadName.utf16()));
++
++ {
++ typedef HRESULT (*SetThreadDescriptionFunc)(HANDLE, PCWSTR);
++
++ static SetThreadDescriptionFunc setThreadDescription = []() {
++ QSystemLibrary kernel32(QLatin1String("kernel32"));
++ return (SetThreadDescriptionFunc)(kernel32.resolve("SetThreadDescription"));
++ }();
++
++ if (setThreadDescription)
++ setThreadDescription(GetCurrentThread(), reinterpret_cast<const wchar_t *>(threadName.utf16()));
++ }
+
+ emit thr->started(QThread::QPrivateSignal());
+ QThread::setTerminationEnabled(true);
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
-index 8ea68087cf..4e91889c00 100644
+index 3b3dbd1321..2479d1f0fb 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
-@@ -433,7 +433,6 @@ qt_internal_extend_target(Gui CONDITION WIN32
+@@ -477,7 +477,6 @@ qt_internal_extend_target(Gui CONDITION WIN32
d3d11
dxgi
dxguid
- d3d12
+ ATTRIBUTION_FILE_DIR_PATHS
+ ../3rdparty/D3D12MemoryAllocator
)
-
- if(QT_FEATURE_graphicsframecapture)
diff --git a/src/gui/rhi/qrhid3d11.cpp b/src/gui/rhi/qrhid3d11.cpp
-index 4bea980c90..dec40ae898 100644
+index c0fe6ec6f5..661c5ec0fe 100644
--- a/src/gui/rhi/qrhid3d11.cpp
+++ b/src/gui/rhi/qrhid3d11.cpp
@@ -8,6 +8,7 @@
@@ -310,8 +361,8 @@ index 4bea980c90..dec40ae898 100644
+#include <QtCore/private/qsystemlibrary_p.h>
#include "qrhid3dhelpers_p.h"
- QT_BEGIN_NAMESPACE
-@@ -181,9 +182,9 @@ inline Int aligned(Int v, Int byteAlign)
+ #include <cstdio>
+@@ -185,9 +186,9 @@ inline Int aligned(Int v, Int byteAlign)
static IDXGIFactory1 *createDXGIFactory2()
{
IDXGIFactory1 *result = nullptr;
@@ -324,7 +375,7 @@ index 4bea980c90..dec40ae898 100644
result = nullptr;
}
diff --git a/src/gui/rhi/qrhid3d12.cpp b/src/gui/rhi/qrhid3d12.cpp
-index d40f14c5a3..b818646c55 100644
+index 9e55799ac5..257181bba6 100644
--- a/src/gui/rhi/qrhid3d12.cpp
+++ b/src/gui/rhi/qrhid3d12.cpp
@@ -5,6 +5,7 @@
@@ -335,7 +386,7 @@ index d40f14c5a3..b818646c55 100644
#include <comdef.h>
#include "qrhid3dhelpers_p.h"
#include "cs_mipmap_p.h"
-@@ -150,6 +151,17 @@ QT_BEGIN_NAMESPACE
+@@ -153,6 +154,17 @@ QT_BEGIN_NAMESPACE
// https://learn.microsoft.com/en-us/windows/win32/direct3d12/hardware-feature-levels
static const D3D_FEATURE_LEVEL MIN_FEATURE_LEVEL = D3D_FEATURE_LEVEL_11_0;
@@ -353,33 +404,49 @@ index d40f14c5a3..b818646c55 100644
void QD3D12Resource::releaseResources()
{
if (owns) {
-@@ -216,14 +228,23 @@ bool QRhiD3D12::create(QRhi::Flags flags)
+@@ -219,20 +231,30 @@ bool QRhiD3D12::create(QRhi::Flags flags)
UINT factoryFlags = 0;
if (debugLayer)
factoryFlags |= DXGI_CREATE_FACTORY_DEBUG;
- HRESULT hr = CreateDXGIFactory2(factoryFlags, __uuidof(IDXGIFactory2), reinterpret_cast<void **>(&dxgiFactory));
+- if (FAILED(hr)) {
+- // retry without debug, if it was requested (to match D3D11 backend behavior)
+- if (debugLayer) {
++
++ HRESULT hr = E_FAIL;
++
++ if (debugLayer) {
++ typedef HRESULT (*CreateDXGIFactory2FuncPtr)(UINT Flags, REFIID riid, void **ppFactory);
++ CreateDXGIFactory2FuncPtr createDXGIFactory2 = nullptr;
++ QSystemLibrary dxgilib(QLatin1String("dxgi"));
++ createDXGIFactory2 = reinterpret_cast<CreateDXGIFactory2FuncPtr>(dxgilib.resolve("CreateDXGIFactory2"));
++ if (createDXGIFactory2) {
++ hr = createDXGIFactory2(factoryFlags, __uuidof(IDXGIFactory2), reinterpret_cast<void **>(&dxgiFactory));
++ }
+
-+ QSystemLibrary dxgilib(QLatin1String("dxgi"));
-+ typedef HRESULT (*CreateDXGIFactory2FuncPtr)(UINT Flags, REFIID riid, void **ppFactory);
-+ const auto createDXGIFactory2 = reinterpret_cast<CreateDXGIFactory2FuncPtr>(dxgilib.resolve("CreateDXGIFactory2"));
-+ if (!createDXGIFactory2) {
-+ qWarning("Could not found symbol CreateDXGIFactory2. RhiD3D12 is not going to work.");
-+ return false;
-+ }
-+
-+ HRESULT hr = createDXGIFactory2(factoryFlags, __uuidof(IDXGIFactory2), reinterpret_cast<void **>(&dxgiFactory));
- if (FAILED(hr)) {
- // retry without debug, if it was requested (to match D3D11 backend behavior)
- if (debugLayer) {
++ if (FAILED(hr)) {
qCDebug(QRHI_LOG_INFO, "Debug layer was requested but is not available. "
"Attempting to create DXGIFactory2 without it.");
- factoryFlags &= ~DXGI_CREATE_FACTORY_DEBUG;
+- factoryFlags &= ~DXGI_CREATE_FACTORY_DEBUG;
- hr = CreateDXGIFactory2(factoryFlags, __uuidof(IDXGIFactory2), reinterpret_cast<void **>(&dxgiFactory));
-+ hr = createDXGIFactory2(factoryFlags, __uuidof(IDXGIFactory2), reinterpret_cast<void **>(&dxgiFactory));
- }
- if (SUCCEEDED(hr)) {
+- }
+- if (SUCCEEDED(hr)) {
debugLayer = false;
-@@ -245,7 +266,18 @@ bool QRhiD3D12::create(QRhi::Flags flags)
+- } else {
+- qWarning("CreateDXGIFactory2() failed to create DXGI factory: %s",
+- qPrintable(QSystemError::windowsComString(hr)));
++ }
++ }
++
++ if (!debugLayer) {
++ hr = CreateDXGIFactory1(__uuidof(IDXGIFactory2), reinterpret_cast<void **>(&dxgiFactory));
++ if (FAILED(hr)) {
++ qWarning("CreateDXGIFactory1() failed to create DXGI factory: %s",
++ qPrintable(QSystemError::windowsComString(hr)));
+ return false;
+ }
+ }
+@@ -253,7 +275,18 @@ bool QRhiD3D12::create(QRhi::Flags flags)
if (debugLayer) {
ID3D12Debug1 *debug = nullptr;
@@ -399,7 +466,7 @@ index d40f14c5a3..b818646c55 100644
qCDebug(QRHI_LOG_INFO, "Enabling D3D12 debug layer");
debug->EnableDebugLayer();
debug->Release();
-@@ -313,7 +345,22 @@ bool QRhiD3D12::create(QRhi::Flags flags)
+@@ -321,7 +354,22 @@ bool QRhiD3D12::create(QRhi::Flags flags)
if (minimumFeatureLevel == 0)
minimumFeatureLevel = MIN_FEATURE_LEVEL;
@@ -423,7 +490,7 @@ index d40f14c5a3..b818646c55 100644
minimumFeatureLevel,
__uuidof(ID3D12Device2),
reinterpret_cast<void **>(&dev));
-@@ -2796,7 +2843,12 @@ bool QD3D12MipmapGenerator::create(QRhiD3D12 *rhiD)
+@@ -2818,7 +2866,12 @@ bool QD3D12MipmapGenerator::create(QRhiD3D12 *rhiD)
rsDesc.Desc_1_1.pStaticSamplers = &samplerDesc;
ID3DBlob *signature = nullptr;
@@ -437,7 +504,7 @@ index d40f14c5a3..b818646c55 100644
if (FAILED(hr)) {
qWarning("Failed to serialize root signature: %s", qPrintable(QSystemError::windowsComString(hr)));
return false;
-@@ -5051,7 +5103,11 @@ QD3D12ObjectHandle QD3D12ShaderResourceBindings::createRootSignature(const QD3D1
+@@ -5092,7 +5145,11 @@ QD3D12ObjectHandle QD3D12ShaderResourceBindings::createRootSignature(const QD3D1
rsDesc.Desc_1_1.Flags = D3D12_ROOT_SIGNATURE_FLAGS(rsFlags);
ID3DBlob *signature = nullptr;
@@ -451,7 +518,7 @@ index d40f14c5a3..b818646c55 100644
qWarning("Failed to serialize root signature: %s", qPrintable(QSystemError::windowsComString(hr)));
return {};
diff --git a/src/gui/text/windows/qwindowsfontdatabasebase.cpp b/src/gui/text/windows/qwindowsfontdatabasebase.cpp
-index cef739201b..72a786efbf 100644
+index 84e619b0d9..58af493925 100644
--- a/src/gui/text/windows/qwindowsfontdatabasebase.cpp
+++ b/src/gui/text/windows/qwindowsfontdatabasebase.cpp
@@ -6,6 +6,7 @@
@@ -462,7 +529,7 @@ index cef739201b..72a786efbf 100644
#if QT_CONFIG(directwrite)
# if QT_CONFIG(directwrite3)
-@@ -704,7 +705,18 @@ QFont QWindowsFontDatabaseBase::systemDefaultFont()
+@@ -715,7 +716,18 @@ QFont QWindowsFontDatabaseBase::systemDefaultFont()
// Qt 6: Obtain default GUI font (typically "Segoe UI, 9pt", see QTBUG-58610)
NONCLIENTMETRICS ncm = {};
ncm.cbSize = sizeof(ncm);
@@ -495,10 +562,10 @@ index acd3754f4e..3c80ad3e1a 100644
)
diff --git a/src/plugins/platforms/direct2d/CMakeLists.txt b/src/plugins/platforms/direct2d/CMakeLists.txt
-index fe4a237aff..4357652207 100644
+index 062dc30143..6fe8102c3a 100644
--- a/src/plugins/platforms/direct2d/CMakeLists.txt
+++ b/src/plugins/platforms/direct2d/CMakeLists.txt
-@@ -77,10 +77,8 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
+@@ -75,10 +75,8 @@ qt_internal_add_plugin(QWindowsDirect2DIntegrationPlugin
winmm
winspool
wtsapi32
@@ -522,10 +589,10 @@ index 307ca2e550..8f1199e229 100644
#include "qwindowsdirect2dhelpers.h"
#include "qwindowsdirect2dintegration.h"
diff --git a/src/plugins/platforms/windows/CMakeLists.txt b/src/plugins/platforms/windows/CMakeLists.txt
-index ea119bfb1e..cb9be899a7 100644
+index bbb8c46cf6..9f6d6da936 100644
--- a/src/plugins/platforms/windows/CMakeLists.txt
+++ b/src/plugins/platforms/windows/CMakeLists.txt
-@@ -64,10 +64,8 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
+@@ -62,10 +62,8 @@ qt_internal_add_plugin(QWindowsIntegrationPlugin
winmm
winspool
wtsapi32
@@ -600,10 +667,10 @@ index 026e81cb0c..78c9bf2ea0 100644
if (FAILED(hr))
return false;
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp
-index c363b85cb3..0661f41aae 100644
+index 11a9290a2e..9236070a99 100644
--- a/src/plugins/platforms/windows/qwindowscontext.cpp
+++ b/src/plugins/platforms/windows/qwindowscontext.cpp
-@@ -44,6 +44,8 @@
+@@ -43,6 +43,8 @@
#include <QtCore/qsysinfo.h>
#include <QtCore/qscopedpointer.h>
#include <QtCore/quuid.h>
@@ -612,7 +679,7 @@ index c363b85cb3..0661f41aae 100644
#include <QtCore/private/qwinregistry_p.h>
#if QT_CONFIG(cpp_winrt)
# include <QtCore/private/qfactorycacheregistration_p.h>
-@@ -121,6 +123,85 @@ static inline bool sessionManagerInteractionBlocked()
+@@ -120,6 +122,85 @@ static inline bool sessionManagerInteractionBlocked()
static inline bool sessionManagerInteractionBlocked() { return false; }
#endif
@@ -698,30 +765,17 @@ index c363b85cb3..0661f41aae 100644
QWindowsContext *QWindowsContext::m_instance = nullptr;
/*!
-@@ -164,6 +245,9 @@ bool QWindowsContextPrivate::m_v2DpiAware = false;
+@@ -160,6 +241,9 @@ bool QWindowsContextPrivate::m_v2DpiAware = false;
QWindowsContextPrivate::QWindowsContextPrivate()
: m_oleInitializeResult(OleInitialize(nullptr))
{
+ QWindowsContext::user32dll.init();
+ QWindowsContext::shcoredll.init();
+
- if (m_pointerHandler.touchDevice() || m_mouseHandler.touchDevice())
+ if (m_pointerHandler.touchDevice())
m_systemInfo |= QWindowsContext::SI_SupportsTouch;
m_displayContext = GetDC(nullptr);
-@@ -282,6 +366,12 @@ bool QWindowsContext::initPointer(unsigned integrationOptions)
- if (integrationOptions & QWindowsIntegration::DontUseWMPointer)
- return false;
-
-+ if (QOperatingSystemVersion::current() < QOperatingSystemVersion::Windows8)
-+ return false;
-+
-+ if (!QWindowsContext::user32dll.supportsPointerApi())
-+ return false;
-+
- d->m_systemInfo |= QWindowsContext::SI_SupportsPointer;
- return true;
- }
-@@ -350,29 +440,31 @@ void QWindowsContext::setDetectAltGrModifier(bool a)
+@@ -336,29 +420,31 @@ void QWindowsContext::setDetectAltGrModifier(bool a)
}
[[nodiscard]] static inline QtWindows::DpiAwareness
@@ -762,7 +816,7 @@ index c363b85cb3..0661f41aae 100644
return dpiAwarenessContextToQtDpiAwareness(context);
}
-@@ -385,7 +477,10 @@ QtWindows::DpiAwareness QWindowsContext::processDpiAwareness()
+@@ -371,7 +457,10 @@ QtWindows::DpiAwareness QWindowsContext::processDpiAwareness()
// return the default DPI_AWARENESS_CONTEXT for the process if
// SetThreadDpiAwarenessContext() was never called. So we can use
// it as an equivalent.
@@ -774,7 +828,7 @@ index c363b85cb3..0661f41aae 100644
return dpiAwarenessContextToQtDpiAwareness(context);
}
-@@ -445,11 +540,11 @@ bool QWindowsContext::setProcessDpiAwareness(QtWindows::DpiAwareness dpiAwarenes
+@@ -431,11 +520,11 @@ bool QWindowsContext::setProcessDpiAwareness(QtWindows::DpiAwareness dpiAwarenes
if (processDpiAwareness() == dpiAwareness)
return true;
const auto context = qtDpiAwarenessToDpiAwarenessContext(dpiAwareness);
@@ -788,7 +842,7 @@ index c363b85cb3..0661f41aae 100644
qCWarning(lcQpaWindow).noquote().nospace()
<< "SetProcessDpiAwarenessContext() failed: "
<< QSystemError::windowsString()
-@@ -891,8 +986,8 @@ void QWindowsContext::forceNcCalcSize(HWND hwnd)
+@@ -868,8 +957,8 @@ void QWindowsContext::forceNcCalcSize(HWND hwnd)
bool QWindowsContext::systemParametersInfo(unsigned action, unsigned param, void *out,
unsigned dpi)
{
@@ -799,7 +853,7 @@ index c363b85cb3..0661f41aae 100644
: SystemParametersInfo(action, param, out, 0);
return result == TRUE;
}
-@@ -980,7 +1075,8 @@ static bool enableNonClientDpiScaling(HWND hwnd)
+@@ -957,7 +1046,8 @@ static bool enableNonClientDpiScaling(HWND hwnd)
{
bool result = false;
if (QWindowsContext::windowDpiAwareness(hwnd) == QtWindows::DpiAwareness::PerMonitor) {
@@ -810,7 +864,7 @@ index c363b85cb3..0661f41aae 100644
const DWORD errorCode = GetLastError();
qErrnoWarning(int(errorCode), "EnableNonClientDpiScaling() failed for HWND %p (%lu)",
diff --git a/src/plugins/platforms/windows/qwindowscontext.h b/src/plugins/platforms/windows/qwindowscontext.h
-index 1089224433..f6727a008a 100644
+index 4e9be1af96..1916868ba0 100644
--- a/src/plugins/platforms/windows/qwindowscontext.h
+++ b/src/plugins/platforms/windows/qwindowscontext.h
@@ -44,6 +44,98 @@ struct QWindowsContextPrivate;
@@ -912,7 +966,7 @@ index 1089224433..f6727a008a 100644
class QWindowsContext
{
Q_DISABLE_COPY_MOVE(QWindowsContext)
-@@ -138,6 +230,9 @@ public:
+@@ -134,6 +226,9 @@ public:
QWindowsScreenManager &screenManager();
QWindowsTabletSupport *tabletSupport() const;
@@ -923,7 +977,7 @@ index 1089224433..f6727a008a 100644
void setAsyncExpose(bool value);
diff --git a/src/plugins/platforms/windows/qwindowsdrag.cpp b/src/plugins/platforms/windows/qwindowsdrag.cpp
-index c6f55c3509..ae26641d86 100644
+index 5d3a47c22f..b75c712298 100644
--- a/src/plugins/platforms/windows/qwindowsdrag.cpp
+++ b/src/plugins/platforms/windows/qwindowsdrag.cpp
@@ -1,6 +1,11 @@
@@ -938,7 +992,7 @@ index c6f55c3509..ae26641d86 100644
#include <QtCore/qt_windows.h>
#include "qwindowsdrag.h"
#include "qwindowscontext.h"
-@@ -669,11 +674,14 @@ static HRESULT startDoDragDrop(LPDATAOBJECT pDataObj, LPDROPSOURCE pDropSource,
+@@ -670,11 +675,14 @@ static HRESULT startDoDragDrop(LPDATAOBJECT pDataObj, LPDROPSOURCE pDropSource,
}
if (msg.message == WM_POINTERUPDATE) {
@@ -955,7 +1009,7 @@ index c6f55c3509..ae26641d86 100644
if (pointerInfo.pointerFlags & POINTER_FLAG_PRIMARY) {
diff --git a/src/plugins/platforms/windows/qwindowskeymapper.cpp b/src/plugins/platforms/windows/qwindowskeymapper.cpp
-index af1230d240..edcb2889fd 100644
+index ba76cda40b..49b2429ce7 100644
--- a/src/plugins/platforms/windows/qwindowskeymapper.cpp
+++ b/src/plugins/platforms/windows/qwindowskeymapper.cpp
@@ -732,14 +732,23 @@ static inline QString messageKeyText(const MSG &msg)
@@ -987,7 +1041,7 @@ index af1230d240..edcb2889fd 100644
}
diff --git a/src/plugins/platforms/windows/qwindowspointerhandler.cpp b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
-index 9f1f25db8c..3660f2c0c8 100644
+index 7995716444..e1c0eb2e58 100644
--- a/src/plugins/platforms/windows/qwindowspointerhandler.cpp
+++ b/src/plugins/platforms/windows/qwindowspointerhandler.cpp
@@ -1,6 +1,11 @@
@@ -1002,7 +1056,7 @@ index 9f1f25db8c..3660f2c0c8 100644
#include <QtCore/qt_windows.h>
#include "qwindowspointerhandler.h"
-@@ -45,10 +50,17 @@ QWindowsPointerHandler::~QWindowsPointerHandler()
+@@ -52,10 +57,17 @@ QWindowsPointerHandler::~QWindowsPointerHandler()
bool QWindowsPointerHandler::translatePointerEvent(QWindow *window, HWND hwnd, QtWindows::WindowsEventType et, MSG msg, LRESULT *result)
{
@@ -1021,7 +1075,7 @@ index 9f1f25db8c..3660f2c0c8 100644
qWarning() << "GetPointerType() failed:" << qt_error_string();
return false;
}
-@@ -62,12 +74,12 @@ bool QWindowsPointerHandler::translatePointerEvent(QWindow *window, HWND hwnd, Q
+@@ -69,12 +81,12 @@ bool QWindowsPointerHandler::translatePointerEvent(QWindow *window, HWND hwnd, Q
}
case QT_PT_TOUCH: {
quint32 pointerCount = 0;
@@ -1036,7 +1090,7 @@ index 9f1f25db8c..3660f2c0c8 100644
qWarning() << "GetPointerFrameTouchInfo() failed:" << qt_error_string();
return false;
}
-@@ -80,7 +92,7 @@ bool QWindowsPointerHandler::translatePointerEvent(QWindow *window, HWND hwnd, Q
+@@ -87,7 +99,7 @@ bool QWindowsPointerHandler::translatePointerEvent(QWindow *window, HWND hwnd, Q
// dispatch any skipped frames if event compression is disabled by the app
if (historyCount > 1 && !QCoreApplication::testAttribute(Qt::AA_CompressHighFrequencyEvents)) {
touchInfo.resize(pointerCount * historyCount);
@@ -1045,7 +1099,7 @@ index 9f1f25db8c..3660f2c0c8 100644
&historyCount,
&pointerCount,
touchInfo.data())) {
-@@ -101,7 +113,7 @@ bool QWindowsPointerHandler::translatePointerEvent(QWindow *window, HWND hwnd, Q
+@@ -108,7 +120,7 @@ bool QWindowsPointerHandler::translatePointerEvent(QWindow *window, HWND hwnd, Q
}
case QT_PT_PEN: {
POINTER_PEN_INFO penInfo;
@@ -1054,7 +1108,7 @@ index 9f1f25db8c..3660f2c0c8 100644
qWarning() << "GetPointerPenInfo() failed:" << qt_error_string();
return false;
}
-@@ -113,7 +125,7 @@ bool QWindowsPointerHandler::translatePointerEvent(QWindow *window, HWND hwnd, Q
+@@ -120,7 +132,7 @@ bool QWindowsPointerHandler::translatePointerEvent(QWindow *window, HWND hwnd, Q
|| !QCoreApplication::testAttribute(Qt::AA_CompressTabletEvents))) {
QVarLengthArray<POINTER_PEN_INFO, 10> penInfoHistory(historyCount);
@@ -1063,7 +1117,7 @@ index 9f1f25db8c..3660f2c0c8 100644
qWarning() << "GetPointerPenInfoHistory() failed:" << qt_error_string();
return false;
}
-@@ -520,7 +532,8 @@ bool QWindowsPointerHandler::translateTouchEvent(QWindow *window, HWND hwnd,
+@@ -527,7 +539,8 @@ bool QWindowsPointerHandler::translateTouchEvent(QWindow *window, HWND hwnd,
inputIds.insert(touchPoint.id);
// Avoid getting repeated messages for this frame if there are multiple pointerIds
@@ -1073,7 +1127,7 @@ index 9f1f25db8c..3660f2c0c8 100644
}
// Some devices send touches for each finger in a different message/frame, instead of consolidating
-@@ -567,7 +580,11 @@ bool QWindowsPointerHandler::translatePenEvent(QWindow *window, HWND hwnd, QtWin
+@@ -574,7 +587,11 @@ bool QWindowsPointerHandler::translatePenEvent(QWindow *window, HWND hwnd, QtWin
auto *penInfo = static_cast<POINTER_PEN_INFO *>(vPenInfo);
RECT pRect, dRect;
@@ -1087,7 +1141,7 @@ index 9f1f25db8c..3660f2c0c8 100644
const auto systemId = (qint64)penInfo->pointerInfo.sourceDevice;
diff --git a/src/plugins/platforms/windows/qwindowsscreen.cpp b/src/plugins/platforms/windows/qwindowsscreen.cpp
-index a50f9fd4b0..ac5711e6a2 100644
+index 2165c56d3c..b1c4d20c43 100644
--- a/src/plugins/platforms/windows/qwindowsscreen.cpp
+++ b/src/plugins/platforms/windows/qwindowsscreen.cpp
@@ -43,9 +43,12 @@ static inline QDpi deviceDPI(HDC hdc)
@@ -1104,7 +1158,7 @@ index a50f9fd4b0..ac5711e6a2 100644
return QDpi(dpiX, dpiY);
return {0, 0};
}
-@@ -576,6 +579,9 @@ QRect QWindowsScreen::virtualGeometry(const QPlatformScreen *screen) // cf QScre
+@@ -591,6 +594,9 @@ QRect QWindowsScreen::virtualGeometry(const QPlatformScreen *screen) // cf QScre
bool QWindowsScreen::setOrientationPreference(Qt::ScreenOrientation o)
{
@@ -1114,7 +1168,7 @@ index a50f9fd4b0..ac5711e6a2 100644
bool result = false;
ORIENTATION_PREFERENCE orientationPreference = ORIENTATION_PREFERENCE_NONE;
switch (o) {
-@@ -594,7 +600,10 @@ bool QWindowsScreen::setOrientationPreference(Qt::ScreenOrientation o)
+@@ -609,7 +615,10 @@ bool QWindowsScreen::setOrientationPreference(Qt::ScreenOrientation o)
orientationPreference = ORIENTATION_PREFERENCE_LANDSCAPE_FLIPPED;
break;
}
@@ -1126,7 +1180,7 @@ index a50f9fd4b0..ac5711e6a2 100644
return result;
}
-@@ -602,7 +611,10 @@ Qt::ScreenOrientation QWindowsScreen::orientationPreference()
+@@ -617,7 +626,10 @@ Qt::ScreenOrientation QWindowsScreen::orientationPreference()
{
Qt::ScreenOrientation result = Qt::PrimaryOrientation;
ORIENTATION_PREFERENCE orientationPreference = ORIENTATION_PREFERENCE_NONE;
@@ -1139,10 +1193,10 @@ index a50f9fd4b0..ac5711e6a2 100644
case ORIENTATION_PREFERENCE_NONE:
break;
diff --git a/src/plugins/platforms/windows/qwindowstheme.cpp b/src/plugins/platforms/windows/qwindowstheme.cpp
-index 2a01b0fa0d..b79155dab6 100644
+index 7806bec287..ac6362bcca 100644
--- a/src/plugins/platforms/windows/qwindowstheme.cpp
+++ b/src/plugins/platforms/windows/qwindowstheme.cpp
-@@ -672,7 +672,11 @@ void QWindowsTheme::refreshFonts()
+@@ -733,7 +733,11 @@ void QWindowsTheme::refreshFonts()
fixedFont.setStyleHint(QFont::TypeWriter);
LOGFONT lfIconTitleFont;
@@ -1156,10 +1210,10 @@ index 2a01b0fa0d..b79155dab6 100644
m_fonts[SystemFont] = new QFont(QWindowsFontDatabase::systemDefaultFont());
diff --git a/src/plugins/platforms/windows/qwindowswindow.cpp b/src/plugins/platforms/windows/qwindowswindow.cpp
-index 220c36cc19..ad354abde0 100644
+index c7033a74c4..e129ca10bf 100644
--- a/src/plugins/platforms/windows/qwindowswindow.cpp
+++ b/src/plugins/platforms/windows/qwindowswindow.cpp
-@@ -148,7 +148,7 @@ static QByteArray debugWinExStyle(DWORD exStyle)
+@@ -150,7 +150,7 @@ static QByteArray debugWinExStyle(DWORD exStyle)
rc += " WS_EX_NOACTIVATE";
if (exStyle & WS_EX_NOPARENTNOTIFY)
rc += " WS_EX_NOPARENTNOTIFY";
@@ -1168,7 +1222,7 @@ index 220c36cc19..ad354abde0 100644
rc += " WS_EX_NOREDIRECTIONBITMAP";
if (exStyle & WS_EX_RIGHT)
rc += " WS_EX_RIGHT";
-@@ -523,8 +523,11 @@ static inline void updateGLWindowSettings(const QWindow *w, HWND hwnd, Qt::Windo
+@@ -525,8 +525,11 @@ static inline void updateGLWindowSettings(const QWindow *w, HWND hwnd, Qt::Windo
// The width of the padded border will always be 0 if DWM composition is
// disabled, but since it will always be enabled and can't be programtically
// disabled from Windows 8, we are safe to go.
@@ -1182,7 +1236,7 @@ index 220c36cc19..ad354abde0 100644
}
/*!
-@@ -534,11 +537,14 @@ static inline void updateGLWindowSettings(const QWindow *w, HWND hwnd, Qt::Windo
+@@ -536,11 +539,14 @@ static inline void updateGLWindowSettings(const QWindow *w, HWND hwnd, Qt::Windo
static QMargins invisibleMargins(QPoint screenPoint)
{
@@ -1198,7 +1252,7 @@ index 220c36cc19..ad354abde0 100644
const int gap = getResizeBorderThickness(dpiX);
return QMargins(gap, 0, gap, gap);
}
-@@ -548,7 +554,12 @@ static QMargins invisibleMargins(QPoint screenPoint)
+@@ -550,7 +556,12 @@ static QMargins invisibleMargins(QPoint screenPoint)
[[nodiscard]] static inline QMargins invisibleMargins(const HWND hwnd)
{
@@ -1212,7 +1266,7 @@ index 220c36cc19..ad354abde0 100644
const int gap = getResizeBorderThickness(dpi);
return QMargins(gap, 0, gap, gap);
}
-@@ -841,7 +852,7 @@ void WindowCreationData::fromWindow(const QWindow *w, const Qt::WindowFlags flag
+@@ -843,7 +854,7 @@ void WindowCreationData::fromWindow(const QWindow *w, const Qt::WindowFlags flag
// Currently only compatible with D3D surfaces, use it with care.
if (qEnvironmentVariableIntValue("QT_QPA_DISABLE_REDIRECTION_SURFACE"))
@@ -1221,7 +1275,7 @@ index 220c36cc19..ad354abde0 100644
}
}
-@@ -1068,7 +1079,14 @@ QMargins QWindowsGeometryHint::frame(const QWindow *w, DWORD style, DWORD exStyl
+@@ -1071,7 +1082,14 @@ QMargins QWindowsGeometryHint::frame(const QWindow *w, DWORD style, DWORD exStyl
return {};
RECT rect = {0,0,0,0};
style &= ~DWORD(WS_OVERLAPPED); // Not permitted, see docs.
@@ -1237,7 +1291,7 @@ index 220c36cc19..ad354abde0 100644
qErrnoWarning("%s: AdjustWindowRectExForDpi failed", __FUNCTION__);
}
const QMargins result(qAbs(rect.left), qAbs(rect.top),
-@@ -1561,7 +1579,14 @@ void QWindowsWindow::initialize()
+@@ -1572,7 +1590,14 @@ void QWindowsWindow::initialize()
QWindowSystemInterface::handleGeometryChange<QWindowSystemInterface::SynchronousDelivery>(w, obtainedGeometry);
}
}
@@ -1253,7 +1307,7 @@ index 220c36cc19..ad354abde0 100644
}
QSurfaceFormat QWindowsWindow::format() const
-@@ -2056,7 +2081,12 @@ void QWindowsWindow::handleDpiChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
+@@ -2067,7 +2092,12 @@ void QWindowsWindow::handleDpiChanged(HWND hwnd, WPARAM wParam, LPARAM lParam)
void QWindowsWindow::handleDpiChangedAfterParent(HWND hwnd)
{
@@ -1268,7 +1322,7 @@ index 220c36cc19..ad354abde0 100644
setSavedDpi(dpi);
diff --git a/src/widgets/styles/qwindowsstyle.cpp b/src/widgets/styles/qwindowsstyle.cpp
-index ae82f784ca..50d2e85871 100644
+index bae182b467..ab4793007c 100644
--- a/src/widgets/styles/qwindowsstyle.cpp
+++ b/src/widgets/styles/qwindowsstyle.cpp
@@ -62,6 +62,7 @@
@@ -1279,7 +1333,7 @@ index ae82f784ca..50d2e85871 100644
QT_BEGIN_INCLUDE_NAMESPACE
#include "qt_windows.h"
-@@ -266,29 +267,42 @@ int QWindowsStylePrivate::pixelMetricFromSystemDp(QStyle::PixelMetric pm, const
+@@ -261,29 +262,42 @@ int QWindowsStylePrivate::pixelMetricFromSystemDp(QStyle::PixelMetric pm, const
// hardcode DPI to 1x 96 DPI.
const int dpi = 96;
@@ -1329,5 +1383,5 @@ index ae82f784ca..50d2e85871 100644
default:
break;
--
-2.45.2
+2.46.2
=====================================
contrib/src/qt/0001-Do-not-link-D3D9.patch → contrib/src/qt/0003-Do-not-link-D3D9.patch
=====================================
=====================================
contrib/src/qt/SHA512SUMS
=====================================
@@ -1 +1 @@
-864bebfc3659907e52b8dc3f62a65d431573ef2bf406a9f71c688229083a2128c5474f75823275d11948be3d031de1d6427acf373f977df9ee9e73a27ef56efb qtbase-everywhere-src-6.7.1.tar.xz
+7bd9452d4cb85fad88e7d609de93e7c3d55ddd2ac47005c20aaaf057bf339d944b5211d1897d21f9896fe433b7c6954eaffd0e80e725b2f3335a047fe06b0cd9 qtbase-everywhere-src-6.8.0.tar.xz
=====================================
contrib/src/qt/rules.mak
=====================================
@@ -17,7 +17,7 @@ PKGS_ALL += qt-tools
DEPS_qt = qt-tools harfbuzz $(DEPS_harfbuzz) jpeg $(DEPS_jpeg) png $(DEPS_png) zlib $(DEPS_zlib) vulkan-headers $(DEPS_vulkan-headers)
ifdef HAVE_WIN32
-DEPS_qt += d3d12 $(DEPS_d3d12) dcomp $(DEPS_dcomp)
+DEPS_qt += d3d12 $(DEPS_d3d12) dcomp $(DEPS_dcomp) uiautomationcore $(DEPS_uiautomationcore)
else
DEPS_qt += freetype2 $(DEPS_freetype2)
endif
@@ -41,14 +41,15 @@ $(TARBALLS)/qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz:
qt: qtbase-everywhere-src-$(QTBASE_VERSION_FULL).tar.xz .sum-qt
$(UNPACK)
- $(APPLY) $(SRC)/qt/0001-Windows-Tray-Icon-Set-NOSOUND.patch
- $(APPLY) $(SRC)/qt/0003-Revert-QMutex-remove-qmutex_win.cpp.patch
- $(APPLY) $(SRC)/qt/0004-Expose-QRhiImplementation-in-QRhi.patch
- $(APPLY) $(SRC)/qt/0005-Do-not-include-D3D12MemAlloc.h-in-header-file.patch
- $(APPLY) $(SRC)/qt/0006-Try-DCompositionCreateDevice3-first-if-available.patch
- $(APPLY) $(SRC)/qt/0007-Try-to-satisfy-Windows-7-compatibility.patch
+ $(APPLY) $(SRC)/qt/0001-Windows-QPA-Disable-systray-notification-sounds.patch
+ $(APPLY) $(SRC)/qt/0001-Revert-QMutex-remove-qmutex_win.cpp.patch
+ $(APPLY) $(SRC)/qt/0001-Expose-QRhiImplementation-in-QRhi.patch
+ $(APPLY) $(SRC)/qt/0001-Do-not-include-D3D12MemAlloc.h-in-header-file.patch
+ $(APPLY) $(SRC)/qt/0001-Try-DCompositionCreateDevice3-first-if-available.patch
+ $(APPLY) $(SRC)/qt/0002-Satisfy-Windows-7-compatibility.patch
$(APPLY) $(SRC)/qt/0001-disable-precompiled-headers-when-forcing-WINVER-inte.patch
- $(APPLY) $(SRC)/qt/0001-Do-not-link-D3D9.patch
+ $(APPLY) $(SRC)/qt/0001-Use-DirectWrite-font-database-only-with-Windows-10-a.patch
+ $(APPLY) $(SRC)/qt/0003-Do-not-link-D3D9.patch
$(MOVE)
ifdef HAVE_WIN32
@@ -64,6 +65,8 @@ endif
ifdef HAVE_WIN32
QTBASE_CONFIG += -DFEATURE_style_fusion=OFF
+# Enable direct2d, but do not build the direct2d platform plugin:
+QTBASE_CONFIG += -DFEATURE_direct2d=ON -DFEATURE_direct2d1_1=OFF
endif
ifdef ENABLE_PDB
@@ -79,6 +82,15 @@ QTBASE_COMMON_CONFIG := -DFEATURE_pkg_config=OFF -DINPUT_openssl=no \
-DFEATURE_pdf=OFF \
-DQT_BUILD_EXAMPLES=OFF
+ifdef HAVE_WIN32
+ifndef HAVE_CLANG
+# GCC 12.2 can not compile the Qt 6.8 bundled PCRE2 with the stack clash protection option.
+# Since stack clash protection option is said to be irrelevant for Windows, we can simply
+# disable it:
+QTBASE_COMMON_CONFIG += -DFEATURE_stack_clash_protection=OFF
+endif
+endif
+
QTBASE_CONFIG += $(QTBASE_COMMON_CONFIG) \
-DFEATURE_gif=OFF \
-DFEATURE_harfbuzz=ON -DFEATURE_system_harfbuzz=ON -DFEATURE_jpeg=ON -DFEATURE_system_jpeg=ON \
@@ -86,7 +98,7 @@ QTBASE_CONFIG += $(QTBASE_COMMON_CONFIG) \
-DFEATURE_movie=OFF -DFEATURE_whatsthis=OFF -DFEATURE_lcdnumber=OFF \
-DFEATURE_syntaxhighlighter=OFF -DFEATURE_undoview=OFF -DFEATURE_splashscreen=OFF \
-DFEATURE_dockwidget=OFF -DFEATURE_statusbar=OFF -DFEATURE_statustip=OFF \
- -DFEATURE_keysequenceedit=OFF \
+ -DFEATURE_keysequenceedit=OFF -DFEATURE_mdiarea=OFF \
-DCMAKE_TOOLCHAIN_FILE=$(abspath toolchain.cmake) $(QT_HOST_PATH)
QTBASE_NATIVE_CONFIG := $(QTBASE_COMMON_CONFIG) -DQT_BUILD_TESTS=FALSE \
=====================================
contrib/src/qt5compat/0001-Revert-Auxiliary-commit-to-revert-individual-files-f.patch
=====================================
@@ -4,6 +4,10 @@ Date: Fri, 19 Apr 2024 15:59:48 +0300
Subject: [PATCH 1/2] Revert "Auxiliary commit to revert individual files from
0ba059c6dc8b7c0f6ac4a277c96b6b16e43053a2"
+This effectively reverts deprecated Qt Graphical Effects to its more
+primitive Qt 6.3 version. This is done to prevent linking to Qt
+Shader Tools library, which increases the size considerably when
+statically linked.
---
CMakeLists.txt | 5 -
src/imports/graphicaleffects5/CMakeLists.txt | 14 --
=====================================
contrib/src/qt5compat/SHA512SUMS
=====================================
@@ -1 +1 @@
-f6a3552f6aefab374bf3e483774dff10c9aaebee7085b81b1487a0ed6fb7cff072d9f97bd199ff3e9fef6838d93aa015dec58c5b5e11f6eb4fb062a0ca015e52 qt5compat-everywhere-src-6.7.1.tar.xz
+c2304da058f0acf3120348dc179080a3dc28c9cf3605a22a2e8fe2816e9f0aea7e38b22966f59ee85ce52d4a8ddf5084a5fd24932f31e5b40cb64fc09dbca100 qt5compat-everywhere-src-6.8.0.tar.xz
=====================================
contrib/src/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch
=====================================
@@ -3,6 +3,8 @@ From: Fatih Uzunoglu <fuzun54 at outlook.com>
Date: Fri, 12 Jan 2024 20:40:24 +0200
Subject: [PATCH 1/2] Fix incorrect library inclusion
+QmlIntegration is a header only module. This was done to
+fix building with Meson when Qt is statically linked.
---
src/qmlintegration/CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
=====================================
contrib/src/qtdeclarative/0001-Take-care-of-asyncResponses-when-qml_network-is-disa.patch deleted
=====================================
@@ -1,89 +0,0 @@
-From c3390f17d4c86a6c817f37a273c2d44d5f57ded9 Mon Sep 17 00:00:00 2001
-From: Fatih Uzunoglu <fuzun54 at outlook.com>
-Date: Mon, 24 Jun 2024 17:19:20 +0300
-Subject: [PATCH] Take care of `asyncResponses` when `qml_network` is disabled
- in qquickpixmapcache.cpp
-
----
- src/quick/util/qquickpixmapcache.cpp | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp
-index 8de79f2009..5efd2ef3e2 100644
---- a/src/quick/util/qquickpixmapcache.cpp
-+++ b/src/quick/util/qquickpixmapcache.cpp
-@@ -606,20 +606,18 @@ QQuickPixmapReader::~QQuickPixmapReader()
- delete reply;
- }
- jobs.clear();
--#if QT_CONFIG(qml_network)
- const auto cancelJob = [this](QQuickPixmapReply *reply) {
- if (reply->loading) {
- cancelledJobs.append(reply);
- reply->data = nullptr;
- }
- };
--
-+#if QT_CONFIG(qml_network)
- for (auto *reply : std::as_const(networkJobs))
- cancelJob(reply);
--
-+#endif
- for (auto *reply : std::as_const(asyncResponses))
- cancelJob(reply);
--#endif
- #if !QT_CONFIG(quick_pixmap_cache_threaded_download)
- // In this case we won't be waiting, but we are on the correct thread already, so we can
- // perform housekeeping synchronously now.
-@@ -640,7 +638,6 @@ QQuickPixmapReader::~QQuickPixmapReader()
- wait();
- #endif
-
--#if QT_CONFIG(qml_network)
- // While we've been waiting, the other thread may have added
- // more replies. No one will care about them anymore.
-
-@@ -649,16 +646,17 @@ QQuickPixmapReader::~QQuickPixmapReader()
- reply->data->reply = nullptr;
- delete reply;
- };
--
-+#if QT_CONFIG(qml_network)
- for (QQuickPixmapReply *reply : std::as_const(networkJobs))
- deleteReply(reply);
--
-+#endif
- for (QQuickPixmapReply *reply : std::as_const(asyncResponses))
- deleteReply(reply);
-
-+#if QT_CONFIG(qml_network)
- networkJobs.clear();
-- asyncResponses.clear();
- #endif
-+ asyncResponses.clear();
- }
-
- #if QT_CONFIG(qml_network)
-@@ -803,7 +801,10 @@ void QQuickPixmapReader::processJobs()
- // cancel any jobs already started
- reply->close();
- }
-- } else {
-+ }
-+ else
-+#endif
-+ {
- QQuickImageResponse *asyncResponse = asyncResponses.key(job);
- if (asyncResponse) {
- asyncResponses.remove(asyncResponse);
-@@ -811,7 +812,6 @@ void QQuickPixmapReader::processJobs()
- }
- }
- PIXMAP_PROFILE(pixmapStateChanged<QQuickProfiler::PixmapLoadingError>(job->url));
--#endif
- // deleteLater, since not owned by this thread
- job->deleteLater();
- }
---
-2.45.2
-
=====================================
contrib/src/qtdeclarative/0002-Fix-build-with-no-feature-network.patch deleted
=====================================
@@ -1,27 +0,0 @@
-From 3257a47d55493e6ccedda50ab4093716366d95b3 Mon Sep 17 00:00:00 2001
-From: Tasuku Suzuki <tasuku.suzuki at signal-slot.co.jp>
-Date: Tue, 21 Nov 2023 23:58:43 +0900
-Subject: [PATCH 2/2] Fix build with -no-feature-network
-
-Change-Id: Ib21012301da6afb5458f707b39a9a8079d93eb93
-Reviewed-by: Ulf Hermann <ulf.hermann at qt.io>
----
- src/qml/configure.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qml/configure.cmake b/src/qml/configure.cmake
-index 2d0434643a..d1ff90bd54 100644
---- a/src/qml/configure.cmake
-+++ b/src/qml/configure.cmake
-@@ -82,7 +82,7 @@ qt_feature("qml-ssl" PUBLIC
- SECTION "QML"
- LABEL "QML SSL support"
- PURPOSE "Provides ssl support in QML."
-- CONDITION QT_FEATURE_ssl
-+ CONDITION QT_FEATURE_qml_network AND QT_FEATURE_ssl
- )
-
- # On arm and arm64 we need a specialization of cacheFlush() for each OS to be
---
-2.44.0
-
=====================================
contrib/src/qtdeclarative/SHA512SUMS
=====================================
@@ -1 +1 @@
-77cdd31f2efa6e677755477b14c7770afa51b81cc7626ef21ebccf52ce69173a73b03851b0b491766f816e0cc946e6f238f8c7c70ad121d56428fe513e50a4d0 qtdeclarative-everywhere-src-6.7.1.tar.xz
+4f1e26511265e7085bfe097435e64b4daa0bb4a8287f56753a64437a5eb408c0679afa03e255d1949e382b59496eff600cb0638a9b8cc95278d67ad5cfb9d52b qtdeclarative-everywhere-src-6.8.0.tar.xz
=====================================
contrib/src/qtdeclarative/rules.mak
=====================================
@@ -35,8 +35,6 @@ $(TARBALLS)/qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz:
qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum-qtdeclarative
$(UNPACK)
$(APPLY) $(SRC)/qtdeclarative/0001-Fix-incorrect-library-inclusion.patch
- $(APPLY) $(SRC)/qtdeclarative/0002-Fix-build-with-no-feature-network.patch
- $(APPLY) $(SRC)/qtdeclarative/0001-Take-care-of-asyncResponses-when-qml_network-is-disa.patch
# disable unused CLI tools: qml, qmleasing, qmldom, qmlformat, qmltc
sed -i.orig -e 's,add_subdirectory(qml),#add_subdirectory(qml),' $(UNPACK_DIR)/tools/CMakeLists.txt
sed -i.orig -e 's,add_subdirectory(qmleasing),#add_subdirectory(qmleasing),' $(UNPACK_DIR)/tools/CMakeLists.txt
@@ -50,6 +48,7 @@ qtdeclarative: qtdeclarative-everywhere-src-$(QTDECLARATIVE_VERSION).tar.xz .sum
sed -i.orig -e 's,add_subdirectory(quickdialogs),#add_subdirectory(quickdialogs),' $(UNPACK_DIR)/src/CMakeLists.txt
sed -i.orig -e 's,add_subdirectory(qmldom),#add_subdirectory(qmldom),' $(UNPACK_DIR)/src/CMakeLists.txt
sed -i.orig -e 's,add_subdirectory(quickwidgets),#add_subdirectory(quickwidgets),' $(UNPACK_DIR)/src/CMakeLists.txt
+ sed -i.orig -e 's,add_subdirectory(quickvectorimage),#add_subdirectory(quickvectorimage),' $(UNPACK_DIR)/src/CMakeLists.txt
$(MOVE)
QT_DECLARATIVE_COMMON_CONFIG := \
=====================================
contrib/src/qtshadertools/SHA512SUMS
=====================================
@@ -1 +1 @@
-8de9659e11c8b0048fd0af7616aec9a3395a3844f5e24740a88ffd7c3acffba041150338e2a3b7986006edd77a557bb944992b082191d2d959aae511fbc35dc6 qtshadertools-everywhere-src-6.7.1.tar.xz
+fc15e7df6806c29f7c185dfb81a83d45bc0e65887812e09432b992d0606eb0477a6897ee611d490f671d2b2f8f492e0a74a7271b2d0397b5d37596d6217a7b7b qtshadertools-everywhere-src-6.8.0.tar.xz
=====================================
contrib/src/qtsvg/SHA512SUMS
=====================================
@@ -1 +1 @@
-8c5b54886e8a9580c022229b8b6176eaf9f113890333e5d9ca558fe57e6f2acad2a2e01fb5154ddb67a48ac95727d744339512876fb8334077ca5af27506e106 qtsvg-everywhere-src-6.7.1.tar.xz
+fa5d0869dc17fb6d44343bddd2741ab7b9930dbb6ede53a1e60a816b5efb520d98a1aaf58a04e1f380e03d33b24070305256d6a255f21e575009099c3882404f qtsvg-everywhere-src-6.8.0.tar.xz
=====================================
contrib/src/qtwayland/SHA512SUMS
=====================================
@@ -1 +1 @@
-9128ecd32319fd2ca154cb3d52726c80f96e2c906f9cf80cd67a3f91a4db49a853948489ec712061c6ef2c5abe70cd850c37f947659199678ac1482c77485a76 qtwayland-everywhere-src-6.7.1.tar.xz
+6b2258928481813db7037bdbc817f57e14fc7ae66d2a791e03a4f1ebc1eea6ed36782206b3edcbf17e8fa0eb9f45f4d2583865b2b764e8ac303abac40764070c qtwayland-everywhere-src-6.8.0.tar.xz
=====================================
modules/gui/qt/plugins.hpp
=====================================
@@ -57,7 +57,9 @@
Q_IMPORT_QML_PLUGIN(QtGraphicalEffectsPrivatePlugin)
Q_IMPORT_QML_PLUGIN(QtQmlPlugin)
Q_IMPORT_QML_PLUGIN(QtQmlWorkerScriptPlugin)
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
Q_IMPORT_QML_PLUGIN(QtQmlMetaPlugin)
+#endif
#ifdef _WIN32
#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0)
=====================================
modules/gui/qt/qt.cpp
=====================================
@@ -856,7 +856,9 @@ static void *Thread( void *obj )
Q_INIT_RESOURCE( qmake_Qt5Compat_GraphicalEffects );
Q_INIT_RESOURCE( qmake_Qt5Compat_GraphicalEffects_private );
Q_INIT_RESOURCE( qmake_QtQml );
+#if QT_VERSION < QT_VERSION_CHECK(6, 8, 0)
Q_INIT_RESOURCE( qmake_QtQml_Base );
+#endif
Q_INIT_RESOURCE( qmake_QtQml_Models );
Q_INIT_RESOURCE( qmake_QtQml_WorkerScript );
Q_INIT_RESOURCE( qmake_QtQuick );
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0858165dadab27a3b11260697e2858f15c4670c5...6de7998f920337492d3b73f17268ab192eab1ef4
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/0858165dadab27a3b11260697e2858f15c4670c5...6de7998f920337492d3b73f17268ab192eab1ef4
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