diff --git a/CVE-2025-30348.patch b/CVE-2025-30348.patch deleted file mode 100644 index bbc001a77d408c2982bee33e8b4e5e7be9b8c9f2..0000000000000000000000000000000000000000 --- a/CVE-2025-30348.patch +++ /dev/null @@ -1,156 +0,0 @@ -From 16918c1df3e709df2a97281e3825d94c84edb668 Mon Sep 17 00:00:00 2001 -From: Christian Ehrlicher -Date: Tue, 06 Aug 2024 22:39:44 +0200 -Subject: [PATCH] XML/QDom: speedup encodeText() - -The code copied the whole string, then replaced parts inline, at -the cost of relocating everything beyond, at each replacement. -Instead, copy character by character (in chunks where possible) -and append replacements as we skip what they replace. - -Manual conflict resolution for 6.5: -- This is a manual cherry-pick. The original change was only - picked to 6.8, but the quadratic behavior is present in Qt 5, too. -- Changed Task-number to Fixes: because this is the real fix; - the QString change, 315210de916d060c044c01e53ff249d676122b1b, - was unrelated to the original QTBUG-127549. - -Manual conflcit resolution for 5.15: -- Kept/re-added QTextCodec::canEncode() check -- Ported from Qt 6 to 5, to wit: - - qsizetype -> int - - QStringView::first/sliced(n) -> left/mid(n) - (these functions are clearly called in-range, so the widened - contract of the Qt 5 functions doesn't matter) -- Ported from C++17- and C++14-isms to C++11: - - replaced polymorphic lambda with a normal one (this requires - rewriting the !canEncode() branch to use QByteArray/QLatin1String - instead of QString) -- As a drive-by, corrected the indentation of the case labels to - horizontally align existing code (and follow Qt style) - -Fixes: QTBUG-127549 -Change-Id: I368482859ed0c4127f1eec2919183711b5488ada -Reviewed-by: Edward Welbourne -(cherry picked from commit 2ce08e3671b8d18b0284447e5908ce15e6e8f80f) -Reviewed-by: Qt Cherry-pick Bot -(cherry picked from commit 225e235cf966a44af23dbe9aaaa2fd20ab6430ee) -Reviewed-by: Fabian Kosmale -(cherry picked from commit 905a5bd421efff6a1d90b6140500d134d32ca745) ---- - -diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp -index 872221c..bf70477 100644 ---- a/src/xml/dom/qdom.cpp -+++ b/src/xml/dom/qdom.cpp -@@ -3676,59 +3676,67 @@ - const QTextCodec *const codec = s.codec(); - Q_ASSERT(codec); - #endif -- QString retval(str); -- int len = retval.length(); -- int i = 0; -+ QString retval; -+ int start = 0; -+ auto appendToOutput = [&](int cur, QLatin1String replacement) -+ { -+ if (start < cur) { -+ retval.reserve(str.size() + replacement.size()); -+ retval.append(QStringView(str).left(cur).mid(start)); -+ } -+ // Skip over str[cur], replaced by replacement -+ start = cur + 1; -+ retval.append(replacement); -+ }; - -- while (i < len) { -- const QChar ati(retval.at(i)); -- -- if (ati == QLatin1Char('<')) { -- retval.replace(i, 1, QLatin1String("<")); -- len += 3; -- i += 4; -- } else if (encodeQuotes && (ati == QLatin1Char('"'))) { -- retval.replace(i, 1, QLatin1String(""")); -- len += 5; -- i += 6; -- } else if (ati == QLatin1Char('&')) { -- retval.replace(i, 1, QLatin1String("&")); -- len += 4; -- i += 5; -- } else if (ati == QLatin1Char('>') && i >= 2 && retval[i - 1] == QLatin1Char(']') && retval[i - 2] == QLatin1Char(']')) { -- retval.replace(i, 1, QLatin1String(">")); -- len += 3; -- i += 4; -- } else if (performAVN && -- (ati == QChar(0xA) || -- ati == QChar(0xD) || -- ati == QChar(0x9))) { -- const QString replacement(QLatin1String("&#x") + QString::number(ati.unicode(), 16) + QLatin1Char(';')); -- retval.replace(i, 1, replacement); -- i += replacement.length(); -- len += replacement.length() - 1; -- } else if (encodeEOLs && ati == QChar(0xD)) { -- retval.replace(i, 1, QLatin1String(" ")); // Replace a single 0xD with a ref for 0xD -- len += 4; -- i += 5; -- } else { -+ const int len = str.size(); -+ for (int cur = 0; cur < len; ++cur) { -+ switch (const char16_t ati = str[cur].unicode()) { -+ case u'<': -+ appendToOutput(cur, QLatin1String("<")); -+ break; -+ case u'"': -+ if (encodeQuotes) -+ appendToOutput(cur, QLatin1String(""")); -+ break; -+ case u'&': -+ appendToOutput(cur, QLatin1String("&")); -+ break; -+ case u'>': -+ if (cur >= 2 && str[cur - 1] == u']' && str[cur - 2] == u']') -+ appendToOutput(cur, QLatin1String(">")); -+ break; -+ case u'\r': -+ if (performAVN || encodeEOLs) -+ appendToOutput(cur, QLatin1String(" ")); // \r == 0x0d -+ break; -+ case u'\n': -+ if (performAVN) -+ appendToOutput(cur, QLatin1String(" ")); // \n == 0x0a -+ break; -+ case u'\t': -+ if (performAVN) -+ appendToOutput(cur, QLatin1String(" ")); // \t == 0x09 -+ break; -+ default: - #if QT_CONFIG(textcodec) - if(codec->canEncode(ati)) -- ++i; -+ ; // continue - else - #endif - { - // We have to use a character reference to get it through. -- const ushort codepoint(ati.unicode()); -- const QString replacement(QLatin1String("&#x") + QString::number(codepoint, 16) + QLatin1Char(';')); -- retval.replace(i, 1, replacement); -- i += replacement.length(); -- len += replacement.length() - 1; -+ const QByteArray replacement = "&#x" + QByteArray::number(uint{ati}, 16) + ';'; -+ appendToOutput(cur, QLatin1String{replacement}); - } -+ break; - } - } -- -- return retval; -+ if (start > 0) { -+ retval.append(QStringView(str).left(len).mid(start)); -+ return retval; -+ } -+ return str; - } - - void QDomAttrPrivate::save(QTextStream& s, int, int) const diff --git a/kde-5.15-rollup-20240904.patch.gz b/kde-5.15-rollup-20240904.patch.gz deleted file mode 100644 index 2aa113d3e21674f3f6ba235b8be5076d4152154c..0000000000000000000000000000000000000000 Binary files a/kde-5.15-rollup-20240904.patch.gz and /dev/null differ diff --git a/kde-5.15-rollup-20251102.patch.gz b/kde-5.15-rollup-20251102.patch.gz new file mode 100644 index 0000000000000000000000000000000000000000..190ac81a126d80b3053860ab070d4d9d307a1d2a Binary files /dev/null and b/kde-5.15-rollup-20251102.patch.gz differ diff --git a/qt5-qtbase-5.12.1-firebird.patch b/qt5-qtbase-5.12.1-firebird-4.0.0.patch similarity index 58% rename from qt5-qtbase-5.12.1-firebird.patch rename to qt5-qtbase-5.12.1-firebird-4.0.0.patch index 674a5b5a2ded56a3951ac04be8dc7573f1b225e9..9c091612dc85eedd41c0abf236a9c5cac9330cca 100644 --- a/qt5-qtbase-5.12.1-firebird.patch +++ b/qt5-qtbase-5.12.1-firebird-4.0.0.patch @@ -6,7 +6,7 @@ diff -up qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json.fire "label": "InterBase", "test": {}, - "headers": "ibase.h", -+ "headers": "firebird/ibase.h", ++ "headers": "ibase.h", "sources": [ { "libs": "-lgds32_ms", "condition": "config.win32" }, - { "libs": "-lgds", "condition": "!config.win32" } @@ -15,15 +15,3 @@ diff -up qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/configure.json.fire ] }, "mysql": { -diff -up qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h ---- qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h.firebird 2019-01-28 11:11:52.000000000 -0600 -+++ qtbase-everywhere-src-5.12.1/src/plugins/sqldrivers/ibase/qsql_ibase_p.h 2019-02-03 13:27:30.683142996 -0600 -@@ -52,7 +52,7 @@ - // - - #include --#include -+#include - - #ifdef QT_PLUGIN - #define Q_EXPORT_SQLDRIVER_IBASE diff --git a/qt5-qtbase.spec b/qt5-qtbase.spec index c78920aafd9fafc70080a6a945adae66f64cfeeb..ff7375a55b08cebc966b0c93db5519179f9f68b5 100644 --- a/qt5-qtbase.spec +++ b/qt5-qtbase.spec @@ -26,23 +26,21 @@ %global qt_module qtbase -%global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d) - - %global examples 1 + +%bcond_with doc ## skip for now, until we're better at it --rex #global tests 1 Name: qt5-qtbase Summary: Qt5 - QtBase components -Version: 5.15.16 -Release: 2 +Version: 5.15.18 +Release: 1 # See LGPL_EXCEPTIONS.txt, for exception details License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -Url: http://qt-project.org/ -%global majmin %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz +Url: https://www.qt.io +Source0: https://download.qt.io/archive/qt/%{version_major_minor}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz # https://bugzilla.redhat.com/show_bug.cgi?id=1227295 Source1: qtlogging.ini @@ -90,8 +88,8 @@ Patch0011: qtbase-everywhere-src-5.15.2-libglvnd.patch # drop -O3 and make -O2 by default Patch0008: qt5-qtbase-cxxflag.patch -# support firebird version 3.x -Patch0009: qt5-qtbase-5.12.1-firebird.patch +# support firebird version 4.0 +Patch0009: qt5-qtbase-5.12.1-firebird-4.0.0.patch # fix for new mariadb Patch0010: qtbase-opensource-src-5.9.0-mysql.patch @@ -106,9 +104,9 @@ Patch0013: %{name}-gcc11.patch ## upstream patches # https://invent.kde.org/qt/qt/qtbase, kde/5.15 branch -# git diff v5.15.16-lts-lgpl..HEAD | gzip > kde-5.15-rollup-$(date +%Y%m%d).patch.gz +# git diff v5.15.18-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-20240904.patch.gz +Patch100: kde-5.15-rollup-20251102.patch.gz Patch101: qtbase-5.15.10-fix-missing-qtsan-include.patch # Workaround for font rendering issue with cjk-vf-fonts @@ -124,8 +122,7 @@ Patch0022: add-loongarch64-support.patch Patch0024: Fix-lupdate-command-error-on-loongarch64.patch Patch0031: CVE-2023-45935.patch Patch0033: add-sw_64-support-for-syscall_fork.patch -Patch0034: CVE-2025-30348.patch -Patch0035: fix-sw_64-QT_ARCH.patch +Patch0034: fix-sw_64-QT_ARCH.patch # Do not check any files in %%{_qt5_plugindir}/platformthemes/ for requires. # Those themes are there for platform integration. If the required libraries are @@ -218,12 +215,15 @@ Conflicts: qt < 1:4.8.6-10 Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives %endif + +%if %{with doc} +BuildRequires: qt5-doctools +%endif Requires: qt-settings Requires: %{name}-common = %{version}-%{release} ## Sql drivers -%global ibase -no-sql-ibase %global tds -no-sql-tds @@ -359,6 +359,12 @@ Requires: glx-utils %description gui Qt5 libraries used for drawing widgets and OpenGL items. +%package doc +Summary: Documentation for %{name} +Buildarch: noarch + +%description doc +%{summary}. %prep %autosetup -p1 -n %{qt_module}-everywhere-src-%{version} @@ -492,10 +498,15 @@ make clean -C qmake QMAKE_STRIP= %make_build - +%if %{with doc} +%make_build docs +%endif %install -make install INSTALL_ROOT=%{buildroot} +%{qmake_qt5_install} +%if %{with doc} +%qmake_qt5_install install_docs +%endif install -m644 -p -D %{SOURCE1} %{buildroot}%{_qt5_datadir}/qtlogging.ini @@ -526,13 +537,13 @@ EOF # rpm macros install -p -m644 -D %{SOURCE4} \ - %{buildroot}%{rpm_macros_dir}/macros.qt5-qtbase + %{buildroot}%{_rpmmacrodir}/macros.qt5-qtbase sed -i \ -e "s|@@NAME@@|%{name}|g" \ -e "s|@@EPOCH@@|%{?epoch}%{!?epoch:0}|g" \ -e "s|@@VERSION@@|%{version}|g" \ -e "s|@@EVR@@|%{?epoch:%{epoch:}}%{version}-%{release}|g" \ - %{buildroot}%{rpm_macros_dir}/macros.qt5-qtbase + %{buildroot}%{_rpmmacrodir}/macros.qt5-qtbase # create/own dirs mkdir -p %{buildroot}{%{_qt5_archdatadir}/mkspecs/modules,%{_qt5_importdir},%{_qt5_libexecdir},%{_qt5_plugindir}/{designer,iconengines,script,styles},%{_qt5_translationdir}} @@ -630,7 +641,6 @@ fi %endif %post -%{?ldconfig} %if 0%{?qtchooser} %{_sbindir}/update-alternatives \ --install %{_sysconfdir}/xdg/qtchooser/5.conf \ @@ -646,7 +656,6 @@ fi %endif %postun -%{?ldconfig} %if 0%{?qtchooser} if [ $1 -eq 0 ]; then %{_sbindir}/update-alternatives \ @@ -727,7 +736,7 @@ fi %files common # mostly empty for now, consider: filesystem/dir ownership, licenses -%{rpm_macros_dir}/macros.qt5-qtbase +%{_rpmmacrodir}/macros.qt5-qtbase %files devel %if "%{_qt5_bindir}" != "%{_bindir}" @@ -947,8 +956,6 @@ fi %{_qt5_libdir}/cmake/Qt5Sql/Qt5Sql_QTDSDriverPlugin.cmake %endif -%ldconfig_scriptlets gui - %files gui %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d/ @@ -1018,8 +1025,18 @@ fi %{_qt5_plugindir}/printsupport/libcupsprintersupport.so %{_qt5_libdir}/cmake/Qt5PrintSupport/Qt5PrintSupport_QCupsPrinterSupportPlugin.cmake +%if %{with doc} +%files doc +%license LICENSE.FDL +%{_qt5_docdir}/* +%endif %changelog +* Sun Nov 02 2025 Funda Wang - 5.15.18-1 +- update to version 5.15.18 +- enable firebird driver +- fix CVE-2025-5455 + * Fri Oct 24 2025 mahailiang - 5.15.16-2 - fix sw_64 QT_ARCH diff --git a/qtbase-5.15.10-fix-missing-qtsan-include.patch b/qtbase-5.15.10-fix-missing-qtsan-include.patch index 81a4a197366acdf17b1fb0ba283f64235c3c1612..03166638044adf20d536566c2411582efd75cdae 100644 --- a/qtbase-5.15.10-fix-missing-qtsan-include.patch +++ b/qtbase-5.15.10-fix-missing-qtsan-include.patch @@ -10,7 +10,7 @@ index 791c9599..fc27afc5 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.16/QtCore/private/qconfig_p.h + SYNCQT.INJECTIONS = src/corelib/global/qconfig.h:qconfig.h:QtConfig src/corelib/global/qconfig_p.h:5.15.18/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 diff --git a/qtbase-everywhere-opensource-src-5.15.16.tar.xz b/qtbase-everywhere-opensource-src-5.15.18.tar.xz similarity index 32% rename from qtbase-everywhere-opensource-src-5.15.16.tar.xz rename to qtbase-everywhere-opensource-src-5.15.18.tar.xz index c0946ae51dd73bb89bd64a70180dac3c2753c9d1..6df005eb983744ed82fa4ee212bb5e2c8b8640ac 100644 --- a/qtbase-everywhere-opensource-src-5.15.16.tar.xz +++ b/qtbase-everywhere-opensource-src-5.15.18.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b04815058c18058b6ba837206756a2c87d1391f07a0dcb0dd314f970fd041592 -size 51392072 +oid sha256:7b632550ea1048fc10c741e46e2e3b093e5ca94dfa6209e9e0848800e247023b +size 51492796