5.15.11
This commit is contained in:
Jan Grulich
parent
4db91e0189
commit
fad8f4cbf7
2
.gitignore
vendored
2
.gitignore
vendored
@ -22,3 +22,5 @@
|
||||
/qtbase-everywhere-opensource-src-5.15.10.tar.xz
|
||||
/kde-5.15-rollup-20230612.patch.gz
|
||||
/kde-5.15-rollup-20230613.patch.gz
|
||||
/qtbase-everywhere-opensource-src-5.15.11.tar.xz
|
||||
/kde-5.15-rollup-20231006.patch.gz
|
||||
|
||||
@ -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 93520344f8..7540cb43cf 100644
|
||||
index 6e9e89fa..67fdf7d3 100644
|
||||
--- a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
|
||||
+++ b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
|
||||
@@ -40,6 +40,7 @@
|
||||
@ -17,9 +17,9 @@ index 93520344f8..7540cb43cf 100644
|
||||
#include "qgtk3menu.h"
|
||||
+#include "qpa/qwindowsysteminterface.h"
|
||||
#include <QVariant>
|
||||
#include <QGuiApplication>
|
||||
|
||||
#undef signals
|
||||
@@ -100,6 +101,25 @@ QGtk3Theme::QGtk3Theme()
|
||||
@@ -109,6 +110,25 @@ QGtk3Theme::QGtk3Theme()
|
||||
|
||||
/* Use our custom log handler. */
|
||||
g_log_set_handler("Gtk", G_LOG_LEVEL_MESSAGE, gtkMessageHandler, nullptr);
|
||||
@ -45,6 +45,3 @@ index 93520344f8..7540cb43cf 100644
|
||||
}
|
||||
|
||||
static inline QVariant gtkGetLongPressTime()
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@ Qt Wayland QPA plugin still tries to load from those two envs.
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
|
||||
index 7540cb43cf..aceacda4b8 100644
|
||||
index 67fdf7d3..c7ac7804 100644
|
||||
--- a/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
|
||||
+++ b/src/plugins/platformthemes/gtk3/qgtk3theme.cpp
|
||||
@@ -41,6 +41,7 @@
|
||||
@ -26,9 +26,9 @@ index 7540cb43cf..aceacda4b8 100644
|
||||
#include "qpa/qwindowsysteminterface.h"
|
||||
+#include <QGuiApplication>
|
||||
#include <QVariant>
|
||||
#include <QGuiApplication>
|
||||
|
||||
#undef signals
|
||||
@@ -120,6 +121,20 @@ QGtk3Theme::QGtk3Theme()
|
||||
@@ -129,6 +130,20 @@ QGtk3Theme::QGtk3Theme()
|
||||
SETTING_CONNECT("gtk-application-prefer-dark-theme");
|
||||
SETTING_CONNECT("gtk-theme-name");
|
||||
#undef SETTING_CONNECT
|
||||
@ -49,6 +49,3 @@ index 7540cb43cf..aceacda4b8 100644
|
||||
}
|
||||
|
||||
static inline QVariant gtkGetLongPressTime()
|
||||
--
|
||||
2.41.0
|
||||
|
||||
|
||||
@ -10,7 +10,7 @@ React to runtime theme changes.
|
||||
Re-implement methods to retrieve GTK3 styled standardPixmaps, fonts
|
||||
and file icons.
|
||||
---
|
||||
.../5.15.10/QtCore/private/qflatmap_p.h | 2 +
|
||||
.../5.15.11/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.10/QtCore/private/qflatmap_p.h
|
||||
create mode 100644 include/QtCore/5.15.11/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.10/QtCore/private/qflatmap_p.h b/include/QtCore/5.15.10/QtCore/private/qflatmap_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
|
||||
new file mode 100644
|
||||
index 0000000000..e629799f72
|
||||
--- /dev/null
|
||||
+++ b/include/QtCore/5.15.10/QtCore/private/qflatmap_p.h
|
||||
+++ b/include/QtCore/5.15.11/QtCore/private/qflatmap_p.h
|
||||
@@ -0,0 +1,2 @@
|
||||
+#include "../../../../../src/corelib/tools/qflatmap_p.h"
|
||||
+
|
||||
|
||||
@ -1,203 +0,0 @@
|
||||
diff --git a/src/corelib/serialization/qxmlstream.cpp b/src/corelib/serialization/qxmlstream.cpp
|
||||
index 7cd457ba3a..11d162cb79 100644
|
||||
--- a/src/corelib/serialization/qxmlstream.cpp
|
||||
+++ b/src/corelib/serialization/qxmlstream.cpp
|
||||
@@ -1302,15 +1302,18 @@ inline int QXmlStreamReaderPrivate::fastScanContentCharList()
|
||||
return n;
|
||||
}
|
||||
|
||||
-inline int QXmlStreamReaderPrivate::fastScanName(int *prefix)
|
||||
+// Fast scan an XML attribute name (e.g. "xml:lang").
|
||||
+inline QXmlStreamReaderPrivate::FastScanNameResult
|
||||
+QXmlStreamReaderPrivate::fastScanName(Value *val)
|
||||
{
|
||||
int n = 0;
|
||||
uint c;
|
||||
while ((c = getChar()) != StreamEOF) {
|
||||
if (n >= 4096) {
|
||||
// This is too long to be a sensible name, and
|
||||
- // can exhaust memory
|
||||
- return 0;
|
||||
+ // can exhaust memory, or the range of decltype(*prefix)
|
||||
+ raiseNamePrefixTooLongError();
|
||||
+ return {};
|
||||
}
|
||||
switch (c) {
|
||||
case '\n':
|
||||
@@ -1339,23 +1342,23 @@ inline int QXmlStreamReaderPrivate::fastScanName(int *prefix)
|
||||
case '+':
|
||||
case '*':
|
||||
putChar(c);
|
||||
- if (prefix && *prefix == n+1) {
|
||||
- *prefix = 0;
|
||||
+ if (val && val->prefix == n + 1) {
|
||||
+ val->prefix = 0;
|
||||
putChar(':');
|
||||
--n;
|
||||
}
|
||||
- return n;
|
||||
+ return FastScanNameResult(n);
|
||||
case ':':
|
||||
- if (prefix) {
|
||||
- if (*prefix == 0) {
|
||||
- *prefix = n+2;
|
||||
+ if (val) {
|
||||
+ if (val->prefix == 0) {
|
||||
+ val->prefix = n + 2;
|
||||
} else { // only one colon allowed according to the namespace spec.
|
||||
putChar(c);
|
||||
- return n;
|
||||
+ return FastScanNameResult(n);
|
||||
}
|
||||
} else {
|
||||
putChar(c);
|
||||
- return n;
|
||||
+ return FastScanNameResult(n);
|
||||
}
|
||||
Q_FALLTHROUGH();
|
||||
default:
|
||||
@@ -1364,12 +1367,12 @@ inline int QXmlStreamReaderPrivate::fastScanName(int *prefix)
|
||||
}
|
||||
}
|
||||
|
||||
- if (prefix)
|
||||
- *prefix = 0;
|
||||
+ if (val)
|
||||
+ val->prefix = 0;
|
||||
int pos = textBuffer.size() - n;
|
||||
putString(textBuffer, pos);
|
||||
textBuffer.resize(pos);
|
||||
- return 0;
|
||||
+ return FastScanNameResult(0);
|
||||
}
|
||||
|
||||
enum NameChar { NameBeginning, NameNotBeginning, NotName };
|
||||
@@ -1878,6 +1881,14 @@ void QXmlStreamReaderPrivate::raiseWellFormedError(const QString &message)
|
||||
raiseError(QXmlStreamReader::NotWellFormedError, message);
|
||||
}
|
||||
|
||||
+void QXmlStreamReaderPrivate::raiseNamePrefixTooLongError()
|
||||
+{
|
||||
+ // TODO: add a ImplementationLimitsExceededError and use it instead
|
||||
+ raiseError(QXmlStreamReader::NotWellFormedError,
|
||||
+ QXmlStream::tr("Length of XML attribute name exceeds implemnetation limits (4KiB "
|
||||
+ "characters)."));
|
||||
+}
|
||||
+
|
||||
void QXmlStreamReaderPrivate::parseError()
|
||||
{
|
||||
|
||||
diff --git a/src/corelib/serialization/qxmlstream.g b/src/corelib/serialization/qxmlstream.g
|
||||
index 4321fed68a..8c6a1a5887 100644
|
||||
--- a/src/corelib/serialization/qxmlstream.g
|
||||
+++ b/src/corelib/serialization/qxmlstream.g
|
||||
@@ -516,7 +516,16 @@ public:
|
||||
int fastScanLiteralContent();
|
||||
int fastScanSpace();
|
||||
int fastScanContentCharList();
|
||||
- int fastScanName(int *prefix = nullptr);
|
||||
+
|
||||
+ struct FastScanNameResult {
|
||||
+ FastScanNameResult() : ok(false) {}
|
||||
+ explicit FastScanNameResult(int len) : addToLen(len), ok(true) { }
|
||||
+ operator bool() { return ok; }
|
||||
+ int operator*() { Q_ASSERT(ok); return addToLen; }
|
||||
+ int addToLen;
|
||||
+ bool ok;
|
||||
+ };
|
||||
+ FastScanNameResult fastScanName(Value *val = nullptr);
|
||||
inline int fastScanNMTOKEN();
|
||||
|
||||
|
||||
@@ -525,6 +534,7 @@ public:
|
||||
|
||||
void raiseError(QXmlStreamReader::Error error, const QString& message = QString());
|
||||
void raiseWellFormedError(const QString &message);
|
||||
+ void raiseNamePrefixTooLongError();
|
||||
|
||||
QXmlStreamEntityResolver *entityResolver;
|
||||
|
||||
@@ -1811,7 +1821,12 @@ space_opt ::= space;
|
||||
qname ::= LETTER;
|
||||
/.
|
||||
case $rule_number: {
|
||||
- sym(1).len += fastScanName(&sym(1).prefix);
|
||||
+ Value &val = sym(1);
|
||||
+ if (auto res = fastScanName(&val))
|
||||
+ val.len += *res;
|
||||
+ else
|
||||
+ return false;
|
||||
+
|
||||
if (atEnd) {
|
||||
resume($rule_number);
|
||||
return false;
|
||||
@@ -1822,7 +1837,11 @@ qname ::= LETTER;
|
||||
name ::= LETTER;
|
||||
/.
|
||||
case $rule_number:
|
||||
- sym(1).len += fastScanName();
|
||||
+ if (auto res = fastScanName())
|
||||
+ sym(1).len += *res;
|
||||
+ else
|
||||
+ return false;
|
||||
+
|
||||
if (atEnd) {
|
||||
resume($rule_number);
|
||||
return false;
|
||||
diff --git a/src/corelib/serialization/qxmlstream_p.h b/src/corelib/serialization/qxmlstream_p.h
|
||||
index e5bde7b98e..b01484cac3 100644
|
||||
--- a/src/corelib/serialization/qxmlstream_p.h
|
||||
+++ b/src/corelib/serialization/qxmlstream_p.h
|
||||
@@ -1005,7 +1005,16 @@ public:
|
||||
int fastScanLiteralContent();
|
||||
int fastScanSpace();
|
||||
int fastScanContentCharList();
|
||||
- int fastScanName(int *prefix = nullptr);
|
||||
+
|
||||
+ struct FastScanNameResult {
|
||||
+ FastScanNameResult() : ok(false) {}
|
||||
+ explicit FastScanNameResult(int len) : addToLen(len), ok(true) { }
|
||||
+ operator bool() { return ok; }
|
||||
+ int operator*() { Q_ASSERT(ok); return addToLen; }
|
||||
+ int addToLen;
|
||||
+ bool ok;
|
||||
+ };
|
||||
+ FastScanNameResult fastScanName(Value *val = nullptr);
|
||||
inline int fastScanNMTOKEN();
|
||||
|
||||
|
||||
@@ -1014,6 +1023,7 @@ public:
|
||||
|
||||
void raiseError(QXmlStreamReader::Error error, const QString& message = QString());
|
||||
void raiseWellFormedError(const QString &message);
|
||||
+ void raiseNamePrefixTooLongError();
|
||||
|
||||
QXmlStreamEntityResolver *entityResolver;
|
||||
|
||||
@@ -1939,7 +1949,12 @@ bool QXmlStreamReaderPrivate::parse()
|
||||
break;
|
||||
|
||||
case 262: {
|
||||
- sym(1).len += fastScanName(&sym(1).prefix);
|
||||
+ Value &val = sym(1);
|
||||
+ if (auto res = fastScanName(&val))
|
||||
+ val.len += *res;
|
||||
+ else
|
||||
+ return false;
|
||||
+
|
||||
if (atEnd) {
|
||||
resume(262);
|
||||
return false;
|
||||
@@ -1947,7 +1962,11 @@ bool QXmlStreamReaderPrivate::parse()
|
||||
} break;
|
||||
|
||||
case 263:
|
||||
- sym(1).len += fastScanName();
|
||||
+ if (auto res = fastScanName())
|
||||
+ sym(1).len += *res;
|
||||
+ else
|
||||
+ return false;
|
||||
+
|
||||
if (atEnd) {
|
||||
resume(263);
|
||||
return false;
|
||||
@ -56,8 +56,8 @@
|
||||
|
||||
Name: qt5-qtbase
|
||||
Summary: Qt5 - QtBase components
|
||||
Version: 5.15.10
|
||||
Release: 9%{?dist}
|
||||
Version: 5.15.11
|
||||
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
|
||||
@ -141,11 +141,11 @@ Patch90: %{name}-gcc11.patch
|
||||
|
||||
## upstream patches
|
||||
# https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch
|
||||
# git diff v5.15.10-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz
|
||||
# git diff v5.15.11-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-20230613.patch.gz
|
||||
Patch100: kde-5.15-rollup-20231006.patch.gz
|
||||
# HACK to make 'fedpkg sources' consider it 'used"
|
||||
Source100: kde-5.15-rollup-20230613.patch.gz
|
||||
Source100: kde-5.15-rollup-20231006.patch.gz
|
||||
|
||||
Patch101: qtbase-5.15.10-fix-missing-qtsan-include.patch
|
||||
# Workaround for font rendering issue with cjk-vf-fonts
|
||||
@ -158,7 +158,6 @@ Patch103: qtbase-QTBUG-112136.patch
|
||||
Patch104: qtbase-QTBUG-103393.patch
|
||||
|
||||
# upstream security fixes
|
||||
Patch110: CVE-2023-37369-qtbase-5.15.diff
|
||||
|
||||
## Qt 6 backports for better Gtk/GNOME integration
|
||||
# https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
|
||||
@ -462,7 +461,6 @@ Qt5 libraries used for drawing widgets and OpenGL items.
|
||||
%patch -P102 -p1
|
||||
%patch -P103 -p1
|
||||
%patch -P104 -p1
|
||||
%patch -P110 -p1
|
||||
|
||||
## Qt 6 backports
|
||||
%if 0%{?fedora} > 30 || 0%{?rhel} > 8
|
||||
@ -1168,6 +1166,9 @@ fi
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 06 2023 Jan Grulich <jgrulich@redhat.com> - 5.15.11-10
|
||||
- 5.15.11
|
||||
|
||||
* Tue Aug 29 2023 LuK1337 <priv.luk@gmail.com> - 5.15.10-9
|
||||
- Apply PySide2 build fix from OpenMandriva
|
||||
|
||||
|
||||
@ -1,5 +1,13 @@
|
||||
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 1389ede1..665cf116 100644
|
||||
index 1a9c88ff..b6ed901e 100644
|
||||
--- a/include/QtCore/headers.pri
|
||||
+++ b/include/QtCore/headers.pri
|
||||
@@ -1,6 +1,6 @@
|
||||
@ -10,14 +18,7 @@ index 1389ede1..665cf116 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.10/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"
|
||||
SYNCQT.INJECTIONS = src/corelib/global/qconfig.h:qconfig.h:QtConfig src/corelib/global/qconfig_p.h:5.15.11/QtCore/private/qconfig_p.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
|
||||
|
||||
4
sources
4
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (qtbase-everywhere-opensource-src-5.15.10.tar.xz) = 94ac739d76dd9fff54cde46e818fee6c6763f8b207b759108455febff84c9dfeb48ea7807451d7248cbfd8af24c2a1263c34dcbd2be055136e39325e32725eef
|
||||
SHA512 (kde-5.15-rollup-20230613.patch.gz) = 45a92bdbcf9b6ded0f9b427dac72fdb280a97b3428c5ee7580b8eab13b3abc4d04d4b82f27b89cecabe920fc5ad8e2f3905c9c94eb388f454846cb3868c737b6
|
||||
SHA512 (qtbase-everywhere-opensource-src-5.15.11.tar.xz) = 4136092eec7bdceba661eee0187b7952ed6ba819148295979c0fd0392c17b0178165fa20136bdf460509a815c96f43892403294ba6e5322c54c51459c358fb7f
|
||||
SHA512 (kde-5.15-rollup-20231006.patch.gz) = 234267395354784408288b5e99e061c3cd42ffc9b880579372d74aab38f82f0b41488eeca4aff5fffbb2cca2da83189f57ee32efeea78d978308b60e57cffa6d
|
||||
|
||||
Loading…
Reference in New Issue
Block a user