1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-18 19:49:40 +00:00

Update Qt5 to 5.15

This is a major upgrade of the Qt libraries [1], [2].

* People that use upgrading mechanisms with incomplete dependency handling
  (portmaster & Co) should make sure to manually remove the existing Qt
  packages to guarantee a safe upgrade. Keep in mind, that Qt does not like if
  you have an incomplete upgrade.

* This version of Qt drops support for OpenSSL 1.0 -- this means that there
  won't be any binary packages for Qt5 provided by the FreeBSD package builders
  for FreeBSD 11.x anymore -- and the same for *all* the ports depending on
  net/qt5-network [3]. If you cannot upgrade to a more recent FreeBSD
  version (12.x, 13.x), you will need to build Qt5 from ports while switching
  to an SSL implementation from ports.

Big thanks are due for
* kai@ for updating webengine (also mikael@)
* Felix Palmen for providing LibreSSL support patches
* adridg@ and lbartoletti@ for helping me fix the fallout

[1] https://www.qt.io/blog/qt-5.15-released
[2] https://wiki.qt.io/New_Features_in_Qt_5.15
[3] https://www.freshports.org/net/qt5-network

PR:		247010
Exp-run by:	antoine
This commit is contained in:
Tobias C. Berner 2020-07-06 06:43:37 +00:00
parent 5e1f836349
commit 5f34284e7c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=541318
200 changed files with 2486 additions and 1799 deletions

View File

@ -24,7 +24,7 @@ _QT_MK_INCLUDED= qt.mk
# Qt versions currently supported by the framework.
_QT_SUPPORTED?= 5
QT5_VERSION?= 5.14.2
QT5_VERSION?= 5.15.0
# We accept the Qt version to be passed by either or all of the three mk files.
. if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)

View File

@ -76,7 +76,7 @@
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_darwin_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_dummy_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_win_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h

View File

@ -1,4 +1,5 @@
%%QT_BINDIR%%/canbusutil
%%DEBUG%%%%QT_BINDIR%%/canbusutil.debug
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdeviceinfo_p.h
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h

View File

