5.15.12
This commit is contained in:
Jan Grulich
parent
29a15e313b
commit
babe6b3714
2
.gitignore
vendored
2
.gitignore
vendored
@ -25,3 +25,5 @@
|
||||
/qtbase-everywhere-opensource-src-5.15.11.tar.xz
|
||||
/kde-5.15-rollup-20231006.patch.gz
|
||||
/kde-5.15-rollup-20231127.patch.gz
|
||||
/qtbase-everywhere-opensource-src-5.15.12.tar.xz
|
||||
/kde-5.15-rollup-20240102.patch.gz
|
||||
|
||||
38
0001-CVE-2023-51714-qtbase-5.15.patch
Normal file
38
0001-CVE-2023-51714-qtbase-5.15.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From ea63c28efc1d2ecb467b83a34923d12462efa96f Mon Sep 17 00:00:00 2001
|
||||
From: Marc Mutz <marc.mutz@qt.io>
|
||||
Date: Tue, 12 Dec 2023 20:51:56 +0100
|
||||
Subject: [PATCH] HPack: fix a Yoda Condition
|
||||
|
||||
Putting the variable on the LHS of a relational operation makes the
|
||||
expression easier to read. In this case, we find that the whole
|
||||
expression is nonsensical as an overflow protection, because if
|
||||
name.size() + value.size() overflows, the result will exactly _not_
|
||||
be > max() - 32, because UB will have happened.
|
||||
|
||||
To be fixed in a follow-up commit.
|
||||
|
||||
As a drive-by, add parentheses around the RHS.
|
||||
|
||||
Change-Id: I35ce598884c37c51b74756b3bd2734b9aad63c09
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
(cherry picked from commit 658607a34ead214fbacbc2cca44915655c318ea9)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
(cherry picked from commit 4f7efd41740107f90960116700e3134f5e433867)
|
||||
(cherry picked from commit 13c16b756900fe524f6d9534e8a07aa003c05e0c)
|
||||
(cherry picked from commit 1d4788a39668fb2dc5912a8d9c4272dc40e99f92)
|
||||
(cherry picked from commit 87de75b5cc946d196decaa6aef4792a6cac0b6db)
|
||||
---
|
||||
|
||||
diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
|
||||
index 834214f..ab166a6 100644
|
||||
--- a/src/network/access/http2/hpacktable.cpp
|
||||
+++ b/src/network/access/http2/hpacktable.cpp
|
||||
@@ -63,7 +63,7 @@
|
||||
// 32 octets of overhead."
|
||||
|
||||
const unsigned sum = unsigned(name.size() + value.size());
|
||||
- if (std::numeric_limits<unsigned>::max() - 32 < sum)
|
||||
+ if (sum > (std::numeric_limits<unsigned>::max() - 32))
|
||||
return HeaderSize();
|
||||
return HeaderSize(true, quint32(sum + 32));
|
||||
}
|
||||
59
0002-CVE-2023-51714-qtbase-5.15.patch
Normal file
59
0002-CVE-2023-51714-qtbase-5.15.patch
Normal file
@ -0,0 +1,59 @@
|
||||
From 23c3fc483e8b6e21012a61f0bea884446f727776 Mon Sep 17 00:00:00 2001
|
||||
From: Marc Mutz <marc.mutz@qt.io>
|
||||
Date: Tue, 12 Dec 2023 22:08:07 +0100
|
||||
Subject: [PATCH] HPack: fix incorrect integer overflow check
|
||||
|
||||
This code never worked:
|
||||
|
||||
For the comparison with max() - 32 to trigger, on 32-bit platforms (or
|
||||
Qt 5) signed interger overflow would have had to happen in the
|
||||
addition of the two sizes. The compiler can therefore remove the
|
||||
overflow check as dead code.
|
||||
|
||||
On Qt 6 and 64-bit platforms, the signed integer addition would be
|
||||
very unlikely to overflow, but the following truncation to uint32
|
||||
would yield the correct result only in a narrow 32-value window just
|
||||
below UINT_MAX, if even that.
|
||||
|
||||
Fix by using the proper tool, qAddOverflow.
|
||||
|
||||
Manual conflict resolutions:
|
||||
- qAddOverflow doesn't exist in Qt 5, use private add_overflow
|
||||
predecessor API instead
|
||||
|
||||
Change-Id: I7599f2e75ff7f488077b0c60b81022591005661c
|
||||
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
(cherry picked from commit ee5da1f2eaf8932aeca02ffea6e4c618585e29e3)
|
||||
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
|
||||
(cherry picked from commit debeb8878da2dc706ead04b6072ecbe7e5313860)
|
||||
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
||||
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
|
||||
(cherry picked from commit 811b9eef6d08d929af8708adbf2a5effb0eb62d7)
|
||||
(cherry picked from commit f931facd077ce945f1e42eaa3bead208822d3e00)
|
||||
(cherry picked from commit 9ef4ca5ecfed771dab890856130e93ef5ceabef5)
|
||||
Reviewed-by: MÃ¥rten Nordheim <marten.nordheim@qt.io>
|
||||
---
|
||||
|
||||
diff --git a/src/network/access/http2/hpacktable.cpp b/src/network/access/http2/hpacktable.cpp
|
||||
index ab166a6..de91fc0 100644
|
||||
--- a/src/network/access/http2/hpacktable.cpp
|
||||
+++ b/src/network/access/http2/hpacktable.cpp
|
||||
@@ -40,6 +40,7 @@
|
||||
#include "hpacktable_p.h"
|
||||
|
||||
#include <QtCore/qdebug.h>
|
||||
+#include <QtCore/private/qnumeric_p.h>
|
||||
|
||||
#include <algorithm>
|
||||
#include <cstddef>
|
||||
@@ -62,7 +63,9 @@
|
||||
// for counting the number of references to the name and value would have
|
||||
// 32 octets of overhead."
|
||||
|
||||
- const unsigned sum = unsigned(name.size() + value.size());
|
||||
+ size_t sum;
|
||||
+ if (add_overflow(size_t(name.size()), size_t(value.size()), &sum))
|
||||
+ return HeaderSize();
|
||||
if (sum > (std::numeric_limits<unsigned>::max() - 32))
|
||||
return HeaderSize();
|
||||
return HeaderSize(true, quint32(sum + 32));
|
||||
@ -8,7 +8,7 @@ Subject: [PATCH 04/15] QGtk3Theme: subscribe to theme hint changes
|
||||
1 file changed, 20 insertions(+)
|
||||
|
||||
diff --git a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
|
||||
index 6e9e89fa..67fdf7d3 100644
|
||||
index 42cb0c7d..248ed9d8 100644
|
||||
--- a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
|
||||
+++ b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
|
||||
@@ -40,6 +40,7 @@
|
||||
@ -18,12 +18,11 @@ index 6e9e89fa..67fdf7d3 100644
|
||||
+#include "qpa/qwindowsysteminterface.h"
|
||||
#include <QVariant>
|
||||
#include <QGuiApplication>
|
||||
|
||||
@@ -109,6 +110,25 @@ QGtk3Theme::QGtk3Theme()
|
||||
|
||||
|
||||
@@ -110,6 +111,25 @@ QGtk3Theme::QGtk3Theme()
|
||||
/* Use our custom log handler. */
|
||||
g_log_set_handler("Gtk", G_LOG_LEVEL_MESSAGE, gtkMessageHandler, nullptr);
|
||||
+
|
||||
|
||||
+#define SETTING_CONNECT(setting) g_signal_connect(settings, "notify::" setting, G_CALLBACK(notifyThemeChanged), nullptr)
|
||||
+ auto notifyThemeChanged = [] {
|
||||
+ QWindowSystemInterface::handleThemeChange(nullptr);
|
||||
@ -42,6 +41,7 @@ index 6e9e89fa..67fdf7d3 100644
|
||||
+ SETTING_CONNECT("gtk-application-prefer-dark-theme");
|
||||
+ SETTING_CONNECT("gtk-theme-name");
|
||||
+#undef SETTING_CONNECT
|
||||
}
|
||||
|
||||
static inline QVariant gtkGetLongPressTime()
|
||||
+
|
||||
/* Set XCURSOR_SIZE and XCURSOR_THEME for Wayland sessions */
|
||||
if (QGuiApplication::platformName().startsWith(QLatin1String("wayland"))) {
|
||||
if (qEnvironmentVariableIsEmpty("XCURSOR_SIZE")) {
|
||||
|
||||
@ -10,7 +10,7 @@ React to runtime theme changes.
|
||||
Re-implement methods to retrieve GTK3 styled standardPixmaps, fonts
|
||||
and file icons.
|
||||
---
|
||||
.../5.15.11/QtCore/private/qflatmap_p.h | 2 +
|
||||
.../5.15.12/QtCore/private/qflatmap_p.h | 2 +
|
||||
src/corelib/tools/qflatmap_p.h | 1107 +++++++++++++++++
|
||||
src/plugins/platformthemes/gtk3/gtk3.pro | 6 +
|
||||
.../platformthemes/gtk3/qgtk3interface.cpp | 558 +++++++++
|
||||
@ -22,7 +22,7 @@ and file icons.
|
||||
.../platformthemes/gtk3/qgtk3theme.cpp | 23 +
|
||||
src/plugins/platformthemes/gtk3/qgtk3theme.h | 8 +
|
||||
11 files changed, 3155 insertions(+)
|
||||
create mode 100644 include/QtCore/5.15.11/QtCore/private/qflatmap_p.h
|
||||
create mode 100644 include/QtCore/5.15.12/QtCore/private/qflatmap_p.h
|
||||
create mode 100644 src/corelib/tools/qflatmap_p.h
|
||||
create mode 100644 src/plugins/platformthemes/gtk3/qgtk3interface.cpp
|
||||
create mode 100644 src/plugins/platformthemes/gtk3/qgtk3interface_p.h
|
||||
@ -31,11 +31,11 @@ and file icons.
|
||||
create mode 100644 src/plugins/platformthemes/gtk3/qgtk3storage.cpp
|
||||
create mode 100644 src/plugins/platformthemes/gtk3/qgtk3storage_p.h
|
||||
|
||||
diff --git a/include/QtCore/5.15.11/QtCore/private/qflatmap_p.h b/include/QtCore/5.15.11/QtCore/private/qflatmap_p.h
|
||||
diff --git a/include/QtCore/5.15.12/QtCore/private/qflatmap_p.h b/include/QtCore/5.15.12/QtCore/private/qflatmap_p.h
|
||||
new file mode 100644
|
||||
index 0000000000..e629799f72
|
||||
--- /dev/null
|
||||
+++ b/include/QtCore/5.15.11/QtCore/private/qflatmap_p.h
|
||||
+++ b/include/QtCore/5.15.12/QtCore/private/qflatmap_p.h
|
||||
@@ -0,0 +1,2 @@
|
||||
+#include "../../../../../src/corelib/tools/qflatmap_p.h"
|
||||
+
|
||||
|
||||
@ -56,8 +56,8 @@
|
||||
|
||||
Name: qt5-qtbase
|
||||
Summary: Qt5 - QtBase components
|
||||
Version: 5.15.11
|
||||
Release: 8%{?dist}
|
||||
Version: 5.15.12
|
||||
Release: 1%{?dist}
|
||||
|
||||
# See LGPL_EXCEPTIONS.txt, for exception details
|
||||
License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0
|
||||
@ -144,11 +144,11 @@ Patch90: %{name}-gcc11.patch
|
||||
|
||||
## upstream patches
|
||||
# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
|
||||
# git diff v5.15.11-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
|
||||
# git diff v5.15.12-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
|
||||
# patch100 in lookaside cache due to large'ish size -- rdieter
|
||||
Patch100: kde-5.15-rollup-20231127.patch.gz
|
||||
Patch100: kde-5.15-rollup-20240102.patch.gz
|
||||
# HACK to make 'fedpkg sources' consider it 'used"
|
||||
Source100: kde-5.15-rollup-20231127.patch.gz
|
||||
Source100: kde-5.15-rollup-20240102.patch.gz
|
||||
|
||||
Patch101: qtbase-5.15.10-fix-missing-qtsan-include.patch
|
||||
# Workaround for font rendering issue with cjk-vf-fonts
|
||||
@ -161,6 +161,8 @@ Patch103: qtbase-QTBUG-112136.patch
|
||||
Patch104: qtbase-QTBUG-103393.patch
|
||||
|
||||
# upstream security fixes
|
||||
Patch120: 0001-CVE-2023-51714-qtbase-5.15.patch
|
||||
Patch121: 0002-CVE-2023-51714-qtbase-5.15.patch
|
||||
|
||||
## Qt 6 backports for better Gtk/GNOME integration
|
||||
# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
|
||||
@ -172,7 +174,7 @@ Patch150: 0001-Use-Wayland-by-default-on-GNOME.patch
|
||||
Patch151: 0002-Add-enum-class-Qt-Appearance.patch
|
||||
Patch152: 0003-Sync-and-assert-StandardPixmap-enums-in-QPlatformThe.patch
|
||||
Patch153: 0004-QGtk3Theme-subscribe-to-theme-hint-changes.patch
|
||||
Patch154: 0005-Gtk3Theme-set-XCURSOR_SIZE-and-XCURSOR_THEME-for-way.patch
|
||||
# Patch154: 0005-Gtk3Theme-set-XCURSOR_SIZE-and-XCURSOR_THEME-for-way.patch
|
||||
Patch155: 0006-Re-implement-palette-standardPixmap-file-icons-fonts.patch
|
||||
Patch156: 0007-GTK3-theme-simplify-code.patch
|
||||
Patch157: 0008-Fix-checkbox-and-radiobutton-background-in-QGtk3Them.patch
|
||||
@ -475,6 +477,10 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
||||
%patch -P103 -p1
|
||||
%patch -P104 -p1
|
||||
|
||||
## upstream security fixes
|
||||
%patch -P120 -p1
|
||||
%patch -P121 -p1
|
||||
|
||||
## Qt 6 backports
|
||||
%if 0%{?fedora} > 30 || 0%{?rhel} > 8
|
||||
%patch -P150 -p1 -b .use-wayland-on-gnome.patch
|
||||
@ -483,7 +489,7 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
||||
%patch -P151 -p1
|
||||
%patch -P152 -p1
|
||||
%patch -P153 -p1
|
||||
%patch -P154 -p1
|
||||
# %patch -P154 -p1
|
||||
%patch -P155 -p1
|
||||
%patch -P156 -p1
|
||||
%patch -P157 -p1
|
||||
@ -668,7 +674,7 @@ translationdir=%{_qt5_translationdir}
|
||||
|
||||
Name: Qt5
|
||||
Description: Qt5 Configuration
|
||||
Version: 5.15.11
|
||||
Version: 5.15.12
|
||||
EOF
|
||||
|
||||
# rpm macros
|
||||
@ -1184,6 +1190,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Jan 02 2024 Jan Grulich <jgrulich@redhat.com> - 5.15.12-1
|
||||
- 5.15.12
|
||||
|
||||
* Tue Dec 12 2023 Timothée Ravier <tim@siosm.fr> - 5.15.11-8
|
||||
- Recommend qt5-qttranslations
|
||||
|
||||
|
||||
@ -1,13 +1,5 @@
|
||||
diff --git a/include/QtCore/qtsan_impl.h b/include/QtCore/qtsan_impl.h
|
||||
new file mode 100644
|
||||
index 00000000..e9209cbc
|
||||
--- /dev/null
|
||||
+++ b/include/QtCore/qtsan_impl.h
|
||||
@@ -0,0 +1 @@
|
||||
+#include "../../src/corelib/thread/qtsan_impl.h"
|
||||
|
||||
diff --git a/include/QtCore/headers.pri b/include/QtCore/headers.pri
|
||||
index 1a9c88ff..b6ed901e 100644
|
||||
index d2eaf206..015b5d6f 100644
|
||||
--- a/include/QtCore/headers.pri
|
||||
+++ b/include/QtCore/headers.pri
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -18,7 +10,14 @@ index 1a9c88ff..b6ed901e 100644
|
||||
SYNCQT.QPA_HEADER_FILES =
|
||||
-SYNCQT.CLEAN_HEADER_FILES = animation/qabstractanimation.h:animation animation/qanimationgroup.h:animation animation/qparallelanimationgroup.h:animation animation/qpauseanimation.h:animation animation/qpropertyanimation.h:animation animation/qsequentialanimationgroup.h:animation animation/qvariantanimation.h:animation codecs/qtextcodec.h:textcodec global/qcompilerdetection.h global/qendian.h global/qflags.h global/qfloat16.h global/qglobal.h global/qglobalstatic.h global/qisenum.h global/qlibraryinfo.h global/qlogging.h global/qnamespace.h global/qnumeric.h global/qoperatingsystemversion.h global/qprocessordetection.h global/qrandom.h global/qsysinfo.h global/qsystemdetection.h global/qtypeinfo.h global/qtypetraits.h global/qversiontagging.h io/qbuffer.h io/qdebug.h io/qdir.h io/qdiriterator.h io/qfile.h io/qfiledevice.h io/qfileinfo.h io/qfileselector.h io/qfilesystemwatcher.h:filesystemwatcher io/qiodevice.h io/qlockfile.h io/qloggingcategory.h io/qprocess.h:processenvironment io/qresource.h io/qsavefile.h io/qsettings.h:settings io/qstandardpaths.h io/qstorageinfo.h io/qtemporarydir.h io/qtemporaryfile.h io/qurl.h io/qurlquery.h itemmodels/qabstractitemmodel.h:itemmodel itemmodels/qabstractproxymodel.h:proxymodel itemmodels/qconcatenatetablesproxymodel.h:concatenatetablesproxymodel itemmodels/qidentityproxymodel.h:identityproxymodel itemmodels/qitemselectionmodel.h:itemmodel itemmodels/qsortfilterproxymodel.h:sortfilterproxymodel itemmodels/qstringlistmodel.h:stringlistmodel itemmodels/qtransposeproxymodel.h:transposeproxymodel kernel/qabstracteventdispatcher.h kernel/qabstractnativeeventfilter.h kernel/qbasictimer.h kernel/qcoreapplication.h kernel/qcoreevent.h kernel/qdeadlinetimer.h kernel/qelapsedtimer.h kernel/qeventloop.h kernel/qfunctions_nacl.h kernel/qfunctions_vxworks.h kernel/qfunctions_winrt.h kernel/qmath.h kernel/qmetaobject.h kernel/qmetatype.h kernel/qmimedata.h kernel/qobject.h kernel/qobjectcleanuphandler.h kernel/qobjectdefs.h kernel/qpointer.h kernel/qsharedmemory.h kernel/qsignalmapper.h kernel/qsocketnotifier.h kernel/qsystemsemaphore.h kernel/qtestsupport_core.h kernel/qtimer.h kernel/qtranslator.h kernel/qvariant.h kernel/qwineventnotifier.h mimetypes/qmimedatabase.h:mimetype mimetypes/qmimetype.h:mimetype plugin/qfactoryinterface.h plugin/qlibrary.h:library plugin/qplugin.h plugin/qpluginloader.h plugin/quuid.h serialization/qcborarray.h serialization/qcborcommon.h serialization/qcbormap.h serialization/qcborstream.h serialization/qcborstreamreader.h:cborstreamreader serialization/qcborstreamwriter.h:cborstreamwriter serialization/qcborvalue.h serialization/qdatastream.h serialization/qjsonarray.h serialization/qjsondocument.h serialization/qjsonobject.h serialization/qjsonvalue.h serialization/qtextstream.h serialization/qxmlstream.h statemachine/qabstractstate.h:statemachine statemachine/qabstracttransition.h:statemachine statemachine/qeventtransition.h:qeventtransition statemachine/qfinalstate.h:statemachine statemachine/qhistorystate.h:statemachine statemachine/qsignaltransition.h:statemachine statemachine/qstate.h:statemachine statemachine/qstatemachine.h:statemachine text/qbytearray.h text/qbytearraylist.h text/qbytearraymatcher.h text/qchar.h text/qcollator.h text/qlocale.h text/qregexp.h text/qregularexpression.h:regularexpression text/qstring.h text/qstringalgorithms.h text/qstringbuilder.h text/qstringlist.h text/qstringliteral.h text/qstringmatcher.h text/qstringview.h text/qtextboundaryfinder.h thread/qatomic.h thread/qbasicatomic.h thread/qexception.h:future thread/qfuture.h:future thread/qfutureinterface.h:future thread/qfuturesynchronizer.h:future thread/qfuturewatcher.h:future thread/qmutex.h thread/qreadwritelock.h thread/qresultstore.h:future thread/qrunnable.h thread/qsemaphore.h:thread thread/qthread.h thread/qthreadpool.h:thread thread/qthreadstorage.h thread/qwaitcondition.h time/qcalendar.h time/qdatetime.h time/qtimezone.h:timezone tools/qalgorithms.h tools/qarraydata.h tools/qarraydataops.h tools/qarraydatapointer.h tools/qbitarray.h tools/qcache.h tools/qcommandlineoption.h:commandlineparser tools/qcommandlineparser.h:commandlineparser tools/qcontainerfwd.h tools/qcontiguouscache.h tools/qcryptographichash.h tools/qeasingcurve.h:easingcurve tools/qhash.h tools/qhashfunctions.h tools/qiterator.h tools/qline.h tools/qlinkedlist.h tools/qlist.h tools/qmap.h tools/qmargins.h tools/qmessageauthenticationcode.h tools/qpair.h tools/qpoint.h tools/qqueue.h tools/qrect.h tools/qrefcount.h tools/qscopedpointer.h tools/qscopedvaluerollback.h tools/qscopeguard.h tools/qset.h tools/qshareddata.h tools/qsharedpointer.h tools/qsize.h tools/qstack.h tools/qtimeline.h:easingcurve tools/qvarlengtharray.h tools/qvector.h tools/qversionnumber.h
|
||||
+SYNCQT.CLEAN_HEADER_FILES = animation/qabstractanimation.h:animation animation/qanimationgroup.h:animation animation/qparallelanimationgroup.h:animation animation/qpauseanimation.h:animation animation/qpropertyanimation.h:animation animation/qsequentialanimationgroup.h:animation animation/qvariantanimation.h:animation codecs/qtextcodec.h:textcodec global/qcompilerdetection.h global/qendian.h global/qflags.h global/qfloat16.h global/qglobal.h global/qglobalstatic.h global/qisenum.h global/qlibraryinfo.h global/qlogging.h global/qnamespace.h global/qnumeric.h global/qoperatingsystemversion.h global/qprocessordetection.h global/qrandom.h global/qsysinfo.h global/qsystemdetection.h global/qtypeinfo.h global/qtypetraits.h global/qversiontagging.h io/qbuffer.h io/qdebug.h io/qdir.h io/qdiriterator.h io/qfile.h io/qfiledevice.h io/qfileinfo.h io/qfileselector.h io/qfilesystemwatcher.h:filesystemwatcher io/qiodevice.h io/qlockfile.h io/qloggingcategory.h io/qprocess.h:processenvironment io/qresource.h io/qsavefile.h io/qsettings.h:settings io/qstandardpaths.h io/qstorageinfo.h io/qtemporarydir.h io/qtemporaryfile.h io/qurl.h io/qurlquery.h itemmodels/qabstractitemmodel.h:itemmodel itemmodels/qabstractproxymodel.h:proxymodel itemmodels/qconcatenatetablesproxymodel.h:concatenatetablesproxymodel itemmodels/qidentityproxymodel.h:identityproxymodel itemmodels/qitemselectionmodel.h:itemmodel itemmodels/qsortfilterproxymodel.h:sortfilterproxymodel itemmodels/qstringlistmodel.h:stringlistmodel itemmodels/qtransposeproxymodel.h:transposeproxymodel kernel/qabstracteventdispatcher.h kernel/qabstractnativeeventfilter.h kernel/qbasictimer.h kernel/qcoreapplication.h kernel/qcoreevent.h kernel/qdeadlinetimer.h kernel/qelapsedtimer.h kernel/qeventloop.h kernel/qfunctions_nacl.h kernel/qfunctions_vxworks.h kernel/qfunctions_winrt.h kernel/qmath.h kernel/qmetaobject.h kernel/qmetatype.h kernel/qmimedata.h kernel/qobject.h kernel/qobjectcleanuphandler.h kernel/qobjectdefs.h kernel/qpointer.h kernel/qsharedmemory.h kernel/qsignalmapper.h kernel/qsocketnotifier.h kernel/qsystemsemaphore.h kernel/qtestsupport_core.h kernel/qtimer.h kernel/qtranslator.h kernel/qvariant.h kernel/qwineventnotifier.h mimetypes/qmimedatabase.h:mimetype mimetypes/qmimetype.h:mimetype plugin/qfactoryinterface.h plugin/qlibrary.h:library plugin/qplugin.h plugin/qpluginloader.h plugin/quuid.h serialization/qcborarray.h serialization/qcborcommon.h serialization/qcbormap.h serialization/qcborstream.h serialization/qcborstreamreader.h:cborstreamreader serialization/qcborstreamwriter.h:cborstreamwriter serialization/qcborvalue.h serialization/qdatastream.h serialization/qjsonarray.h serialization/qjsondocument.h serialization/qjsonobject.h serialization/qjsonvalue.h serialization/qtextstream.h serialization/qxmlstream.h statemachine/qabstractstate.h:statemachine statemachine/qabstracttransition.h:statemachine statemachine/qeventtransition.h:qeventtransition statemachine/qfinalstate.h:statemachine statemachine/qhistorystate.h:statemachine statemachine/qsignaltransition.h:statemachine statemachine/qstate.h:statemachine statemachine/qstatemachine.h:statemachine text/qbytearray.h text/qbytearraylist.h text/qbytearraymatcher.h text/qchar.h text/qcollator.h text/qlocale.h text/qregexp.h text/qregularexpression.h:regularexpression text/qstring.h text/qstringalgorithms.h text/qstringbuilder.h text/qstringlist.h text/qstringliteral.h text/qstringmatcher.h text/qstringview.h text/qtextboundaryfinder.h thread/qatomic.h thread/qbasicatomic.h thread/qexception.h:future thread/qfuture.h:future thread/qfutureinterface.h:future thread/qfuturesynchronizer.h:future thread/qfuturewatcher.h:future thread/qmutex.h thread/qreadwritelock.h thread/qresultstore.h:future thread/qrunnable.h thread/qsemaphore.h:thread thread/qthread.h thread/qthreadpool.h:thread thread/qthreadstorage.h thread/qwaitcondition.h thread/qtsan_impl.h time/qcalendar.h time/qdatetime.h time/qtimezone.h:timezone tools/qalgorithms.h tools/qarraydata.h tools/qarraydataops.h tools/qarraydatapointer.h tools/qbitarray.h tools/qcache.h tools/qcommandlineoption.h:commandlineparser tools/qcommandlineparser.h:commandlineparser tools/qcontainerfwd.h tools/qcontiguouscache.h tools/qcryptographichash.h tools/qeasingcurve.h:easingcurve tools/qhash.h tools/qhashfunctions.h tools/qiterator.h tools/qline.h tools/qlinkedlist.h tools/qlist.h tools/qmap.h tools/qmargins.h tools/qmessageauthenticationcode.h tools/qpair.h tools/qpoint.h tools/qqueue.h tools/qrect.h tools/qrefcount.h tools/qscopedpointer.h tools/qscopedvaluerollback.h tools/qscopeguard.h tools/qset.h tools/qshareddata.h tools/qsharedpointer.h tools/qsize.h tools/qstack.h tools/qtimeline.h:easingcurve tools/qvarlengtharray.h tools/qvector.h tools/qversionnumber.h
|
||||
SYNCQT.INJECTIONS = src/corelib/global/qconfig.h:qconfig.h:QtConfig src/corelib/global/qconfig_p.h:5.15.11/QtCore/private/qconfig_p.h
|
||||
SYNCQT.INJECTIONS = src/corelib/global/qconfig.h:qconfig.h:QtConfig src/corelib/global/qconfig_p.h:5.15.12/QtCore/private/qconfig_p.h
|
||||
diff --git a/include/QtCore/qtsan_impl.h b/include/QtCore/qtsan_impl.h
|
||||
new file mode 100644
|
||||
index 00000000..e9209cbc
|
||||
--- /dev/null
|
||||
+++ b/include/QtCore/qtsan_impl.h
|
||||
@@ -0,0 +1 @@
|
||||
+#include "../../src/corelib/thread/qtsan_impl.h"
|
||||
diff --git a/src/corelib/thread/thread.pri b/src/corelib/thread/thread.pri
|
||||
index 25cf68a3..8027a71e 100644
|
||||
--- a/src/corelib/thread/thread.pri
|
||||
|
||||
5
sources
5
sources
@ -1,3 +1,2 @@
|
||||
SHA512 (qtbase-everywhere-opensource-src-5.15.11.tar.xz) = 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f
|
||||
SHA512 (kde-5.15-rollup-20231006.patch.gz) = 234267395354784408288b5e99e061c3cd42ffc9b880579372d74aab38f82f0b41488eeca4aff5fffbb2cca2da83189f57ee32efeea78d978308b60e57cffa6d
|
||||
SHA512 (kde-5.15-rollup-20231127.patch.gz) = 01da34d1a87952edd025c5ccf2e61a8cdb8ea356d51c8a150057557f3eaf2a961e11aa5aebf3b93c4220a7f4bcbe6da9339a328a37161c4574e3d4fc7287f18a
|
||||
SHA512 (qtbase-everywhere-opensource-src-5.15.12.tar.xz) = 55ed3d73c2486a5f7cc62c0669b6344d1e4566be442bdac5849609f5ecd4fec7b74405952215e4dc018bc48a9dc2305ef50e31b61f3ace20408b5b64a2d5e888
|
||||
SHA512 (kde-5.15-rollup-20240102.patch.gz) = 284420ad29a0ce8b670adac0191c0968e64dbda31901000368791df16011f9743e641e7d66985680b6f07549d0ee5559ba6492c40621239ec17aceb104770bdd
|
||||
|
||||
Loading…
Reference in New Issue
Block a user