@ -17,12 +17,12 @@ This does not apply to the Qt4 port, which allows older compilers
and the less-fragile approach would therefore break on old-gcc-in-base
architectures.
--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig 2018-04-29 07:25:09 UTC
--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig 2020-03-11 15:29:12 UTC
+++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp
@@ -74,6 +74,14 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)
# define Q_CLIENT_MULTI_STATEMENTS 0
#endif
@@ -71,6 +71,14 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)
// by redefining it we can regain source compatibility.
using my_bool = decltype(mysql_stmt_bind_result(nullptr, nullptr));
+// MYSQL 8.0.1 no longer uses the my_bool type:
+// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html
+#if (MYSQL_VERSION_ID >= 80001) && !defined(MARIADB_BASE_VERSION)
@ -32,50 +32,32 @@ architectures.
+#endif
+
QT_BEGIN_NAMESPACE
class QMYSQLDriverPrivate : public QSqlDriverPrivate
@@ -232,7 +240,7 @@ class QMYSQLResultPrivate: public QSqlResultPrivate (p
myField(0), type(QVariant::Invalid)
{}
char *outField;
- my_bool nullIndicator;
+ mysql_bool nullIndicator;
ulong bufLength;
MYSQL_FIELD *myField;
QVariant::Type type;
@@ -983,7 +991,7 @@ bool QMYSQLResult::exec()
@@ -930,7 +938,7 @@ bool QMYSQLResult::exec()
MYSQL_BIND* currBind;
QVector<MYSQL_TIME *> timeVector;
QVector<QByteArray> stringVector;
- QVector<my_bool> nullVector;
+ QVector<mysql_bool> nullVector;
const QVector<QVariant> values = boundValues();
@@ -1004,7 +1012,7 @@ bool QMYSQLResult::exec()
@@ -951,7 +959,7 @@ bool QMYSQLResult::exec()
currBind = &d->outBinds[i];
- nullVector[i] = static_cast<my_bool>(val.isNull());
+ nullVector[i] = static_cast<mysql_bool>(val.isNull());
currBind->is_null = &nullVector[i];
currBind->length = 0;
currBind->is_unsigned = 0;
@@ -1101,7 +1109,7 @@ bool QMYSQLResult::exec()
@@ -1048,7 +1056,7 @@ bool QMYSQLResult::exec()
d->rowsAffected = mysql_stmt_affected_rows(d->stmt);
if (isSelect()) {
- my_bool update_max_length = true;
+ mysql_bool update_max_length = true;
r = mysql_stmt_bind_result(d->stmt, d->inBinds);
if (r != 0) {
@@ -1312,7 +1320,7 @@ bool QMYSQLDriver::open(const QString& db,
QString sslCAPath;
QString sslCipher;
#if MYSQL_VERSION_ID >= 50000
- my_bool reconnect=false;
+ mysql_bool reconnect=false;
uint connectTimeout = 0;
uint readTimeout = 0;
uint writeTimeout = 0;

View File

@ -1,2 +1,3 @@
%%QT_BINDIR%%/assistant
%%DEBUG%%%%QT_BINDIR%%/assistant.debug
share/pixmaps/assistant-qt5.png

View File

@ -1,5 +1,7 @@
%%QT_BINDIR%%/moc
%%DEBUG%%%%QT_BINDIR%%/moc.debug
%%QT_BINDIR%%/rcc
%%DEBUG%%%%QT_BINDIR%%/rcc.debug
%%QT_BINDIR%%/syncqt.pl
%%QT_LIBDIR%%/libQt5Bootstrap.a
%%QT_LIBDIR%%/libQt5Bootstrap.prl

View File

@ -2,7 +2,6 @@
PORTNAME= core
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 3
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
@ -25,7 +24,7 @@ CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \
-no-iconv -no-dbus -no-opengl \
-no-egl -no-evdev \
-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \
-no-libudev -no-xcb -no-xkb -no-xcb-xlib \
-no-libudev -no-xcb -no-xcb-xlib \
-no-xkbcommon -no-libinput
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}

View File

@ -1,109 +0,0 @@
From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001
From: Thiago Macieira <thiago.macieira@intel.com>
Date: Thu, 2 Apr 2020 12:08:41 -0300
Subject: QLibrary: fix deadlock caused by fix to QTBUG-39642
Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around
the entire load_sys(). We had reasoed that deadlocks would only occur if
the object creation in instance() recursed into its own instance(),
which was already a bug. But we had forgotten that dlopen()/
LoadLibrary() executes initialization code from the module being loaded,
which could cause a recursion back into the same QPluginLoader or
QLibrary object. This recursion is benign because the module *is* loaded
and dlopen()/LoadLibrary() returns the same handle.
[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that
would happen if the plugin or library being loaded has load-time
initialization code (C++ global variables) that recursed back into the
same QLibrary or QPluginLoader object.
PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex
lock, so pluginState should be made an atomic variable. Once that is
done, we'll only need locking the mutex to update errorString (no
locking before loading).
Fixes: QTBUG-83207
Task-number: QTBUG-39642
Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: David Faure <david.faure@kdab.com>
---
src/corelib/plugin/qlibrary.cpp | 2 --
src/corelib/plugin/qlibrary_unix.cpp | 4 ++++
src/corelib/plugin/qlibrary_win.cpp | 3 +++
3 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
index ddb053c26f..be9d92b204 100644
--- src/corelib/plugin/qlibrary.cpp
+++ src/corelib/plugin/qlibrary.cpp
@@ -576,9 +576,7 @@ bool QLibraryPrivate::load()
Q_TRACE(QLibraryPrivate_load_entry, fileName);
- mutex.lock();
bool ret = load_sys();
- mutex.unlock();
if (qt_debug_component()) {
if (ret) {
qDebug() << "loaded library" << fileName;
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
index 017aa97b66..a5c72f81d9 100644
--- src/corelib/plugin/qlibrary_unix.cpp
+++ src/corelib/plugin/qlibrary_unix.cpp
@@ -123,6 +123,7 @@ QStringList QLibraryPrivate::prefixes_sys()
bool QLibraryPrivate::load_sys()
{
+ QMutexLocker locker(&mutex);
QString attempt;
QFileSystemEntry fsEntry(fileName);
@@ -213,6 +214,7 @@ bool QLibraryPrivate::load_sys()
}
#endif
+ locker.unlock();
bool retry = true;
Handle hnd = nullptr;
for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) {
@@ -273,6 +275,8 @@ bool QLibraryPrivate::load_sys()
}
}
#endif
+
+ locker.relock();
if (!hnd) {
errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror());
}
diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
index 000bf76276..ef58724be8 100644
--- src/corelib/plugin/qlibrary_win.cpp
+++ src/corelib/plugin/qlibrary_win.cpp
@@ -78,6 +78,7 @@ bool QLibraryPrivate::load_sys()
// fileName
//
// NB If it's a plugin we do not ever try the ".dll" extension
+ QMutexLocker locker(&mutex);
QStringList attempts;
if (pluginState != IsAPlugin)
@@ -95,6 +96,7 @@ bool QLibraryPrivate::load_sys()
attempts.prepend(QDir::rootPath() + fileName);
#endif
+ locker.unlock();
Handle hnd = nullptr;
for (const QString &attempt : qAsConst(attempts)) {
#ifndef Q_OS_WINRT
@@ -115,6 +117,7 @@ bool QLibraryPrivate::load_sys()
#ifndef Q_OS_WINRT
SetErrorMode(oldmode);
#endif
+ locker.relock();
if (!hnd) {
errorString = QLibrary::tr("Cannot load library %1: %2").arg(
QDir::toNativeSeparators(fileName), qt_error_string());
--
cgit v1.2.1

View File

@ -1,20 +1,28 @@
--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2019-11-01 21:30:15 UTC
--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2020-05-11 08:15:08 UTC
+++ src/corelib/time/qtimezoneprivate_tz.cpp
@@ -1126,6 +1126,17 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
@@ -1153,6 +1153,25 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
}
}
+ // On many FreeBSD systems, /etc/localtime is a regular file while the actual name is in /var/db/zoneinfo
+ // On some FreeBSD systems, /etc/localtime is a regular file while
+ // the actual name is in /var/db/zoneinfo
+ if (ianaId.isEmpty()) {
+ QFile tzif(QStringLiteral("/var/db/zoneinfo"));
+ if (tzif.open(QIODevice::ReadOnly)) {
+ // TODO QTextStream inefficient, replace later
+ QTextStream ts(&tzif);
+ if (!ts.atEnd())
+ ianaId = ts.readLine().toUtf8();
+ const int maximumTZNameLength = 256;
+ QByteArray tzcontents( tzif.read( maximumTZNameLength ) );
+ if (tzcontents.size() >= 2) {
+ // Shortest TZ would be UTC, or r/z, but there's special
+ // cases "GB" and "US"
+ const int newlineIndex = tzcontents.indexOf('\n');
+ if (newlineIndex < 0) // No newline in file
+ ianaId = tzcontents;
+ if (newlineIndex > 2) // Newline, chop it off
+ ianaId = tzcontents.left(newlineIndex-1);
+ }
+ }
+ }
+
// On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock
// in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
// Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
if (ianaId.isEmpty()) {
QFile zone(QStringLiteral("/etc/TZ"));

View File

@ -9,10 +9,15 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracttransition_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjson_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonarray_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonobject_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonvalue_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborcommon_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h
@ -30,6 +35,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qduplicatetracker_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qendian_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h
@ -182,6 +188,7 @@
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwaitcondition_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h
@ -427,6 +434,7 @@
%%QT_INCDIR%%/QtCore/QSignalTransition
%%QT_INCDIR%%/QtCore/QSize
%%QT_INCDIR%%/QtCore/QSizeF
%%QT_INCDIR%%/QtCore/QSocketDescriptor
%%QT_INCDIR%%/QtCore/QSocketNotifier
%%QT_INCDIR%%/QtCore/QSortFilterProxyModel
%%QT_INCDIR%%/QtCore/QSpecialInteger
@ -559,6 +567,8 @@
%%QT_INCDIR%%/QtCore/qcborcommon.h
%%QT_INCDIR%%/QtCore/qcbormap.h
%%QT_INCDIR%%/QtCore/qcborstream.h
%%QT_INCDIR%%/QtCore/qcborstreamreader.h
%%QT_INCDIR%%/QtCore/qcborstreamwriter.h
%%QT_INCDIR%%/QtCore/qcborvalue.h
%%QT_INCDIR%%/QtCore/qchar.h
%%QT_INCDIR%%/QtCore/qcollator.h
@ -738,12 +748,14 @@
%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreMacros.cmake
%%QT_BINDIR%%/qlalr
%%DEBUG%%%%QT_BINDIR%%/qlalr.debug
%%QT_LIBDIR%%/libQt5Core.prl
%%QT_LIBDIR%%/libQt5Core.so
%%QT_LIBDIR%%/libQt5Core.so.5
%%QT_LIBDIR%%/libQt5Core.so.%%SHORTVER%%
%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%.debug
%%QT_LIBDIR%%/metatypes/qt5core_metatypes.json
%%QT_MKSPECDIR%%/modules/qt_lib_core.pri
%%QT_MKSPECDIR%%/modules/qt_lib_core_private.pri
libdata/pkgconfig/Qt5Core.pc

View File

@ -75,7 +75,9 @@
%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%.debug
%%QT_BINDIR%%/qdbuscpp2xml
%%DEBUG%%%%QT_BINDIR%%/qdbuscpp2xml.debug
%%QT_BINDIR%%/qdbusxml2cpp
%%DEBUG%%%%QT_BINDIR%%/qdbusxml2cpp.debug
%%QT_MKSPECDIR%%/modules/qt_lib_dbus.pri
%%QT_MKSPECDIR%%/modules/qt_lib_dbus_private.pri
libdata/pkgconfig/Qt5DBus.pc

View File

@ -182,6 +182,7 @@
%%QT_CMAKEDIR%%/Qt5DesignerComponents/Qt5DesignerComponentsConfigVersion.cmake
%%WEBKIT%%%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
%%QT_BINDIR%%/designer
%%DEBUG%%%%QT_BINDIR%%/designer.debug
%%QT_LIBDIR%%/libQt5Designer.prl
%%QT_LIBDIR%%/libQt5Designer.so
%%QT_LIBDIR%%/libQt5Designer.so.5

View File

@ -13,9 +13,6 @@ USE_QT= core gui network sql widgets \
buildtools_build sql-sqlite3_run
USE_LDCONFIG= ${PREFIX}/${QT_LIBDIR_REL}
BUILD_WRKSRC= ${WRKSRC}/src/assistant
INSTALL_WRKSRC= ${WRKSRC}/src/assistant
QT_BINARIES= yes
.include <bsd.port.mk>

View File

@ -1,20 +1,25 @@
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qfilternamedialog_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdbreader_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpengine_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpfiltersettings_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qoptionswidget_p.h
%%QT_INCDIR%%/QtHelp/QCompressedHelpInfo
%%QT_INCDIR%%/QtHelp/QHelpContentItem
%%QT_INCDIR%%/QtHelp/QHelpContentModel
%%QT_INCDIR%%/QtHelp/QHelpContentWidget
%%QT_INCDIR%%/QtHelp/QHelpEngine
%%QT_INCDIR%%/QtHelp/QHelpEngineCore
%%QT_INCDIR%%/QtHelp/QHelpGlobal
%%QT_INCDIR%%/QtHelp/QHelpFilterData
%%QT_INCDIR%%/QtHelp/QHelpFilterEngine
%%QT_INCDIR%%/QtHelp/QHelpFilterSettingsWidget
%%QT_INCDIR%%/QtHelp/QHelpGlobal
%%QT_INCDIR%%/QtHelp/QHelpIndexModel
%%QT_INCDIR%%/QtHelp/QHelpIndexWidget
%%QT_INCDIR%%/QtHelp/QHelpLink
%%QT_INCDIR%%/QtHelp/QHelpSearchEngine
%%QT_INCDIR%%/QtHelp/QHelpSearchQuery
%%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget
@ -30,7 +35,9 @@
%%QT_INCDIR%%/QtHelp/qhelpenginecore.h
%%QT_INCDIR%%/QtHelp/qhelpfilterdata.h
%%QT_INCDIR%%/QtHelp/qhelpfilterengine.h
%%QT_INCDIR%%/QtHelp/qhelpfiltersettingswidget.h
%%QT_INCDIR%%/QtHelp/qhelpindexwidget.h
%%QT_INCDIR%%/QtHelp/qhelplink.h
%%QT_INCDIR%%/QtHelp/qhelpsearchengine.h
%%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h
%%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h
@ -45,7 +52,9 @@
%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%.debug
%%QT_BINDIR%%/qcollectiongenerator
%%DEBUG%%%%QT_BINDIR%%/qcollectiongenerator.debug
%%QT_BINDIR%%/qhelpgenerator
%%DEBUG%%%%QT_BINDIR%%/qhelpgenerator.debug
%%QT_MKSPECDIR%%/modules/qt_lib_help.pri
%%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
libdata/pkgconfig/Qt5Help.pc

View File

@ -1,4 +1,5 @@
%%QT_BINDIR%%/linguist
%%DEBUG%%%%QT_BINDIR%%/linguist.debug
share/pixmaps/linguist-qt5.png
%%QT_DATADIR%%/phrasebooks/danish.qph
%%QT_DATADIR%%/phrasebooks/dutch.qph

View File

@ -2,10 +2,16 @@
%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
%%QT_BINDIR%%/lconvert
%%DEBUG%%%%QT_BINDIR%%/lconvert.debug
%%QT_BINDIR%%/lprodump
%%DEBUG%%%%QT_BINDIR%%/lprodump.debug
%%QT_BINDIR%%/lrelease
%%QT_BINDIR%%/lrelease-pro
%%DEBUG%%%%QT_BINDIR%%/lrelease-pro.debug
%%DEBUG%%%%QT_BINDIR%%/lrelease.debug
%%QT_BINDIR%%/lupdate
%%QT_BINDIR%%/lupdate-pro
%%DEBUG%%%%QT_BINDIR%%/lupdate-pro.debug
%%DEBUG%%%%QT_BINDIR%%/lupdate.debug
man/man1/lrelease.1.gz
man/man1/lupdate.1.gz

View File

@ -4,6 +4,7 @@
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qcache3q_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecategory_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecontactdetail_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeocodemodel_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomaneuver_p.h
@ -12,6 +13,7 @@
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitembase_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemgroup_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemtransitionmanager_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemutils_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemview_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapparameter_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapquickitem_p.h
@ -31,9 +33,12 @@
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceimagemodel_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceuser_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeratings_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativereviewmodel_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeroutemapitem_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesearchmodelbase_p.h
@ -76,6 +81,7 @@
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanager_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanagerengine_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoserviceprovider_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeosimplify_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p_p.h
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmaplabs_p.h
@ -235,9 +241,9 @@
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfo_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfosource_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationutils_p.h

View File

@ -1 +1,2 @@
%%QT_BINDIR%%/qdbus
%%DEBUG%%%%QT_BINDIR%%/qdbus.debug

View File

@ -1,2 +1,3 @@
%%QT_BINDIR%%/qdbusviewer
%%DEBUG%%%%QT_BINDIR%%/qdbusviewer.debug
share/pixmaps/qdbusviewer-qt5.png

View File

@ -17,10 +17,6 @@ USE_QT= core declarative buildtools_build qdoc-data_run
BUILD_WRKSRC= ${WRKSRC}/src/${PORTNAME}
INSTALL_WRKSRC= ${BUILD_WRKSRC}
PLIST_FILES= ${QT_BINDIR}/qdoc \
${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfig.cmake \
${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
CONFIGURE_ENV= LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}
QT_BINARIES= yes

4
devel/qt5-qdoc/pkg-plist Normal file
View File

@ -0,0 +1,4 @@
%%QT_BINDIR%%/qdoc
%%DEBUG%%%%QT_BINDIR%%/qdoc.debug
%%QT_CMAKEDIR%%/Qt5DocTools/Qt5DocToolsConfig.cmake
%%QT_CMAKEDIR%%/Qt5DocTools/Qt5DocToolsConfigVersion.cmake

View File

@ -90,6 +90,8 @@
%%QT_MKSPECDIR%%/devices/freebsd-generic-clang/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qmake.conf
%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/integrity-armv8-SA8155P/qmake.conf
%%QT_MKSPECDIR%%/devices/integrity-armv8-SA8155P/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qmake.conf
%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qplatformdefs.h
%%QT_MKSPECDIR%%/devices/integrity-armv8-msm8996au/qmake.conf
@ -229,6 +231,7 @@
%%QT_MKSPECDIR%%/features/mac/sdk.prf
%%QT_MKSPECDIR%%/features/mac/toolchain.prf
%%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf
%%QT_MKSPECDIR%%/features/metatypes.prf
%%QT_MKSPECDIR%%/features/moc.prf
%%QT_MKSPECDIR%%/features/no_debug_info.prf
%%QT_MKSPECDIR%%/features/plugin_bundle.prf
@ -408,7 +411,7 @@
%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app
%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.dSYM.in
%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib
%%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.xib
%%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.storyboard
%%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf
%%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf
%%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h

View File

@ -64,6 +64,7 @@
%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfig.cmake
%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfigVersion.cmake
%%QT_BINDIR%%/repc
%%DEBUG%%%%QT_BINDIR%%/repc.debug
%%QT_LIBDIR%%/libQt5RemoteObjects.prl
%%QT_LIBDIR%%/libQt5RemoteObjects.so
%%QT_LIBDIR%%/libQt5RemoteObjects.so.5

View File

@ -45,6 +45,7 @@
%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigVersion.cmake
%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlMacros.cmake
%%QT_BINDIR%%/qscxmlc
%%DEBUG%%%%QT_BINDIR%%/qscxmlc.debug
%%QT_LIBDIR%%/libQt5Scxml.prl
%%QT_LIBDIR%%/libQt5Scxml.so
%%QT_LIBDIR%%/libQt5Scxml.so.5

View File

@ -11,25 +11,25 @@
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkvalgrind_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qjunittestlogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qsignaldumper_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qteamcitylogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtaptestlogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qteamcitylogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelementattribute_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesthelpers_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestjunitstreamer_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestutil_macos_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestxunitstreamer_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qttestlib-config_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxunittestlogger_p.h
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/valgrind_p.h
%%QT_INCDIR%%/QtTest/QAbstractItemModelTester
%%QT_INCDIR%%/QtTest/QEventSizeOfChecker

View File

@ -1,81 +1,81 @@
TIMESTAMP = 1586029185
SHA256 (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674
SIZE (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 81576496
SHA256 (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9
SIZE (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = 265976
SHA256 (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76
SIZE (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 105844
SHA256 (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a
SIZE (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 49865752
SHA256 (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7
SIZE (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = 4250508
SHA256 (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28
SIZE (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = 2804940
SHA256 (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20
SIZE (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 5190800
SHA256 (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650
SIZE (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = 21305980
SHA256 (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b
SIZE (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5736088
SHA256 (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03
SIZE (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = 386940
SHA256 (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f
SIZE (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 14040880
SHA256 (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c
SIZE (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 1805208
SHA256 (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc
SIZE (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = 6120852
SHA256 (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978
SIZE (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 82572
SHA256 (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5
SIZE (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = 69360
SHA256 (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9
SIZE (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 3793964
SHA256 (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e
SIZE (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 141424
SHA256 (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851
SIZE (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 208664
SHA256 (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461
SIZE (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = 5981560
SHA256 (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560
SIZE (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = 8153752
SHA256 (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6
SIZE (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = 376740
SHA256 (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe
SIZE (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = 2654528
SHA256 (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790
SIZE (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 433268
SHA256 (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61
SIZE (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = 2050616
SHA256 (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91
SIZE (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 349808
SHA256 (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21
SIZE (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = 316492
SHA256 (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da
SIZE (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 101100
SHA256 (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1
SIZE (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = 1880100
SHA256 (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5
SIZE (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 8815020
SHA256 (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6
SIZE (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 1348684
SHA256 (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7
SIZE (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 10957372
SHA256 (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a
SIZE (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = 544532
SHA256 (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874
SIZE (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 202592
SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947
SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568
SHA256 (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417
SIZE (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = 74140
SHA256 (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84
SIZE (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = 252820
SHA256 (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b
SIZE (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = 132840
SHA256 (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2
SIZE (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 763632
SHA256 (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a
SIZE (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = 135712
SHA256 (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7
SIZE (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 1404028
TIMESTAMP = 1590590537
SHA256 (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd
SIZE (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 81921676
SHA256 (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51
SIZE (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 267788
SHA256 (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671
SIZE (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = 183492
SHA256 (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
SIZE (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 49931940
SHA256 (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7
SIZE (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 4250568
SHA256 (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd
SIZE (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = 2803792
SHA256 (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3
SIZE (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 5190804
SHA256 (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699
SIZE (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 21493268
SHA256 (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f
SIZE (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 5742500
SHA256 (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a
SIZE (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = 386724
SHA256 (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda
SIZE (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 14040716
SHA256 (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8
SIZE (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 1811092
SHA256 (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f
SIZE (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = 6542152
SHA256 (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833
SIZE (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 82384
SHA256 (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439
SIZE (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 69248
SHA256 (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7
SIZE (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 3796364
SHA256 (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85
SIZE (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 141360
SHA256 (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16
SIZE (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 208560
SHA256 (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee
SIZE (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 5981340
SHA256 (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f
SIZE (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 8164236
SHA256 (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf
SIZE (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 369100
SHA256 (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373
SIZE (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 2654416
SHA256 (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72
SIZE (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 433368
SHA256 (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da
SIZE (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 2050404
SHA256 (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379
SIZE (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = 351232
SHA256 (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67
SIZE (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = 316596
SHA256 (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61
SIZE (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 101240
SHA256 (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d
SIZE (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = 1870588
SHA256 (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437
SIZE (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = 8850752
SHA256 (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe
SIZE (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 1356928
SHA256 (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be
SIZE (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = 10957752
SHA256 (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb
SIZE (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 562408
SHA256 (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f
SIZE (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = 202844
SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432
SHA256 (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15
SIZE (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = 73956
SHA256 (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092
SIZE (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 253616
SHA256 (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660
SIZE (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = 133044
SHA256 (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0
SIZE (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = 763572
SHA256 (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1
SIZE (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = 135648
SHA256 (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507
SIZE (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 1403484

View File

@ -164,6 +164,7 @@
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qframeallocator_p_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qhandle_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qjoint_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qloadgltf_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qlockableobserverinterface_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qmath3d_p.h
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qnode_p.h
@ -224,12 +225,9 @@
%%QT_INCDIR%%/Qt3DCore/QBackendNodeMapperPtr
%%QT_INCDIR%%/Qt3DCore/QComponent
%%QT_INCDIR%%/Qt3DCore/QComponentAddedChange
%%QT_INCDIR%%/Qt3DCore/QComponentAddedChangePtr
%%QT_INCDIR%%/Qt3DCore/QComponentRemovedChange
%%QT_INCDIR%%/Qt3DCore/QComponentRemovedChangePtr
%%QT_INCDIR%%/Qt3DCore/QComponentVector
%%QT_INCDIR%%/Qt3DCore/QDynamicPropertyUpdatedChange
%%QT_INCDIR%%/Qt3DCore/QDynamicPropertyUpdatedChangePtr
%%QT_INCDIR%%/Qt3DCore/QEntity
%%QT_INCDIR%%/Qt3DCore/QEntityPtr
%%QT_INCDIR%%/Qt3DCore/QJoint
@ -240,33 +238,23 @@
%%QT_INCDIR%%/Qt3DCore/QNodeCreatedChangeBase
%%QT_INCDIR%%/Qt3DCore/QNodeCreatedChangeBasePtr
%%QT_INCDIR%%/Qt3DCore/QNodeDestroyedChange
%%QT_INCDIR%%/Qt3DCore/QNodeDestroyedChangePtr
%%QT_INCDIR%%/Qt3DCore/QNodeId
%%QT_INCDIR%%/Qt3DCore/QNodeIdTypePair
%%QT_INCDIR%%/Qt3DCore/QNodePtr
%%QT_INCDIR%%/Qt3DCore/QNodeVector
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeAddedChange
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeAddedChangePtr
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeRemovedChange
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeRemovedChangePtr
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChange
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangeBase
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangeBasePtr
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangePtr
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChange
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangeBase
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangeBasePtr
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangePtr
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChange
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangeBase
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangeBasePtr
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangePtr
%%QT_INCDIR%%/Qt3DCore/QSceneChange
%%QT_INCDIR%%/Qt3DCore/QSceneChangePtr
%%QT_INCDIR%%/Qt3DCore/QSkeleton
%%QT_INCDIR%%/Qt3DCore/QSkeletonLoader
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyUpdatedChangeBase
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyUpdatedChangeBasePtr
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyValueAddedChangeBase
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyValueRemovedChangeBase
%%QT_INCDIR%%/Qt3DCore/QTransform
@ -381,6 +369,7 @@
%%QT_INCDIR%%/Qt3DExtras/QSpriteSheetItem
%%QT_INCDIR%%/Qt3DExtras/QText2DEntity
%%QT_INCDIR%%/Qt3DExtras/QTextureMaterial
%%QT_INCDIR%%/Qt3DExtras/QTexturedMetalRoughMaterial
%%QT_INCDIR%%/Qt3DExtras/QTorusGeometry
%%QT_INCDIR%%/Qt3DExtras/QTorusMesh
%%QT_INCDIR%%/Qt3DExtras/Qt3DExtras
@ -679,6 +668,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractpickingjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractrenderer_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/aligned_malloc_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/apishadermanager_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/armature_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attachmentpack_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attribute_p.h
@ -696,9 +686,9 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameralens_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameraselectornode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/clearbuffers_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/commandexecuter_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/computecommand_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/computefilteredboundingvolumejob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/debugoverlay_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/dispatchcompute_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/effect_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entity_p.h
@ -707,7 +697,6 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entityvisitor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/environmentlight_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/expandboundingvolumejob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filtercompatibletechniquejob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterentitybycomponentjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterkey_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterlayerentityjob_p.h
@ -715,7 +704,6 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framecleanupjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphnode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphvisitor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frameprofiler_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumculling_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumcullingjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/genericlambdajob_p.h
@ -723,23 +711,8 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometry_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderer_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderermanager_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glbuffer_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glfence_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexture_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexturemanager_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltfskeletonloader_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicscontext_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes2_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_1_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_2_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl2_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl3_2_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl3_3_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl4_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperinterface_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/handle_types_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/imagesubmissioncontext_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/job_common_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/joint_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/layer_p.h
@ -754,7 +727,6 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/loadskeletonjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/managers_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/material_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/materialparametergathererjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/memorybarrier_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodefunctor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodemanagers_p.h
@ -762,7 +734,6 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nopicking_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/objectpicker_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/offscreensurfacehelper_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/openglvertexarrayobject_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameter_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameterpack_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/pickboundingvolumejob_p.h
@ -795,6 +766,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcolormask_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcomputecommand_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcullface_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdebugoverlay_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdepthrange_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdepthtest_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdirectionallight_p.h
@ -810,7 +782,6 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryloaderinterface_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryrenderer_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgraphicsapifilter_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgraphicsutils_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayer_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayerfilter_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlevelofdetail_p.h
@ -833,7 +804,10 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qray3d_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qraycastingservice_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderaspect_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendercapabilities_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendercapture_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendererplugin_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendererpluginfactory_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpass_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpassfilter_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderplugin_p.h
@ -857,7 +831,15 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qscissortest_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsetfence_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderdata_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderformat_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadergenerator_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadergraph_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadergraphloader_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderimage_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderlanguage_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadernode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadernodeport_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadernodesloader_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogram_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogrambuilder_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsortpolicy_p.h
@ -881,15 +863,10 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qwaitfence_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycaster_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycastingjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderbuffer_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendercapture_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendercommand_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderer_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderercache_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderlogging_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderpass_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderpassfilternode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderqueue_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendersettings_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderstatenode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderstates_p.h
@ -899,26 +876,17 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendertargetoutput_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendertargetselectornode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderthread_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderview_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewbuilder_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewcommandbuilderjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewcommandupdaterjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewinitializerjob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewjobutils_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/resourceaccessor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scene_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scenemanager_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/segmentsvisitor_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendbuffercapturejob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendrendercapturejob_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/setfence_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shader_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderbuilder_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadercache_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderdata_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderimage_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderparameterpack_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadervariables_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/skeleton_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/skeletondata_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sortpolicy_p.h
@ -927,14 +895,13 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/statesetnode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/statevariant_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/stringtoint_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/submissioncontext_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/subtreeenabler_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/technique_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquefilternode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquemanager_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texture_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texturedatamanager_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/textureimage_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texturesubmissioncontext_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/transform_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/triangleboundingvolume_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesextractor_p.h
@ -951,6 +918,7 @@
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/viewportnode_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/visitorutils_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/vsyncframeadvanceservice_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/vulkaninstance_p.h
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/waitfence_p.h
%%QT_INCDIR%%/Qt3DRender/FunctorType
%%QT_INCDIR%%/Qt3DRender/ParameterList
@ -980,6 +948,7 @@
%%QT_INCDIR%%/Qt3DRender/QColorMask
%%QT_INCDIR%%/Qt3DRender/QComputeCommand
%%QT_INCDIR%%/Qt3DRender/QCullFace
%%QT_INCDIR%%/Qt3DRender/QDebugOverlay
%%QT_INCDIR%%/Qt3DRender/QDepthRange
%%QT_INCDIR%%/Qt3DRender/QDepthTest
%%QT_INCDIR%%/Qt3DRender/QDirectionalLight
@ -1032,6 +1001,7 @@
%%QT_INCDIR%%/Qt3DRender/QRayCaster
%%QT_INCDIR%%/Qt3DRender/QRayCasterHit
%%QT_INCDIR%%/Qt3DRender/QRenderAspect
%%QT_INCDIR%%/Qt3DRender/QRenderCapabilities
%%QT_INCDIR%%/Qt3DRender/QRenderCapture
%%QT_INCDIR%%/Qt3DRender/QRenderCaptureReply
%%QT_INCDIR%%/Qt3DRender/QRenderPass
@ -1101,6 +1071,7 @@
%%QT_INCDIR%%/Qt3DRender/qcolormask.h
%%QT_INCDIR%%/Qt3DRender/qcomputecommand.h
%%QT_INCDIR%%/Qt3DRender/qcullface.h
%%QT_INCDIR%%/Qt3DRender/qdebugoverlay.h
%%QT_INCDIR%%/Qt3DRender/qdepthrange.h
%%QT_INCDIR%%/Qt3DRender/qdepthtest.h
%%QT_INCDIR%%/Qt3DRender/qdirectionallight.h
@ -1145,7 +1116,9 @@
%%QT_INCDIR%%/Qt3DRender/qrastermode.h
%%QT_INCDIR%%/Qt3DRender/qraycaster.h
%%QT_INCDIR%%/Qt3DRender/qraycasterhit.h
%%QT_INCDIR%%/Qt3DRender/qrenderapi.h
%%QT_INCDIR%%/Qt3DRender/qrenderaspect.h
%%QT_INCDIR%%/Qt3DRender/qrendercapabilities.h
%%QT_INCDIR%%/Qt3DRender/qrendercapture.h
%%QT_INCDIR%%/Qt3DRender/qrenderpass.h
%%QT_INCDIR%%/Qt3DRender/qrenderpassfilter.h
@ -1217,8 +1190,10 @@
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneImportPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_OpenGLRendererPlugin.cmake
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_Scene2DPlugin.cmake
%%QT_BINDIR%%/qgltf
%%DEBUG%%%%QT_BINDIR%%/qgltf.debug
%%QT_LIBDIR%%/libQt53DAnimation.prl
%%QT_LIBDIR%%/libQt53DAnimation.so
%%QT_LIBDIR%%/libQt53DAnimation.so.5
@ -1319,6 +1294,8 @@
%%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libdefaultgeometryloader.so.debug
%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so
%%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so.debug
%%QT_PLUGINDIR%%/renderers/libopenglrenderer.so
%%DEBUG%%%%QT_PLUGINDIR%%/renderers/libopenglrenderer.so.debug
%%QT_PLUGINDIR%%/renderplugins/libscene2d.so
%%DEBUG%%%%QT_PLUGINDIR%%/renderplugins/libscene2d.so.debug
%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so

View File

@ -1 +1,2 @@
%%QT_BINDIR%%/pixeltool
%%DEBUG%%%%QT_BINDIR%%/pixeltool.debug

View File

@ -5,6 +5,7 @@
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-tablet-unstable-v2.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h
@ -50,7 +51,10 @@
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandshmwindow_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsubsurface_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsurface_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtabletv2_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkaninstance_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkanwindow_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h
@ -58,6 +62,7 @@
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-tablet-unstable-v2-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h
@ -305,6 +310,7 @@
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_VulkanServerBufferIntegrationPlugin.cmake
%%QT_BINDIR%%/qtwaylandscanner
%%DEBUG%%%%QT_BINDIR%%/qtwaylandscanner.debug
%%QT_LIBDIR%%/libQt5WaylandClient.prl
%%QT_LIBDIR%%/libQt5WaylandClient.so
%%QT_LIBDIR%%/libQt5WaylandClient.so.5
@ -345,24 +351,24 @@
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so.debug
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so.debug
%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so.debug
%%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1586029328
SHA256 (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
SIZE (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = 549205340
TIMESTAMP = 1590590417
SHA256 (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3
SIZE (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 592401236

View File

@ -101,9 +101,29 @@
%%QT_EXAMPLEDIR%%/activeqt/wrapper/wrapperax.rc
%%QT_EXAMPLEDIR%%/aggregate/examples.pro
%%QT_EXAMPLEDIR%%/androidextras/androidextras.pro
%%QT_EXAMPLEDIR%%/androidextras/notification/android-sources/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/notification/android-sources/res/drawable/icon.png
%%QT_EXAMPLEDIR%%/androidextras/notification/android-sources/src/org/qtproject/example/notification/NotificationClient.java
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-hdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-ldpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-mdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-xhdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-xxhdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-xxxhdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/src/org/qtproject/example/jnimessenger/JniMessenger.java
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/doc/src/qtandroidextras-example-jnimessenger.qdoc
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/jnimessenger.cpp
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/jnimessenger.h
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/jnimessenger.pro
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.cpp
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.qml
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/qml.qrc
%%QT_EXAMPLEDIR%%/androidextras/notification/android/AndroidManifest.xml
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-hdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-ldpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-mdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-xhdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-xxhdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-xxxhdpi/icon.png
%%QT_EXAMPLEDIR%%/androidextras/notification/android/src/org/qtproject/example/notification/NotificationClient.java
%%QT_EXAMPLEDIR%%/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc
%%QT_EXAMPLEDIR%%/androidextras/notification/images/happy.png
%%QT_EXAMPLEDIR%%/androidextras/notification/images/sad.png
@ -1494,6 +1514,7 @@
%%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint.pro
%%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint_pt.ts
%%QT_EXAMPLEDIR%%/location/geojson_viewer/GeoJsonDelegate.qml
%%QT_EXAMPLEDIR%%/location/geojson_viewer/GeoJsonDelegateMapObject.qml
%%QT_EXAMPLEDIR%%/location/geojson_viewer/data/01-point.json
%%QT_EXAMPLEDIR%%/location/geojson_viewer/data/02-linestring.json
%%QT_EXAMPLEDIR%%/location/geojson_viewer/data/03-multipoint.json
@ -2056,15 +2077,6 @@
%%QT_EXAMPLEDIR%%/multimediawidgets/videowidget/videoplayer.h
%%QT_EXAMPLEDIR%%/multimediawidgets/videowidget/videowidget.pro
%%QT_EXAMPLEDIR%%/network/README
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor.cpp
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor.h
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor.pro
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor_240_320.ui
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor_640_480.ui
%%QT_EXAMPLEDIR%%/network/bearermonitor/main.cpp
%%QT_EXAMPLEDIR%%/network/bearermonitor/sessionwidget.cpp
%%QT_EXAMPLEDIR%%/network/bearermonitor/sessionwidget.h
%%QT_EXAMPLEDIR%%/network/bearermonitor/sessionwidget.ui
%%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingclient.cpp
%%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingclient.h
%%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingfortuneclient.pro
@ -2486,6 +2498,67 @@
%%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/mainwindow.cpp
%%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/mainwindow.h
%%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
%%QT_EXAMPLEDIR%%/pdf/multipage/main.cpp
%%QT_EXAMPLEDIR%%/pdf/multipage/multipage.pro
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/document-open.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/edit-clear.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/edit-copy.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/edit-select-all.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-down-search.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-next-view-page.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-previous-view-page.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-up-search.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/rotate-left.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/rotate-right.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/test.pdf
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-fit-best.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-fit-width.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-in.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-original.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-out.svg
%%QT_EXAMPLEDIR%%/pdf/multipage/viewer.qml
%%QT_EXAMPLEDIR%%/pdf/multipage/viewer.qrc
%%QT_EXAMPLEDIR%%/pdf/pdf.pro
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/main.cpp
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/pdfviewer.pro
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/document-open.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-clear.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-copy.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-select-all.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-down-search.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-next-view-page.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-previous-view-page.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-up-search.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/rotate-left.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/rotate-right.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/test.pdf
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-fit-best.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-fit-width.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-in.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-original.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-out.svg
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/viewer.qml
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/viewer.qrc
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/busy.png
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/fileopen.png
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-next-24.png
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-previous-24.png
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-in-24.png
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-in-32.png
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-out-24.png
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-out-32.png
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/main.cpp
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.cpp
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.h
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.ui
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pageselector.cpp
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pageselector.h
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pdfviewer.pro
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/resources.qrc
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.cpp
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.h
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfwidgets.pro
%%QT_EXAMPLEDIR%%/positioning/geoflickr/doc/images/qml-flickr-1.jpg
%%QT_EXAMPLEDIR%%/positioning/geoflickr/doc/src/geoflickr.qdoc
%%QT_EXAMPLEDIR%%/positioning/geoflickr/flickr-90.qml
@ -2623,8 +2696,11 @@
%%QT_EXAMPLEDIR%%/qml/dynamicscene/content/itemCreation.js
%%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/images/qml-dynamicscene-example.png
%%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/src/dynamicscene.qdoc
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.pro
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qml
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qmlproject
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qrc
%%QT_EXAMPLEDIR%%/qml/dynamicscene/main.cpp
%%QT_EXAMPLEDIR%%/qml/locale/locale.qml
%%QT_EXAMPLEDIR%%/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc
%%QT_EXAMPLEDIR%%/qml/networkaccessmanagerfactory/main.cpp
@ -2638,8 +2714,11 @@
%%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_en.ts
%%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_en_AU.ts
%%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_fr.ts
%%QT_EXAMPLEDIR%%/qml/qml-i18n/main.cpp
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.pro
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qml
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qmlproject
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qrc
%%QT_EXAMPLEDIR%%/qml/qml.pro
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/doc/images/qml-plugins-example.png
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc
@ -2653,6 +2732,8 @@
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/plugins.qml
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/plugins.qmlproject
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/qmlextensionplugins.pro
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/timemodel.cpp
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/timemodel.h
%%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/adding.pro
%%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/adding.qrc
%%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/example.qml
@ -2783,7 +2864,6 @@
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qml
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qrc
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.cpp
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp
@ -3304,6 +3384,7 @@
%%QT_EXAMPLEDIR%%/quick/animation/basics/images/star.png
%%QT_EXAMPLEDIR%%/quick/animation/basics/images/sun.png
%%QT_EXAMPLEDIR%%/quick/animation/basics/property-animation.qml
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/FocusRect.qml
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/SideRect.qml
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/behavior-example.qml
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/tvtennis.qml
@ -3354,8 +3435,11 @@
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/content/back.png
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/doc/images/qml-flipable-example.png
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/doc/src/flipable.qdoc
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.pro
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qml
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qmlproject
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qrc
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/main.cpp
%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_1.png
%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_2.png
%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/moon.png
@ -3381,15 +3465,21 @@
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/ScrollBar.qml
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/doc/src/scrollbar.qdoc
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/main.cpp
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/main.qml
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/pics/niagara_falls.jpg
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.pro
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.qmlproject
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.qrc
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/SearchBox.qml
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/clear.png
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/lineedit-bg-focus.png
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/lineedit-bg.png
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/main.cpp
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/main.qml
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.pro
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.qmlproject
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.qrc
%%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/Switch.qml
%%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/background.png
%%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/background.svg
@ -3400,14 +3490,20 @@
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/Spinner.qml
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/spinner-bg.png
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/spinner-select.png
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/main.cpp
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/main.qml
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.pro
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.qmlproject
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.qrc
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/TabWidget.qml
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/images/tab.png
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/src/tabwidget.qdoc
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/main.cpp
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/main.qml
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.pro
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.qmlproject
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.qrc
%%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.pro
%%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.qml
%%QT_EXAMPLEDIR%%/quick/delegatechooser/main.cpp
@ -3422,6 +3518,7 @@
%%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DragTile.qml
%%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DropTile.qml
%%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/tiles.qml
%%QT_EXAMPLEDIR%%/quick/draganddrop/views/Icon.qml
%%QT_EXAMPLEDIR%%/quick/draganddrop/views/gridview.qml
%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/TextBox.qml
%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/embeddedinwidgets.pro
@ -3743,6 +3840,9 @@
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/+qsb/checker.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/checker.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/checker_rhi.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/images/graph-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/src/graph.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/graph.cpp
@ -3827,6 +3927,8 @@
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerialitem.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerialitem.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/images/textureinthread-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/src/textureinthread.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/error.qml
@ -3847,10 +3949,29 @@
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/doc/src/twotextureproviders.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/+qsb/checker.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/+qsb/xorblender.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/+qsb/xorblender.vert
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/checker.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/checker_rhi.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender.vert
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender_rhi.frag
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender_rhi.vert
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/doc/images/vulkantextureimport-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/doc/src/vulkantextureimport.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/main.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/main.qml
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/squircle.frag.spv
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/squircle.vert.spv
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.cpp
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.h
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.pro
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.qrc
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/images/vulkanunderqml-example.jpg
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/src/vulkanunderqml.qdoc
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/main.cpp
@ -3905,6 +4026,7 @@
%%QT_EXAMPLEDIR%%/quick/shapes/content/item14.qml
%%QT_EXAMPLEDIR%%/quick/shapes/content/item15.qml
%%QT_EXAMPLEDIR%%/quick/shapes/content/item17.qml
%%QT_EXAMPLEDIR%%/quick/shapes/content/item18.qml
%%QT_EXAMPLEDIR%%/quick/shapes/content/item2.qml
%%QT_EXAMPLEDIR%%/quick/shapes/content/item3.qml
%%QT_EXAMPLEDIR%%/quick/shapes/content/item4.qml
@ -4041,36 +4163,57 @@
%%QT_EXAMPLEDIR%%/quick/touchinteraction/touchinteraction.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.pro
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qmlproject
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/main.cpp
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.pro
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qmlproject
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/main.cpp
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.pro
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qmlproject
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/main.cpp
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.pro
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qmlproject
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/main.cpp
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/Cell.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial1.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial2.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial3.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/Block.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/Button.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/main.cpp
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.pro
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.qmlproject
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/Block.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/Button.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/main.cpp
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame.js
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.pro
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.qmlproject
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Block.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Button.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Dialog.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/main.cpp
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame.js
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.pro
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.qmlproject
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/BoomBlock.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/Button.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/Dialog.qml
@ -4079,8 +4222,11 @@
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/score_data.xml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/scores.php
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/main.cpp
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame.qml
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.pro
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qmlproject
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/background.jpg
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/blueStar.png
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/blueStone.png
@ -4088,11 +4234,15 @@
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/greenStone.png
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/redStar.png
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/redStone.png
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/shared.qrc
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/star.png
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/yellowStone.png
%%QT_EXAMPLEDIR%%/quick/tutorials/tutorials.pro
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/delegatemodel.qmlproject
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/dragselection.qml
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/flipable.pro
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/flipable.qrc
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/main.cpp
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/slideshow.qml
%%QT_EXAMPLEDIR%%/quick/views/doc/images/qml-modelviews-example.png
%%QT_EXAMPLEDIR%%/quick/views/doc/src/views.qdoc
@ -5739,21 +5889,6 @@
%%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/default.svg
%%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/v-slider-handle.svg
%%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/main.cpp
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bearercloud.cpp
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bearercloud.h
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bearercloud.pro
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bluetooth.svg
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/cell.svg
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/cloud.cpp
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/cloud.h
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/gprs.svg
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/icons.qrc
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/lan.svg
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/main.cpp
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/umts.svg
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/unknown.svg
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/wlan.svg
%%QT_EXAMPLEDIR%%/svg/network/network.pro
%%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/bubbles.svg
%%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/designer.png
%%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/framebufferobject.pro
@ -6709,6 +6844,7 @@
%%QT_EXAMPLEDIR%%/widgets/doc/src/fontsampler.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/fridgemagnets.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/frozencolumn.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/gallery.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/gradients.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-anchorlayout.qdoc
%%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-flowlayout.qdoc
@ -6839,6 +6975,10 @@
%%QT_EXAMPLEDIR%%/widgets/effects/fademessage/fademessage.pro
%%QT_EXAMPLEDIR%%/widgets/effects/fademessage/fademessage.qrc
%%QT_EXAMPLEDIR%%/widgets/effects/fademessage/main.cpp
%%QT_EXAMPLEDIR%%/widgets/gallery/gallery.pro
%%QT_EXAMPLEDIR%%/widgets/gallery/main.cpp
%%QT_EXAMPLEDIR%%/widgets/gallery/widgetgallery.cpp
%%QT_EXAMPLEDIR%%/widgets/gallery/widgetgallery.h
%%QT_EXAMPLEDIR%%/widgets/gestures/gestures.pro
%%QT_EXAMPLEDIR%%/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc
%%QT_EXAMPLEDIR%%/widgets/gestures/imagegestures/imagegestures.pro
@ -8064,17 +8204,6 @@
%%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.cpp
%%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.h
%%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.pro
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/doc/images/saxbookmarks-example.png
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/doc/src/saxbookmarks.qdoc
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/jennifer.xbel
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/main.cpp
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/mainwindow.cpp
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/mainwindow.h
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/saxbookmarks.pro
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelgenerator.cpp
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelgenerator.h
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelhandler.cpp
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelhandler.h
%%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-filemenu.png
%%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-helpmenu.png
%%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-screenshot.png

View File

@ -31,10 +31,10 @@
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaceoutput_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaces_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qwavedecoder_p.h
%%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo
%%QT_INCDIR%%/QtMultimedia/QAbstractAudioInput

View File

@ -22,6 +22,13 @@ INSTALL_WRKSRC= ${BUILD_WRKSRC}
QT_DEFINES= OPENSSL SSL
QT_CONFIG= openssl
.include <bsd.port.pre.mk>
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == "base"
# 1200085 339270 October 19, 2018 12.0-STABLE after updating OpenSSL to version 1.1.1.
BROKEN= Qt5 requires Openssl 1.1.1, upgrade to FreeBSD 12.x/13.x or add DEFAULT_VERSIONS+=ssl=[openssl|libressl*] to /etc/make.conf
.endif
post-patch:
@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp
@ -44,4 +51,4 @@ post-install:
${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
${MAKE_ARGS} ${INSTALL_TARGET}
.include <bsd.port.mk>
.include <bsd.port.post.mk>

View File

@ -0,0 +1,18 @@
--- src/network/ssl/qsslcontext_openssl.cpp.orig 2020-05-17 21:00:32 UTC
+++ src/network/ssl/qsslcontext_openssl.cpp
@@ -696,6 +696,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
}
#endif // ocsp
+#if !defined(LIBRESSL_VERSION_NUMBER)
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
if (cctx) {
q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
@@ -746,6 +747,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
sslContext->errorCode = QSslError::UnspecifiedError;
}
+#endif
}
QT_END_NAMESPACE

View File

@ -1,11 +0,0 @@
--- src/network/ssl/qsslcontext_openssl.cpp.orig 2019-10-01 08:05:51 UTC
+++ src/network/ssl/qsslcontext_openssl.cpp
@@ -265,7 +265,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
}
#endif // ocsp
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
if (cctx) {

View File

@ -1,7 +1,7 @@
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2019-10-25 09:16:48.000000000 +0200
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp 2019-11-01 20:03:08.715014000 +0100
@@ -152,6 +152,14 @@
DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig 2020-05-05 11:59:27 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
@@ -147,6 +147,14 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *
DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
+#ifdef LIBRESSL_VERSION_NUMBER
@ -15,7 +15,7 @@
DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
@@ -159,6 +167,7 @@
@@ -154,6 +162,7 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
@ -23,28 +23,23 @@
DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
#ifdef TLS1_3_VERSION
@@ -443,7 +452,7 @@
@@ -351,12 +360,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
@@ -839,8 +848,8 @@
#endif
#if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
// first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
+ libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
+ libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
if (libcrypto->load() && libssl->load()) {
// libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
return pair;
@@ -980,12 +989,21 @@
RESOLVEFUNC(EVP_CIPHER_CTX_reset)
DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
+#endif
DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
@@ -834,12 +845,21 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(EVP_PKEY_up_ref)
RESOLVEFUNC(EVP_PKEY_base_id)
RESOLVEFUNC(RSA_bits)
+#ifdef LIBRESSL_VERSION_NUMBER
@ -64,8 +59,8 @@
+#endif
RESOLVEFUNC(DH_get0_pqg)
RESOLVEFUNC(SSL_CTX_set_options)
#ifdef TLS1_3_VERSION
@@ -1024,7 +1042,9 @@
@@ -881,7 +901,9 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
RESOLVEFUNC(DH_bits)
@ -75,12 +70,18 @@
#if QT_CONFIG(dtls)
RESOLVEFUNC(DTLSv1_listen)
@@ -1280,7 +1300,7 @@
@@ -1041,12 +1063,14 @@ bool q_resolveOpenSslSymbols()
RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
RESOLVEFUNC(SSL_CTX_get_cert_store);
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
+#if !defined(LIBRESSL_VERSION_NUMBER)
RESOLVEFUNC(SSL_CONF_CTX_new);
RESOLVEFUNC(SSL_CONF_CTX_free);
RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
RESOLVEFUNC(SSL_CONF_CTX_set_flags);
RESOLVEFUNC(SSL_CONF_CTX_finish);
RESOLVEFUNC(SSL_CONF_cmd);
+#endif
RESOLVEFUNC(SSL_accept)
RESOLVEFUNC(SSL_clear)
RESOLVEFUNC(SSL_connect)

View File

@ -1,8 +1,23 @@
--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig 2019-10-01 07:47:24 UTC
+++ src/network/ssl/qsslsocket_openssl11_symbols_p.h
@@ -77,20 +77,49 @@
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2020-05-05 11:59:27 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -72,6 +72,14 @@
#include "qsslsocket_openssl_p.h"
#include <QtCore/qglobal.h>
const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+# define TLS1_2_VERSION 0x0303
+# define TLS_MAX_VERSION TLS1_2_VERSION
+# define TLS_ANY_VERSION 0x10000
+# define DTLS1_2_VERSION 0xFEFD
+# define DTLS_MAX_VERSION DTLS1_2_VERSION
+#endif
+
#if QT_CONFIG(ocsp)
#include "qocsp_p.h"
#endif
@@ -225,22 +233,50 @@ QT_BEGIN_NAMESPACE
// content of the header here. Later, can be better sorted/split into groups,
// depending on the functionality.
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
@ -13,7 +28,8 @@
+typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
+#endif
+
+
const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
@ -50,22 +66,32 @@
int q_SSL_session_reused(SSL *a);
unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
@@ -113,12 +142,15 @@
void q_DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
int q_DH_bits(DH *dh);
-# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
+#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
@@ -266,8 +302,13 @@ int q_DH_bits(DH *dh);
# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
| OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
-
+#ifdef LIBRESSL_VERSION_NUMBER
+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
+#else
#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
-
+#endif
#define q_OPENSSL_add_all_algorithms_conf() q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
| OPENSSL_INIT_ADD_ALL_DIGESTS \
| OPENSSL_INIT_LOAD_CONFIG, NULL)
@@ -494,12 +535,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
+#if !defined(LIBRESSL_VERSION_NUMBER)
SSL_CONF_CTX *q_SSL_CONF_CTX_new();
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
+#endif
void q_SSL_free(SSL *a);
STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);

View File

@ -1,11 +0,0 @@
--- src/network/ssl/qsslsocket_openssl.cpp.orig 2019-10-01 08:09:52 UTC
+++ src/network/ssl/qsslsocket_openssl.cpp
@@ -604,7 +604,7 @@ bool QSslSocketBackendPrivate::initSslContext()
q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
}
#endif
-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
// Set the client callback for TLSv1.3 PSK
if (mode == QSslSocket::SslClientMode
&& QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {

View File

@ -1,26 +0,0 @@
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig 2019-10-01 07:47:06 UTC
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
@@ -72,6 +72,14 @@
#include "qsslsocket_openssl_p.h"
#include <QtCore/qglobal.h>
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
+# define TLS1_2_VERSION 0x0303
+# define TLS_MAX_VERSION TLS1_2_VERSION
+# define TLS_ANY_VERSION 0x10000
+# define DTLS1_2_VERSION 0xFEFD
+# define DTLS_MAX_VERSION DTLS1_2_VERSION
+#endif
+
#if QT_CONFIG(ocsp)
#include "qocsp_p.h"
#endif
@@ -372,7 +378,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
SSL_CONF_CTX *q_SSL_CONF_CTX_new();
void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);

View File

@ -80,10 +80,8 @@
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslpresharedkeyauthenticator_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_mac_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl11_symbols_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_opensslpre11_symbols_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_schannel_p.h
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h
@ -130,6 +128,7 @@
%%QT_INCDIR%%/QtNetwork/QNetworkRequest
%%QT_INCDIR%%/QtNetwork/QNetworkSession
%%QT_INCDIR%%/QtNetwork/QOcspResponse
%%QT_INCDIR%%/QtNetwork/QPasswordDigestor
%%QT_INCDIR%%/QtNetwork/QSctpServer
%%QT_INCDIR%%/QtNetwork/QSctpSocket
%%QT_INCDIR%%/QtNetwork/QSsl

View File

@ -11,17 +11,6 @@ COMMENT= Tool for reporting diagnostic information about Qt and its environment
USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools
USE_QT= core gui
PLIST_FILES= ${QT_BINDIR}/qtdiag
# Similarly to x11/qt5-qev, it makes more sense to just run the build system
# from the qtdiag directory. If we run it from the top of the source tree, it
# will look for a lot more dependencies for other tools such as lupdate, which
# we do not really have to depend on.
WRKSRC_SUBDIR= src/${PORTNAME}
QT_BINARIES= yes
post-patch:
${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
.include <bsd.port.mk>

View File

@ -0,0 +1,58 @@
--- src/src.pro.orig 2020-04-12 20:01:59 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
- no-png {
- message("Some graphics-related tools are unavailable without PNG support")
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- pixeltool
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
- }
-}
-
-SUBDIRS += linguist \
- qtattributionsscanner
-
-qtConfig(library) {
- !android|android_app: SUBDIRS += qtplugininfo
-}
-
-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
-QT_FOR_CONFIG += qdoc-private
-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
-
-!android|android_app: SUBDIRS += qtpaths
-
-macos {
- SUBDIRS += macdeployqt
-}
-
-qtHaveModule(dbus): SUBDIRS += qdbus
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \
- pixeltool \
-)
-
-# This is necessary to avoid a race condition between toolchain.prf
-# invocations in a module-by-module cross-build.
-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
- qdoc.depends += qtattributionsscanner
- windeployqt.depends += qtattributionsscanner
- winrtrunner.depends += qtattributionsscanner
- linguist.depends += qtattributionsscanner
-}
+SUBDIRS = qtdiag

View File

@ -0,0 +1,2 @@
%%QT_BINDIR%%/qtdiag
%%DEBUG%%%%QT_BINDIR%%/qtdiag.debug

View File

@ -11,17 +11,6 @@ COMMENT= Command line client to QStandardPaths
USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools
USE_QT= core
PLIST_FILES= ${QT_BINDIR}/qtpaths
# Similarly to x11/qt5-qev, it makes more sense to just run the build system
# from the qtpaths directory. If we run it from the top of the source tree, it
# will look for a lot more dependencies for other tools such as lupdate, which
# we do not really have to depend on.
WRKSRC_SUBDIR= src/${PORTNAME}
QT_BINARIES= yes
post-patch:
${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
.include <bsd.port.mk>

View File

@ -0,0 +1,58 @@
--- src/src.pro.orig 2020-04-12 20:15:00 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
- no-png {
- message("Some graphics-related tools are unavailable without PNG support")
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- pixeltool
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
- }
-}
-
-SUBDIRS += linguist \
- qtattributionsscanner
-
-qtConfig(library) {
- !android|android_app: SUBDIRS += qtplugininfo
-}
-
-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
-QT_FOR_CONFIG += qdoc-private
-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
-
-!android|android_app: SUBDIRS += qtpaths
-
-macos {
- SUBDIRS += macdeployqt
-}
-
-qtHaveModule(dbus): SUBDIRS += qdbus
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \
- pixeltool \
-)
-
-# This is necessary to avoid a race condition between toolchain.prf
-# invocations in a module-by-module cross-build.
-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
- qdoc.depends += qtattributionsscanner
- windeployqt.depends += qtattributionsscanner
- winrtrunner.depends += qtattributionsscanner
- linguist.depends += qtattributionsscanner
-}
+SUBDIRS = qtpaths

View File

@ -0,0 +1,2 @@
%%QT_BINDIR%%/qtpaths
%%DEBUG%%%%QT_BINDIR%%/qtpaths.debug

View File

@ -11,17 +11,6 @@ COMMENT= Qt5 plugin metadata dumper
USES= compiler:c++11-lang qmake:outsource qt-dist:5,tools
USE_QT= core
PLIST_FILES= ${QT_BINDIR}/qtplugininfo
# Similarly to x11/qt5-qev, it makes more sense to just run the build system
# from the qtplugininfo directory. If we run it from the top of the source tree, it
# will look for a lot more dependencies for other tools such as lupdate, which
# we do not really have to depend on.
WRKSRC_SUBDIR= src/${PORTNAME}
QT_BINARIES= yes
post-patch:
${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
.include <bsd.port.mk>

View File

@ -0,0 +1,58 @@
--- src/src.pro.orig 2020-04-12 20:04:17 UTC
+++ src/src.pro
@@ -1,54 +1,3 @@
TEMPLATE = subdirs
-qtHaveModule(widgets) {
- no-png {
- message("Some graphics-related tools are unavailable without PNG support")
- } else {
- QT_FOR_CONFIG += widgets
- qtConfig(pushbutton):qtConfig(toolbutton) {
- SUBDIRS = assistant \
- designer \
- pixeltool
-
- linguist.depends = designer
- }
- qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
- }
-}
-
-SUBDIRS += linguist \
- qtattributionsscanner
-
-qtConfig(library) {
- !android|android_app: SUBDIRS += qtplugininfo
-}
-
-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
-QT_FOR_CONFIG += qdoc-private
-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
-
-!android|android_app: SUBDIRS += qtpaths
-
-macos {
- SUBDIRS += macdeployqt
-}
-
-qtHaveModule(dbus): SUBDIRS += qdbus
-
-win32|winrt:SUBDIRS += windeployqt
-winrt:SUBDIRS += winrtrunner
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
-
-qtNomakeTools( \
- distancefieldgenerator \
- pixeltool \
-)
-
-# This is necessary to avoid a race condition between toolchain.prf
-# invocations in a module-by-module cross-build.
-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
- qdoc.depends += qtattributionsscanner
- windeployqt.depends += qtattributionsscanner
- winrtrunner.depends += qtattributionsscanner
- linguist.depends += qtattributionsscanner
-}
+SUBDIRS = qtplugininfo

View File

@ -0,0 +1,2 @@
%%QT_BINDIR%%/qtplugininfo
%%DEBUG%%%%QT_BINDIR%%/qtplugininfo.debug

View File

@ -1,3 +1,5 @@
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qdom_p.h
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qdomhelpers_p.h
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qtxml-config_p.h
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qxml_p.h
%%QT_INCDIR%%/QtXml/QDomAttr

View File

@ -412,7 +412,9 @@
%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%
%%DEBUG%%%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%.debug
%%QT_BINDIR%%/xmlpatterns
%%DEBUG%%%%QT_BINDIR%%/xmlpatterns.debug
%%QT_BINDIR%%/xmlpatternsvalidator
%%DEBUG%%%%QT_BINDIR%%/xmlpatternsvalidator.debug
%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns.pri
%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns_private.pri
libdata/pkgconfig/Qt5XmlPatterns.pc

View File

@ -18,7 +18,6 @@
PORTNAME= webengine
DISTVERSION= ${QT5_VERSION}
PORTREVISION= 1
CATEGORIES= www
PKGNAMEPREFIX= qt5-
@ -49,7 +48,7 @@ LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \
libwebp.so:graphics/webp
DISTINFO_FILE= ${.CURDIR}/distinfo
QT5_VERSION= 5.14.2
QT5_VERSION= 5.15.0
OPTIONS_SINGLE= AUDIO
OPTIONS_SINGLE_AUDIO= ALSA PULSEAUDIO SNDIO

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1586559398
SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947
SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568
TIMESTAMP = 1590608885
SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432

View File

@ -1,21 +1,21 @@
--- configure.pri.orig 2019-12-03 07:18:02 UTC
--- configure.pri.orig 2020-04-08 09:41:36 UTC
+++ configure.pri
@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
defineTest(qtConfTest_detectPlatform) {
QT_FOR_CONFIG += gui-private
- !linux:!win32:!macos {
+ !linux:!win32:!macos:!unix: {
- !linux:!win32:!macos:!ios {
+ !linux:!win32:!macos:!ios:!unix: {
qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
} else {
linux:qtwebengine_isLinuxPlatformSupported() {
@@ -126,6 +126,9 @@ defineTest(qtConfTest_detectPlatform) {
@@ -125,6 +125,9 @@ defineTest(qtConfTest_detectPlatform) {
}
macos:qtwebengine_isMacOsPlatformSupported() {
$${1}.platform = "macos"
}
+ }
+ unix:qtwebengine_isLinuxPlatformSupported() {
+ $${1}.platform = "linux"
+ }
}
!isEmpty(platformError) {
}
ios:qtwebengine_isMacOsPlatformSupported() {
$${1}.platform = "ios"

View File

@ -1,11 +0,0 @@
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc.orig 2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc
@@ -440,7 +440,7 @@ static size_t PartitionPurgePage(internal::PartitionPa
#endif
}
// Terminate the freelist chain.
- *entry_ptr = nullptr;
+ *entry_ptr = internal::PartitionFreelistEntry::Transform(nullptr);
// The freelist head is stored unmasked.
page->freelist_head =
internal::PartitionFreelistEntry::Transform(page->freelist_head);

View File

@ -1,18 +1,18 @@
--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/debug/elf_reader.cc
@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
bool found = false;
while (current_note < section_end) {
while (current_section < section_end) {
current_note = reinterpret_cast<const Nhdr*>(current_section);
+#if !defined(OS_BSD)
if (current_note->n_type == NT_GNU_BUILD_ID) {
const char* note_name =
reinterpret_cast<const char*>(current_note) + sizeof(Nhdr);
@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
StringPiece note_name(current_section + sizeof(Nhdr),
current_note->n_namesz);
@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
break;
}
}
+#endif
current_note = reinterpret_cast<const Nhdr*>(
reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) +
size_t section_size = bits::Align(current_note->n_namesz, 4) +
bits::Align(current_note->n_descsz, 4) +

View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2017-01-26 00:49:07 UTC
--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h
@@ -5,6 +5,10 @@
#ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_

View File

@ -1,32 +1,20 @@
--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/i18n/icu_util.cc
@@ -20,7 +20,7 @@
#include "build/build_config.h"
#include "third_party/icu/source/common/unicode/putil.h"
#include "third_party/icu/source/common/unicode/udata.h"
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
@@ -43,7 +43,7 @@
#endif
#if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
- (defined(OS_LINUX) && !defined(IS_CHROMECAST))
+ (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
@@ -68,7 +68,11 @@ wchar_t g_debug_icu_pf_filename[_MAX_PATH];
// No need to change the filename in multiple places (gyp files, windows
// build pkg configurations, etc). 'l' stands for Little Endian.
// This variable is exported through the header file.
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
const char kIcuDataFileName[] = "icudtl.dat";
+#else
+const char kIcuDataFileName[] = "icudtb.dat";
+#endif
#if defined(OS_ANDROID)
const char kAndroidAssetsIcuDataFileName[] = "assets/icudtl.dat";
#endif
@@ -290,7 +294,7 @@ bool InitializeICU() {
// TODO(jungshik): Some callers do not care about tz at all. If necessary,
// add a boolean argument to this function to init'd the default tz only
// when requested.
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
if (result)
std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
#endif
@@ -293,7 +293,7 @@ void InitializeIcuTimeZone() {
fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
-#elif defined(OS_LINUX) && !defined(IS_CHROMECAST)
+#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
// To respond to the timezone change properly, the default timezone
// cache in ICU has to be populated on starting up.
// See TimeZoneMonitorLinux::NotifyClientsFromImpl().

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/linux_util.cc.orig 2018-11-13 18:25:11 UTC
--- src/3rdparty/chromium/base/linux_util.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/base/linux_util.cc
@@ -111,12 +111,14 @@ char g_linux_distro[kDistroSize] =
@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] =
"CrOS";
#elif defined(OS_ANDROID)
"Android";
@ -9,6 +9,8 @@
#else // if defined(OS_LINUX)
"Unknown";
#endif
@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo
}
std::string GetLinuxDistro() {
-#if defined(OS_CHROMEOS) || defined(OS_ANDROID)

View File

@ -0,0 +1,11 @@
--- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc
@@ -271,7 +271,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
bool MadvFreeDiscardableMemoryPosix::IsResident() const {
DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
-#ifdef OS_MACOSX
+#if defined(OS_MACOSX) || defined(OS_BSD)
std::vector<char> vec(allocated_pages_);
#else
std::vector<unsigned char> vec(allocated_pages_);

View File

@ -1,31 +0,0 @@
--- src/3rdparty/chromium/base/memory/protected_memory_posix.cc.orig 2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/base/memory/protected_memory_posix.cc
@@ -8,9 +8,9 @@
#include <sys/mman.h>
#include <unistd.h>
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include <sys/resource.h>
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
#if defined(OS_MACOSX) && !defined(OS_IOS)
#include <mach/mach.h>
@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start
return SetMemory(start, end, PROT_READ);
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
void AssertMemoryIsReadOnly(const void* ptr) {
#if DCHECK_IS_ON()
const uintptr_t page_mask = ~(base::GetPageSize() - 1);
@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) {
DCHECK_EQ(region_info.protection, VM_PROT_READ);
#endif // DCHECK_IS_ON()
}
-#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
+#endif // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
} // namespace base

View File

@ -0,0 +1,60 @@
--- src/3rdparty/chromium/base/profiler/register_context.h.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/profiler/register_context.h
@@ -17,7 +17,7 @@
#include <windows.h>
#elif defined(OS_MACOSX)
#include <mach/machine/thread_status.h>
-#elif defined(OS_ANDROID) || defined(OS_LINUX)
+#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
#include <sys/ucontext.h>
#endif
@@ -152,6 +152,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc
}
#endif // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
+
+#elif defined(OS_FREEBSD)
+
+using RegisterContext = mcontext_t;
+
+#if defined(ARCH_CPU_X86_64)
+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
+ return AsUintPtr(&context->mc_rsp);
+}
+
+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
+ return AsUintPtr(&context->mc_rbp);
+}
+
+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
+ return AsUintPtr(&context->mc_rip);
+}
+#elif defined(ARCH_CPU_X86)
+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
+ return AsUintPtr(&context->mc_esp);
+}
+
+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
+ return AsUintPtr(&context->mc_ebp);
+}
+
+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
+ return AsUintPtr(&context->mc_eip);
+}
+#elif defined(ARCH_CPU_ARM64)
+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
+ return AsUintPtr(&context->mc_gpregs.gp_sp);
+}
+
+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
+ return AsUintPtr(&context->mc_gpregs.gp_x[29]);
+}
+
+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
+ return AsUintPtr(&context->mc_gpregs.gp_elr);
+}
+#endif
#else // #if defined(OS_WIN)

View File

@ -0,0 +1,11 @@
--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc
@@ -7,7 +7,7 @@
namespace base {
SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() {
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
return {PlatformThread::CurrentId(), pthread_self()};
#else
return {PlatformThread::CurrentId()};

View File

@ -0,0 +1,20 @@
--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h
@@ -9,7 +9,7 @@
#include "base/threading/platform_thread.h"
#include "build/build_config.h"
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
#include <pthread.h>
#endif
@@ -21,7 +21,7 @@ namespace base {
// functions used to obtain the stack base address.
struct SamplingProfilerThreadToken {
PlatformThreadId id;
-#if defined(OS_ANDROID) || defined(OS_LINUX)
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
pthread_t pthread_id;
#endif
};

View File

@ -0,0 +1,65 @@
--- src/3rdparty/chromium/base/profiler/stack_copier_signal.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/profiler/stack_copier_signal.cc
@@ -4,10 +4,16 @@
#include "base/profiler/stack_copier_signal.h"
+#if defined(OS_LINUX)
#include <linux/futex.h>
+#include <syscall.h>
+#elif defined(OS_FREEBSD)
+#include <sys/types.h>
+#include <sys/thr.h>
+#include <sys/umtx.h>
+#endif
#include <signal.h>
#include <sys/ucontext.h>
-#include <syscall.h>
#include <atomic>
@@ -35,8 +41,13 @@ class AsyncSafeWaitableEvent {
// for a pthread mutex. So, also check the condition.
while (true) {
int res =
+#if defined(OS_LINUX)
syscall(SYS_futex, futex_int_ptr(), FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
0, nullptr, nullptr, 0);
+#elif defined(OS_FREEBSD)
+ _umtx_op(futex_int_ptr(), UMTX_OP_WAIT_UINT_PRIVATE, 0, nullptr,
+ nullptr);
+#endif
if (futex_.load(std::memory_order_acquire) != 0)
return true;
if (res != 0)
@@ -46,8 +57,12 @@ class AsyncSafeWaitableEvent {
void Signal() {
futex_.store(1, std::memory_order_release);
+#if defined(OS_LINUX)
syscall(SYS_futex, futex_int_ptr(), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1,
nullptr, nullptr, 0);
+#elif defined(OS_FREEBSD)
+ _umtx_op(futex_int_ptr(), UMTX_OP_WAKE_PRIVATE, 1, nullptr, nullptr);
+#endif
}
private:
@@ -201,11 +216,17 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
if (!scoped_sigaction.succeeded())
return false;
+#if defined(OS_LINUX)
if (syscall(SYS_tgkill, getpid(), thread_delegate_->GetThreadId(),
SIGURG) != 0) {
NOTREACHED();
return false;
}
+#elif defined(OS_FREEBSD)
+ if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) {
+ return false;
+ }
+#endif
bool finished_waiting = wait_event.Wait();
TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cpu_profiler.debug"),
"StackCopierSignal copy stack");

View File

@ -0,0 +1,63 @@
--- src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc
@@ -3,6 +3,9 @@
// found in the LICENSE file.
#include <pthread.h>
+#if defined(__FreeBSD__)
+#include <pthread_np.h>
+#endif
#include "base/process/process_handle.h"
#include "base/profiler/thread_delegate_posix.h"
@@ -17,12 +20,20 @@ namespace {
uintptr_t GetThreadStackBaseAddressImpl(
SamplingProfilerThreadToken thread_token) {
pthread_attr_t attr;
+#if defined(OS_FREEBSD)
+ pthread_attr_init(&attr);
+ pthread_attr_get_np(thread_token.pthread_id, &attr);
+#elif defined(OS_LINUX)
pthread_getattr_np(thread_token.pthread_id, &attr);
+#endif
// See crbug.com/617730 for limitations of this approach on Linux.
void* address;
size_t size;
pthread_attr_getstack(&attr, &address, &size);
const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
+#if defined(OS_FREEBSD)
+ pthread_attr_destroy(&attr);
+#endif
return base_address;
}
@@ -88,11 +99,19 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
for (size_t i = 19; i <= 29; ++i)
registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i]));
return registers;
-#elif defined(ARCH_CPU_X86_64) // #if defined(ARCH_CPU_ARM_FAMILY) &&
- // defined(ARCH_CPU_32_BITS)
+#elif defined(ARCH_CPU_X86_64)
return {
// Return the set of callee-save registers per the x86-64 System V ABI
// section 3.2.1, plus the stack pointer.
+#if defined(OS_FREEBSD)
+ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbp),
+ reinterpret_cast<uintptr_t*>(&thread_context->mc_rbx),
+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r12),
+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r13),
+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r14),
+ reinterpret_cast<uintptr_t*>(&thread_context->mc_r15),
+ reinterpret_cast<uintptr_t*>(&thread_context->mc_rsp),
+#else
reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]),
reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]),
reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]),
@@ -100,6 +119,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]),
reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]),
reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]),
+#endif
};
#else // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
// Unimplemented for other architectures.

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/security_unittest.cc.orig 2018-11-13 18:25:11 UTC
--- src/3rdparty/chromium/base/security_unittest.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/security_unittest.cc
@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
@@ -60,7 +60,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
// FAILS_ is too clunky.
void OverflowTestsSoftExpectTrue(bool overflow_detected) {
if (!overflow_detected) {

View File

@ -1,24 +0,0 @@
--- src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc.orig 2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc
@@ -829,12 +829,21 @@ TEST(StringNumberConversionsTest, DoubleToString) {
}
// The following two values were seen in crashes in the wild.
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
const char input_bytes[8] = {0, 0, 0, 0, '\xee', '\x6d', '\x73', '\x42'};
+#else
+ const char input_bytes[8] = {'\x42', '\x73', '\x6d', '\xee', 0, 0, 0, 0};
+#endif
double input = 0;
memcpy(&input, input_bytes, base::size(input_bytes));
EXPECT_EQ("1335179083776", NumberToString(input));
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
const char input_bytes2[8] =
{0, 0, 0, '\xa0', '\xda', '\x6c', '\x73', '\x42'};
+#else
+ const char input_bytes2[8] =
+ {'\x42', '\x73', '\x6c', '\xda', '\xa0', 0, 0, 0};
+#endif
input = 0;
memcpy(&input, input_bytes2, base::size(input_bytes2));
EXPECT_EQ("1334890332160", NumberToString(input));

View File

@ -0,0 +1,16 @@
--- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/base/synchronization/lock_impl.h
@@ -67,10 +67,13 @@ void LockImpl::Unlock() {
::ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&native_handle_));
}
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
void LockImpl::Unlock() {
int rv = pthread_mutex_unlock(&native_handle_);
DCHECK_EQ(rv, 0) << ". " << strerror(rv);
}
+#pragma GCC diagnostic pop
#endif
// This is an implementation used for AutoLock templated on the lock type.

View File

@ -1,6 +1,15 @@
--- src/3rdparty/chromium/base/system/sys_info.h.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/base/system/sys_info.h.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/base/system/sys_info.h
@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo {
@@ -188,6 +188,8 @@ class BASE_EXPORT SysInfo {
// See also SysUtils.java, method isLowEndDevice.
static bool IsLowEndDevice();
+ static uint64_t MaxSharedMemorySize();
+
private:
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
@@ -197,7 +199,7 @@ class BASE_EXPORT SysInfo {
static bool IsLowEndDeviceImpl();
static HardwareInfo GetHardwareInfoSync();

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc
@@ -13,26 +13,46 @@
@@ -13,26 +13,59 @@
namespace base {
int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
@ -21,11 +21,6 @@
return static_cast<int64_t>(pages) * page_size;
}
-// static
-uint64_t SysInfo::MaxSharedMemorySize() {
- size_t limit;
- size_t size = sizeof(limit);
- if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
+ int page_size, r = 0;
+ unsigned pgfree, pginact, pgcache;
@ -40,14 +35,13 @@
+ if(r == 0)
+ r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
+ if(r == -1) {
NOTREACHED();
return 0;
}
- return static_cast<uint64_t>(limit);
+ NOTREACHED();
+ return 0;
+ }
+ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
}
+// static
+}
+
// static
+std::string SysInfo::CPUModelName() {
+ int mib[] = { CTL_HW, HW_MODEL };
+ char name[256];
@ -56,4 +50,18 @@
+ return name;
+ return std::string();
+}
+
+// static
uint64_t SysInfo::MaxSharedMemorySize() {
size_t limit;
size_t size = sizeof(limit);
+
if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
NOTREACHED();
return 0;
}
+
return static_cast<uint64_t>(limit);
}
-
} // namespace base

View File

@ -1,14 +0,0 @@
--- src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc.orig 2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc
@@ -186,7 +186,11 @@
* used for input more than STRTOD_DIGLIM digits long (default 40).
*/
+#ifdef __BIG_ENDIAN__
+#define IEEE_MC68k
+#else
#define IEEE_8087
+#endif
#define NO_HEX_FP
#ifndef Long

View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
@@ -60,7 +60,7 @@ declare_args() {
# only two architectures that are currently checked in). Turn this off when
@ -9,16 +9,16 @@
(current_cpu == "x64" || current_cpu == "x86")
binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
root_build_dir)
@@ -301,7 +301,7 @@ config("compiler") {
@@ -309,7 +309,7 @@ config("compiler") {
# Linker warnings.
if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
!(is_android && use_order_profiling) && !is_mac && !is_ios &&
- current_os != "aix") {
+ current_os != "aix" && !is_bsd) {
- !is_mac && !is_ios && current_os != "aix") {
+ !is_mac && !is_ios && current_os != "aix" && !is_bsd) {
# TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
# TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
# crbug.com/485542
@@ -407,7 +407,7 @@ config("compiler") {
ldflags += [ "-Wl,--fatal-warnings" ]
}
@@ -416,7 +416,7 @@ config("compiler") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
# the executable they are loaded into, so they are unresolved at link-time.
@ -27,7 +27,16 @@
ldflags += [
"-Wl,-z,defs",
"-Wl,--as-needed",
@@ -786,7 +786,7 @@ config("compiler_cpu_abi") {
@@ -516,7 +516,7 @@ config("compiler") {
}
}
- if (is_clang && !is_nacl && !use_xcode_clang && !use_qt) {
+ if (is_clang && !is_nacl && !use_xcode_clang && !use_qt && !is_bsd) {
cflags += [ "-fcrash-diagnostics-dir=" +
rebase_path("//tools/clang/crashreports", root_build_dir) ]
@@ -787,7 +787,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@ -36,7 +45,7 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
@@ -1147,7 +1147,7 @@ config("compiler_deterministic") {
@@ -1138,7 +1138,7 @@ config("compiler_deterministic") {
"-Xclang",
".",
]
@ -45,7 +54,7 @@
# We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
}
@@ -1553,7 +1553,7 @@ config("default_warnings") {
@@ -1545,7 +1545,7 @@ config("default_warnings") {
cflags += [ "-Wno-nonportable-include-path" ]
}
@ -54,7 +63,7 @@
# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
# recognize.
cflags += [
@@ -1761,7 +1761,7 @@ config("thin_archive") {
@@ -1775,7 +1775,7 @@ config("thin_archive") {
# Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
# have a "thin archive" mode (it does accept -T, but it means truncating
# archive names to 16 characters, which is not what we want).
@ -63,7 +72,7 @@
arflags = [ "-T" ]
} else if (is_win && use_lld) {
arflags = [ "/llvmlibthin" ]
@@ -2356,7 +2356,7 @@ config("symbols") {
@@ -2373,7 +2373,7 @@ config("symbols") {
# flag, so we can use use -g1 for pnacl and nacl-clang compiles.
# gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
if (!is_nacl || is_clang) {
@ -72,7 +81,7 @@
}
if (use_debug_fission && !is_nacl && !is_android) {
@@ -2377,7 +2377,7 @@ config("symbols") {
@@ -2394,7 +2394,7 @@ config("symbols") {
# DWARF info may be corrupt; offsets in a range list entry are in different
# sections" there. Maybe just a bug in nacl_switch_32.S.
if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&

View File

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/build/config/features.gni.orig 2018-11-13 18:25:11 UTC
--- src/3rdparty/chromium/build/config/features.gni.orig 2020-04-29 07:57:35 UTC
+++ src/3rdparty/chromium/build/config/features.gni
@@ -46,7 +46,7 @@ declare_args() {
fieldtrial_testing_like_official_build = is_chrome_branded
@@ -26,7 +26,7 @@ declare_args() {
proprietary_codecs = is_chrome_branded || is_chromecast
# libudev usage. This currently only affects the content layer.
- use_udev = is_linux && !is_chromecast

View File

@ -0,0 +1,53 @@
--- src/3rdparty/chromium/build/linux/unbundle/libxml.gn.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/build/linux/unbundle/libxml.gn
@@ -8,11 +8,48 @@ pkg_config("system_libxml") {
packages = [ "libxml-2.0" ]
}
-static_library("libxml") {
+source_set("libxml") {
+ public_configs = [ ":system_libxml" ]
+}
+
+static_library("libxml_utils") {
+ # Do not expand this visibility list without first consulting with the
+ # Security Team.
+ visibility = [
+ ":xml_reader",
+ ":xml_writer",
+ "//base/test:test_support",
+ "//services/data_decoder:xml_parser_fuzzer",
+ ]
sources = [
"chromium/libxml_utils.cc",
"chromium/libxml_utils.h",
]
-
public_configs = [ ":system_libxml" ]
+}
+
+static_library("xml_reader") {
+ # Do not expand this visibility list without first consulting with the
+ # Security Team.
+ visibility = [
+ "//base/test:test_support",
+ "//components/policy/core/common:unit_tests",
+ "//services/data_decoder:*",
+ "//tools/traffic_annotation/auditor:auditor_sources",
+ ]
+ sources = [
+ "chromium/xml_reader.cc",
+ "chromium/xml_reader.h",
+ ]
+ deps = [ ":libxml_utils" ]
+}
+
+static_library("xml_writer") {
+ # The XmlWriter is considered safe to use from any target.
+ visibility = [ "*" ]
+ sources = [
+ "chromium/xml_writer.cc",
+ "chromium/xml_writer.h",
+ ]
+ deps = [ ":libxml_utils" ]
}

View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd
@@ -18,7 +18,7 @@
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
@ -9,12 +9,3 @@
<include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
</if>
@@ -109,7 +109,7 @@
<include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
<include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
</if>
- <if expr="is_linux and enable_app_list">
+ <if expr="is_posix and enable_app_list">
<!-- App Launcher icons for desktop icon. -->
<if expr="_google_chrome">
<then>

View File

@ -1,7 +1,7 @@
--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
@@ -206,11 +206,11 @@
#include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
@@ -209,11 +209,11 @@
#include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
#endif
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
@ -9,12 +9,12 @@
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#endif
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
#include "chrome/browser/ui/webui/sandbox_internals_ui.h"
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
#include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
#endif
@@ -323,7 +323,7 @@ bool IsAboutUI(const GURL& url) {
@@ -311,7 +311,7 @@ bool IsAboutUI(const GURL& url) {
#if !defined(OS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@ -23,7 +23,7 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if defined(OS_CHROMEOS)
@@ -638,7 +638,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -624,7 +624,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@ -32,12 +32,12 @@
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
return &NewWebUI<ConstrainedWebDialogUI>;
#endif
@@ -681,17 +681,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
@@ -674,17 +674,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
return &NewWebUI<CastUI>;
}
#endif
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
if (url.host_piece() == chrome::kChromeUISandboxHost) {
return &NewWebUI<SandboxInternalsUI>;
}

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/chrome/common/chrome_paths.cc
@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
#endif
@ -24,9 +24,9 @@
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
#if defined(OS_CHROMEOS)
const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL(
@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) {
#if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
// The name of the hint file that tells the latest component updated Widevine
@@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@ -35,7 +35,17 @@
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
@@ -470,7 +470,7 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) {
case chrome::DIR_POLICY_FILES: {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
+#elif defined(OS_BSD)
+ cur = base::FilePath(FILE_PATH_LITERAL(
+ "/usr/local/etc/chrome/policies"));
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) {
}
#endif
#if defined(OS_CHROMEOS) || \
@ -44,7 +54,7 @@
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
return false;
@@ -478,7 +478,7 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
}
#endif
@ -53,7 +63,7 @@
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
@@ -513,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) {
#endif
break;
@ -62,7 +72,7 @@
case chrome::DIR_NATIVE_MESSAGING:
#if defined(OS_MACOSX)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
@@ -527,6 +527,9 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -559,6 +562,9 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
@ -72,7 +82,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/chromium/native-messaging-hosts"));
@@ -539,7 +542,7 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
break;
@ -81,7 +91,7 @@
#if !defined(OS_ANDROID)
case chrome::DIR_GLOBAL_GCM_STORE:
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
@@ -547,7 +550,7 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) {
cur = cur.Append(kGCMStoreDirname);
break;
#endif // !defined(OS_ANDROID)
@ -90,7 +100,7 @@
case chrome::FILE_COMPONENT_FLASH_HINT:
if (!base::PathService::Get(
chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
@@ -555,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) {
@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) {
}
cur = cur.Append(kComponentUpdatedFlashHint);
break;

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc
@@ -314,7 +314,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me
@@ -318,7 +318,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
const char kChromeUICastHost[] = "cast";
#endif
@ -9,12 +9,12 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
const char kChromeUIHatsHost[] = "hats";
@@ -325,17 +325,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
@@ -329,17 +329,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
#endif
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
const char kChromeUISandboxHost[] = "sandbox";
#endif
@ -26,11 +26,11 @@
#endif
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
#endif
@@ -579,13 +579,13 @@ const char* const kChromeHostURLs[] = {
@@ -605,13 +605,13 @@ const char* const kChromeHostURLs[] = {
kChromeUIInternetDetailDialogHost,
kChromeUIAssistantOptInHost,
#endif
@ -41,8 +41,8 @@
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
kChromeUILinuxProxyConfigHost,
#endif
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
kChromeUISandboxHost,
#endif
#if defined(OS_WIN)

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/chrome/common/webui_url_constants.h
@@ -272,7 +272,7 @@ extern const char kChromeUIMetroFlowURL[];
@@ -268,7 +268,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
extern const char kChromeUICastHost[];
#endif
@ -9,12 +9,12 @@
extern const char kChromeUIDiscardsHost[];
extern const char kChromeUIDiscardsURL[];
extern const char kChromeUIHatsHost[];
@@ -284,17 +284,17 @@ extern const char kChromeUIHatsURL[];
@@ -280,17 +280,17 @@ extern const char kChromeUIHatsURL[];
extern const char kChromeUILinuxProxyConfigHost[];
#endif
-#if defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
extern const char kChromeUISandboxHost[];
#endif
@ -26,7 +26,7 @@
#endif
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
+#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
extern const char kChromeUITabModalConfirmDialogHost[];
#endif

View File

@ -1,6 +1,11 @@
--- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/components/crash/content/app/BUILD.gn
@@ -54,7 +54,7 @@ static_library("app") {
@@ -51,17 +51,20 @@ static_library("app") {
"crashpad_win.cc",
]
- if (is_mac || is_win || is_android || is_linux) {
+ if ((is_mac || is_win || is_android || is_linux) && !is_bsd) {
sources += [ "crashpad.cc" ]
}
@ -9,12 +14,39 @@
sources += [
"breakpad_linux.cc",
"breakpad_linux.h",
@@ -96,7 +96,7 @@ static_library("app") {
"//sandbox",
"breakpad_linux_impl.h",
]
}
+ if (is_bsd) {
+ sources -= [ "crashpad_linux.cc" ]
+ }
- if (is_linux) {
+ if (is_linux && !is_bsd) {
deps += [
"//content/public/common",
"//third_party/breakpad:client",
defines = [ "CRASH_IMPLEMENTATION" ]
@@ -73,7 +76,7 @@ static_library("app") {
"//build:branding_buildflags",
]
- if (is_mac || is_win || is_android || is_linux) {
+ if ((is_mac || is_win || is_android || is_linux) && !is_bsd) {
deps += [
"//third_party/crashpad/crashpad/client",
"//third_party/crashpad/crashpad/util",
@@ -99,7 +102,7 @@ static_library("app") {
]
}
- if (is_linux) {
+ if (is_linux && !is_bsd) {
deps += [ "//third_party/breakpad:client" ]
}
@@ -130,7 +133,7 @@ static_library("app") {
libs = [ "log" ]
}
- if (is_linux) {
+ if (is_linux && !is_bsd) {
data_deps = [
"//third_party/crashpad/crashpad/handler:crashpad_handler",
]

View File

@ -1,4 +1,4 @@
--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/components/crash/core/common/BUILD.gn
@@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
@ -9,15 +9,18 @@
}
group("common") {
@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") {
@@ -110,7 +110,9 @@ target(crash_key_target_type, "crash_key_lib") {
]
}
- deps += [ "//third_party/breakpad:client" ]
}
}
@@ -153,7 +152,7 @@ source_set("unit_tests") {
+ if (!is_bsd) {
+ deps += [ "//third_party/breakpad:client" ]
+ }
if (use_combined_annotations) {
public_deps += [ "//third_party/crashpad/crashpad/client" ]
}
@@ -173,7 +175,7 @@ source_set("unit_tests") {
sources += [ "objc_zombie_unittest.mm" ]
}

View File

@ -1,9 +1,9 @@
--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2018-11-13 18:25:11 UTC
--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/components/neterror/resources/neterror.js
@@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings) {
@@ -201,7 +201,7 @@ function setUpCachedButton(buttonStrings) {
}
var primaryControlOnLeft = true;
let primaryControlOnLeft = true;
-// <if expr="is_macosx or is_ios or is_linux or is_android">
+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
primaryControlOnLeft = false;

View File

@ -1,24 +0,0 @@
--- src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc.orig 2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc
@@ -12,6 +12,12 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
+#if defined(OS_WIN)
+#include <winsock2.h>
+#elif defined(OS_POSIX)
+#include <arpa/inet.h>
+#endif
+
namespace safe_browsing {
TEST(SafeBrowsingDbUtilTest, UrlToFullHashes) {
@@ -83,7 +89,7 @@ TEST(SafeBrowsingDbUtilTest, StringToSBFullHashAndSBFu
// 31 chars plus the last \0 as full_hash.
const std::string hash_in = "12345678902234567890323456789012";
SBFullHash hash_out = StringToSBFullHash(hash_in);
- EXPECT_EQ(0x34333231U, hash_out.prefix);
+ EXPECT_EQ(htonl(0x31323334U), hash_out.prefix);
EXPECT_EQ(0, memcmp(hash_in.data(), hash_out.full_hash, sizeof(SBFullHash)));
std::string hash_final = SBFullHashToString(hash_out);

View File

@ -1,20 +0,0 @@
--- src/3rdparty/chromium/content/browser/builtin_service_manifests.cc.orig 2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/browser/builtin_service_manifests.cc
@@ -32,7 +32,7 @@
#include "services/tracing/manifest.h"
#include "services/video_capture/public/cpp/manifest.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/services/font/public/cpp/manifest.h" // nogncheck
#endif
@@ -99,7 +99,7 @@ const std::vector<service_manager::Manifest>& GetBuilt
: service_manager::Manifest::ExecutionMode::
kInProcessBuiltin),
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
font_service::GetManifest(),
#endif
#if defined(OS_CHROMEOS)

View File

@ -0,0 +1,11 @@
--- src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc
@@ -114,7 +114,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() {
return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager();
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
class HostDisplayClient : public viz::HostDisplayClient {
public:
explicit HostDisplayClient(ui::Compositor* compositor)

View File

@ -0,0 +1,20 @@
--- src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc
@@ -89,7 +89,7 @@ void SoftwareBrowserCompositorOutputSurface::SwapBuffe
const gfx::Size& pixel_size) {
latency_tracker_.OnGpuSwapBuffersCompleted(latency_info);
client_->DidReceiveSwapBuffersAck({swap_time, swap_time});
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
if (needs_swap_size_notifications_)
client_->DidSwapWithSize(pixel_size);
#endif
@@ -129,7 +129,7 @@ unsigned SoftwareBrowserCompositorOutputSurface::Updat
return 0;
}
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
void SoftwareBrowserCompositorOutputSurface::SetNeedsSwapSizeNotifications(
bool needs_swap_size_notifications) {
needs_swap_size_notifications_ = needs_swap_size_notifications;

View File

@ -0,0 +1,20 @@
--- src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.h.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.h
@@ -39,7 +39,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu
gfx::BufferFormat GetOverlayBufferFormat() const override;
uint32_t GetFramebufferCopyTextureFormat() override;
unsigned UpdateGpuFence() override;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
void SetNeedsSwapSizeNotifications(
bool needs_swap_size_notifications) override;
#endif
@@ -55,7 +55,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu
base::TimeDelta refresh_interval_;
ui::LatencyTracker latency_tracker_;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
bool needs_swap_size_notifications_ = false;
#endif

View File

@ -0,0 +1,11 @@
--- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc
@@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
// Give the GPU process a few seconds to provide GPU info.
// Linux Debug builds need more time -- see Issue 796437.
// Windows builds need more time -- see Issue 873112 and 1004472.
-#if (defined(OS_LINUX) && !defined(NDEBUG))
+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG))
const int kGPUInfoWatchdogTimeoutMs = 20000;
#elif defined(OS_WIN)
const int kGPUInfoWatchdogTimeoutMs = 30000;

View File

@ -0,0 +1,20 @@
--- src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc
@@ -8,7 +8,7 @@
#include "build/build_config.h"
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
#include "content/browser/font_service.h" // nogncheck
#endif
@@ -17,7 +17,7 @@ namespace content {
void PpapiPluginProcessHost::BindHostReceiver(
mojo::GenericPendingReceiver receiver) {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
if (auto font_receiver = receiver.As<font_service::mojom::FontService>())
ConnectToFontService(std::move(font_receiver));
#endif

View File

@ -1,15 +1,15 @@
--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc
@@ -230,7 +230,7 @@
#include "content/browser/compositor/image_transport_factory.h"
@@ -236,7 +236,7 @@
#include "content/browser/gpu/gpu_data_manager_impl.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include <sys/resource.h>
#include <sys/time.h>
#endif
@@ -1232,7 +1232,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
@@ -1165,7 +1165,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
// to indicate failure and std::numeric_limits<size_t>::max() to indicate
// unlimited.
size_t GetPlatformProcessLimit() {
@ -18,7 +18,7 @@
struct rlimit limit;
if (getrlimit(RLIMIT_NPROC, &limit) != 0)
return kUnknownPlatformProcessLimit;
@@ -1243,7 +1243,7 @@ size_t GetPlatformProcessLimit() {
@@ -1176,7 +1176,7 @@ size_t GetPlatformProcessLimit() {
#else
// TODO(https://crbug.com/104689): Implement on other platforms.
return kUnknownPlatformProcessLimit;
@ -27,7 +27,16 @@
}
#endif // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
@@ -1651,7 +1651,7 @@ bool RenderProcessHostImpl::Init() {
@@ -1218,7 +1218,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost
return;
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
@@ -1588,7 +1588,7 @@ bool RenderProcessHostImpl::Init() {
renderer_prefix =
browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);

View File

@ -1,35 +0,0 @@
--- src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc.orig 2019-11-27 21:12:25 UTC
+++ src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc
@@ -98,7 +98,7 @@
#include "content/public/android/content_jni_headers/ContentNfcDelegate_jni.h"
#endif
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
#include "components/services/font/font_service_app.h"
#include "components/services/font/public/mojom/constants.mojom.h" // nogncheck
#endif
@@ -341,12 +341,12 @@ void CreateInProcessAudioService(
BrowserMainLoop::GetAudioManager(), std::move(request)));
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
std::unique_ptr<service_manager::Service> CreateFontService(
service_manager::mojom::ServiceRequest request) {
return std::make_unique<font_service::FontServiceApp>(std::move(request));
}
-#endif // defined(OS_LINUX)
+#endif // defined(OS_LINUX) || defined(OS_BSD)
std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService(
service_manager::mojom::ServiceRequest request) {
@@ -657,7 +657,7 @@ ServiceManagerContext::ServiceManagerContext(
base::BindRepeating(&CreateVideoCaptureService));
}
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
RegisterInProcessService(
font_service::mojom::kServiceName,
base::CreateSequencedTaskRunnerWithTraits(

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/content/browser/utility_process_host.cc
@@ -211,7 +211,7 @@ UtilityProcessHost::UtilityProcessHost()
@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost()
UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
: sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/gpu/gpu_main.cc
@@ -84,7 +84,7 @@
@@ -85,7 +85,7 @@
#include "ui/gfx/x/x11_switches.h" // nogncheck
#endif
@ -9,7 +9,7 @@
#include "content/gpu/gpu_sandbox_hook_linux.h"
#include "content/public/common/sandbox_init.h"
#include "services/service_manager/sandbox/linux/sandbox_linux.h"
@@ -113,7 +113,7 @@ namespace content {
@@ -106,7 +106,7 @@ namespace content {
namespace {
@ -18,7 +18,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
@@ -174,7 +174,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
@@ -167,7 +167,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) override {
@ -27,16 +27,16 @@
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
#elif defined(OS_WIN)
return StartSandboxWindows(sandbox_info_);
@@ -280,7 +280,7 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -273,7 +273,7 @@ int GpuMain(const MainFunctionParams& parameters) {
main_thread_task_executor =
std::make_unique<base::SingleThreadTaskExecutor>(
gpu_preferences.message_loop_type);
gpu_preferences.message_pump_type);
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#error "Unsupported Linux platform."
#elif defined(OS_MACOSX)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
@@ -388,7 +388,7 @@ int GpuMain(const MainFunctionParams& parameters) {
@@ -379,7 +379,7 @@ int GpuMain(const MainFunctionParams& parameters) {
namespace {
@ -45,7 +45,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) {
@@ -423,7 +423,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
@@ -414,7 +414,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
return res;
}

View File

@ -1,34 +1,25 @@
--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2019-05-23 12:39:34 UTC
--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc
@@ -20,7 +20,7 @@
@@ -19,7 +19,7 @@
#if defined(OS_MACOSX)
#include "content/child/child_process_sandbox_support_impl_mac.h"
-#elif defined(OS_LINUX)
+#elif defined(OS_LINUX) || defined(OS_BSD)
#include "content/child/child_process_sandbox_support_impl_linux.h"
#include "mojo/public/cpp/bindings/pending_remote.h"
#endif
@@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef;
namespace content {
PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() {
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
font_loader_ =
sk_make_sp<font_service::FontLoader>(ChildThread::Get()->GetConnector());
SkFontConfigInterface::SetGlobal(font_loader_);
@@ -49,7 +49,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
}
void PpapiBlinkPlatformImpl::Shutdown() {
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
// SandboxSupport contains a map of OutOfProcessFont objects, which hold
// WebStrings and WebVectors, which become invalidated when blink is shut
// down. Hence, we need to clear that map now, just before blink::shutdown()
@@ -59,7 +59,7 @@ void PpapiBlinkPlatformImpl::Shutdown() {
}
mojo::PendingRemote<font_service::mojom::FontService> font_service;
ChildThread::Get()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
@@ -52,7 +52,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
void PpapiBlinkPlatformImpl::Shutdown() {}
blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
-#if defined(OS_LINUX) || defined(OS_MACOSX)

View File

@ -1,11 +0,0 @@
--- src/3rdparty/chromium/content/public/app/v8_snapshot_overlay_manifest.cc.orig 2019-05-23 12:39:34 UTC
+++ src/3rdparty/chromium/content/public/app/v8_snapshot_overlay_manifest.cc
@@ -15,7 +15,7 @@ namespace content {
const service_manager::Manifest& GetV8SnapshotOverlayManifest() {
static base::NoDestructor<service_manager::Manifest> manifest {
service_manager::ManifestBuilder()
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
.PreloadFile(kV8NativesDataDescriptor,
base::FilePath(FILE_PATH_LITERAL("natives_blob.bin")))
#if defined(USE_V8_CONTEXT_SNAPSHOT)

View File

@ -1,9 +1,9 @@
--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2019-05-23 12:39:34 UTC
--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h
@@ -328,7 +328,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
@@ -333,7 +333,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
IPC_STRUCT_TRAITS_MEMBER(accept_languages)
IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)

View File

@ -1,15 +1,15 @@
--- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/content/public/common/content_features.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/public/common/content_features.cc
@@ -43,7 +43,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
// Runs the audio service in a separate process.
@@ -54,7 +54,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
const base::Feature kAudioServiceOutOfProcess{
"AudioServiceOutOfProcess",
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
#if defined(OS_WIN) || defined(OS_MACOSX) || \
- (defined(OS_LINUX) && !defined(OS_CHROMEOS))
+ (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
@@ -618,7 +618,7 @@ const base::Feature kWebAssemblyThreads {
@@ -634,7 +634,7 @@ const base::Feature kWebAssemblyThreads {
};
// Enable WebAssembly trap handler.
@ -18,7 +18,7 @@
defined(ARCH_CPU_X86_64)
const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
base::FEATURE_ENABLED_BY_DEFAULT};
@@ -653,7 +653,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
@@ -669,7 +669,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
// https://w3c.github.io/webauthn
const base::Feature kWebAuthCable {
"WebAuthenticationCable",

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2019-11-27 21:12:25 UTC
--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig 2020-03-16 14:04:24 UTC
+++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc
@@ -186,12 +186,21 @@
@@ -188,12 +188,21 @@
#include "mojo/public/cpp/bindings/message_dumper.h"
#endif
@ -22,7 +22,7 @@
using base::ThreadRestrictions;
using blink::WebDocument;
using blink::WebFrame;
@@ -904,7 +913,7 @@ void RenderThreadImpl::Init() {
@@ -927,7 +936,7 @@ void RenderThreadImpl::Init() {
DCHECK(parsed_num_raster_threads) << string_value;
DCHECK_GT(num_raster_threads, 0);
@ -31,16 +31,16 @@
categorized_worker_pool_->SetBackgroundingCallback(
main_thread_scheduler_->DefaultTaskRunner(),
base::BindOnce(
@@ -933,7 +942,7 @@ void RenderThreadImpl::Init() {
@@ -957,7 +966,7 @@ void RenderThreadImpl::Init() {
base::DiscardableMemoryAllocator::SetInstance(
discardable_shared_memory_manager_.get());
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
render_message_filter()->SetThreadPriority(
ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY);
#endif
@@ -1313,7 +1322,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
if (base::FeatureList::IsEnabled(
blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
render_message_filter()->SetThreadPriority(
@@ -1333,7 +1342,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
!cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
#else
cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);

View File

@ -1,6 +1,6 @@
--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2019-05-23 12:39:34 UTC
--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig 2020-04-08 09:41:36 UTC
+++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc
@@ -109,7 +109,7 @@
@@ -99,7 +99,7 @@
#if defined(OS_MACOSX)
#include "content/child/child_process_sandbox_support_impl_mac.h"
@ -9,34 +9,25 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#endif
@@ -204,7 +204,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
->Clone();
@@ -174,7 +174,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
if (RenderThreadImpl::current()) {
io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner();
thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();
blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
-#if defined(OS_LINUX)
+#if defined(OS_LINUX) || defined(OS_BSD)
font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get());
SkFontConfigInterface::SetGlobal(font_loader_);
mojo::PendingRemote<font_service::mojom::FontService> font_service;
RenderThreadImpl::current()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
@@ -184,7 +184,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
#endif
@@ -213,7 +213,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
connector_ = service_manager::Connector::Create(&request);
}
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
if (g_sandbox_enabled && sandboxEnabled()) {
if (sandboxEnabled()) {
#if defined(OS_MACOSX)
sandbox_support_.reset(new WebSandboxSupportMac(connector_.get()));
@@ -241,7 +241,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
}
void RendererBlinkPlatformImpl::Shutdown() {
-#if defined(OS_LINUX) || defined(OS_MACOSX)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
// SandboxSupport contains a map of OutOfProcessFont objects, which hold
// WebStrings and WebVectors, which become invalidated when blink is shut
// down. Hence, we need to clear that map now, just before blink::shutdown()
@@ -322,7 +322,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
@@ -266,7 +266,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
base::PlatformThreadId thread_id) {
@ -45,7 +36,7 @@
if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
render_thread->render_message_filter()->SetThreadPriority(
thread_id, base::ThreadPriority::DISPLAY);
@@ -335,7 +335,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
@@ -279,7 +279,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {

Some files were not shown because too many files have changed in this diff Show More