View | Details | Raw Unified | Return to bug 247010
Collapse All | Expand All

(-)b/Mk/Uses/qt.mk (-1 / +1 lines)
Lines 24-30 _QT_MK_INCLUDED= qt.mk Link Here
24
24
25
# Qt versions currently supported by the framework.
25
# Qt versions currently supported by the framework.
26
_QT_SUPPORTED?=		5
26
_QT_SUPPORTED?=		5
27
QT5_VERSION?=		5.14.2
27
QT5_VERSION?=		5.15.0
28
28
29
# We accept the Qt version to be passed by either or all of the three mk files.
29
# We accept the Qt version to be passed by either or all of the three mk files.
30
.  if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
30
.  if empty(qt_ARGS) && empty(qmake_ARGS) && empty(qt-dist_ARGS)
(-)b/comms/qt5-connectivity/pkg-plist (-1 / +1 lines)
Lines 76-82 Link Here
76
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h
76
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluez_p.h
77
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h
77
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_bluezdbus_p.h
78
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_darwin_p.h
78
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_darwin_p.h
79
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_p.h
79
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_dummy_p.h
80
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_win_p.h
80
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_win_p.h
81
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h
81
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_new_p.h
82
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h
82
%%QT_INCDIR%%/QtBluetooth/%%FULLVER%%/QtBluetooth/private/qlowenergycontroller_winrt_p.h
(-)b/comms/qt5-serialbus/pkg-plist (+1 lines)
Lines 1-4 Link Here
1
%%QT_BINDIR%%/canbusutil
1
%%QT_BINDIR%%/canbusutil
2
%%DEBUG%%%%QT_BINDIR%%/canbusutil.debug
2
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h
3
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdevice_p.h
3
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdeviceinfo_p.h
4
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qcanbusdeviceinfo_p.h
4
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h
5
%%QT_INCDIR%%/QtSerialBus/%%FULLVER%%/QtSerialBus/private/qmodbus_symbols_p.h
(-)b/databases/qt5-sqldrivers-mysql/files/patch-src_plugins_sqldrivers_mysql_qsql__mysql.cpp (-33 / +15 lines)
Lines 17-28 This does not apply to the Qt4 port, which allows older compilers Link Here
17
and the less-fragile approach would therefore break on old-gcc-in-base
17
and the less-fragile approach would therefore break on old-gcc-in-base
18
architectures.
18
architectures.
19
19
20
--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig	2018-04-29 07:25:09 UTC
20
--- src/plugins/sqldrivers/mysql/qsql_mysql.cpp.orig	2020-03-11 15:29:12 UTC
21
+++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp
21
+++ src/plugins/sqldrivers/mysql/qsql_mysql.cpp
22
@@ -74,6 +74,14 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)
22
@@ -71,6 +71,14 @@ Q_DECLARE_METATYPE(MYSQL_STMT*)
23
 #  define Q_CLIENT_MULTI_STATEMENTS 0
23
 // by redefining it we can regain source compatibility.
24
 #endif
24
 using my_bool = decltype(mysql_stmt_bind_result(nullptr, nullptr));
25
25
 
26
+// MYSQL 8.0.1 no longer uses the my_bool type:
26
+// MYSQL 8.0.1 no longer uses the my_bool type:
27
+// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html
27
+// https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-1.html
28
+#if (MYSQL_VERSION_ID >= 80001) && !defined(MARIADB_BASE_VERSION)
28
+#if (MYSQL_VERSION_ID >= 80001) && !defined(MARIADB_BASE_VERSION)
Lines 32-81 architectures. Link Here
32
+#endif
32
+#endif
33
+
33
+
34
 QT_BEGIN_NAMESPACE
34
 QT_BEGIN_NAMESPACE
35
35
 
36
 class QMYSQLDriverPrivate : public QSqlDriverPrivate
36
 class QMYSQLDriverPrivate : public QSqlDriverPrivate
37
@@ -232,7 +240,7 @@ class QMYSQLResultPrivate: public QSqlResultPrivate (p
37
@@ -930,7 +938,7 @@ bool QMYSQLResult::exec()
38
               myField(0), type(QVariant::Invalid)
39
         {}
40
         char *outField;
41
-        my_bool nullIndicator;
42
+        mysql_bool nullIndicator;
43
         ulong bufLength;
44
         MYSQL_FIELD *myField;
45
         QVariant::Type type;
46
@@ -983,7 +991,7 @@ bool QMYSQLResult::exec()
47
     MYSQL_BIND* currBind;
38
     MYSQL_BIND* currBind;
48
     QVector<MYSQL_TIME *> timeVector;
39
     QVector<MYSQL_TIME *> timeVector;
49
     QVector<QByteArray> stringVector;
40
     QVector<QByteArray> stringVector;
50
-    QVector<my_bool> nullVector;
41
-    QVector<my_bool> nullVector;
51
+    QVector<mysql_bool> nullVector;
42
+    QVector<mysql_bool> nullVector;
52
43
 
53
     const QVector<QVariant> values = boundValues();
44
     const QVector<QVariant> values = boundValues();
54
45
 
55
@@ -1004,7 +1012,7 @@ bool QMYSQLResult::exec()
46
@@ -951,7 +959,7 @@ bool QMYSQLResult::exec()
56
47
 
57
             currBind = &d->outBinds[i];
48
             currBind = &d->outBinds[i];
58
49
 
59
-            nullVector[i] = static_cast<my_bool>(val.isNull());
50
-            nullVector[i] = static_cast<my_bool>(val.isNull());
60
+            nullVector[i] = static_cast<mysql_bool>(val.isNull());
51
+            nullVector[i] = static_cast<mysql_bool>(val.isNull());
61
             currBind->is_null = &nullVector[i];
52
             currBind->is_null = &nullVector[i];
62
             currBind->length = 0;
53
             currBind->length = 0;
63
             currBind->is_unsigned = 0;
54
             currBind->is_unsigned = 0;
64
@@ -1101,7 +1109,7 @@ bool QMYSQLResult::exec()
55
@@ -1048,7 +1056,7 @@ bool QMYSQLResult::exec()
65
     d->rowsAffected = mysql_stmt_affected_rows(d->stmt);
56
     d->rowsAffected = mysql_stmt_affected_rows(d->stmt);
66
57
 
67
     if (isSelect()) {
58
     if (isSelect()) {
68
-        my_bool update_max_length = true;
59
-        my_bool update_max_length = true;
69
+        mysql_bool update_max_length = true;
60
+        mysql_bool update_max_length = true;
70
61
 
71
         r = mysql_stmt_bind_result(d->stmt, d->inBinds);
62
         r = mysql_stmt_bind_result(d->stmt, d->inBinds);
72
         if (r != 0) {
63
         if (r != 0) {
73
@@ -1312,7 +1320,7 @@ bool QMYSQLDriver::open(const QString& db,
74
     QString sslCAPath;
75
     QString sslCipher;
76
 #if MYSQL_VERSION_ID >= 50000
77
-    my_bool reconnect=false;
78
+    mysql_bool reconnect=false;
79
     uint connectTimeout = 0;
80
     uint readTimeout = 0;
81
     uint writeTimeout = 0;
(-)b/devel/liteide/Makefile (-1 / +1 lines)
Lines 1-4 Link Here
1
# $FreeBSD$
1
# $FreeBSD: head/devel/liteide/Makefile 532766 2020-04-24 16:00:17Z dmgk $
2
2
3
PORTNAME=	liteide
3
PORTNAME=	liteide
4
DISTVERSIONPREFIX=	x
4
DISTVERSIONPREFIX=	x
(-)b/devel/qt5-assistant/pkg-plist (+1 lines)
Lines 1-2 Link Here
1
%%QT_BINDIR%%/assistant
1
%%QT_BINDIR%%/assistant
2
%%DEBUG%%%%QT_BINDIR%%/assistant.debug
2
share/pixmaps/assistant-qt5.png
3
share/pixmaps/assistant-qt5.png
(-)b/devel/qt5-buildtools/pkg-plist (+2 lines)
Lines 1-5 Link Here
1
%%QT_BINDIR%%/moc
1
%%QT_BINDIR%%/moc
2
%%DEBUG%%%%QT_BINDIR%%/moc.debug
2
%%QT_BINDIR%%/rcc
3
%%QT_BINDIR%%/rcc
4
%%DEBUG%%%%QT_BINDIR%%/rcc.debug
3
%%QT_BINDIR%%/syncqt.pl
5
%%QT_BINDIR%%/syncqt.pl
4
%%QT_LIBDIR%%/libQt5Bootstrap.a
6
%%QT_LIBDIR%%/libQt5Bootstrap.a
5
%%QT_LIBDIR%%/libQt5Bootstrap.prl
7
%%QT_LIBDIR%%/libQt5Bootstrap.prl
(-)b/devel/qt5-core/Makefile (-2 / +1 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	core
3
PORTNAME=	core
4
DISTVERSION=	${QT5_VERSION}
4
DISTVERSION=	${QT5_VERSION}
5
PORTREVISION=	3
6
CATEGORIES=	devel
5
CATEGORIES=	devel
7
PKGNAMEPREFIX=	qt5-
6
PKGNAMEPREFIX=	qt5-
8
7
Lines 25-31 CONFIGURE_ARGS= -no-accessibility -no-gif -no-libpng -no-libjpeg \ Link Here
25
		-no-iconv -no-dbus -no-opengl \
24
		-no-iconv -no-dbus -no-opengl \
26
		-no-egl -no-evdev \
25
		-no-egl -no-evdev \
27
		-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \
26
		-no-fontconfig -no-freetype -no-gtk -no-harfbuzz \
28
		-no-libudev -no-xcb -no-xkb -no-xcb-xlib \
27
		-no-libudev -no-xcb -no-xcb-xlib \
29
		-no-xkbcommon -no-libinput
28
		-no-xkbcommon -no-libinput
30
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
29
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
31
30
(-)a/devel/qt5-core/files/patch-git_276fa83 (-109 lines)
Removed Link Here
1
From 276fa8383a7535765be7182883ef4aade17ce013 Mon Sep 17 00:00:00 2001
2
From: Thiago Macieira <thiago.macieira@intel.com>
3
Date: Thu, 2 Apr 2020 12:08:41 -0300
4
Subject: QLibrary: fix deadlock caused by fix to QTBUG-39642
5
6
Commit ae6f73e8566fa76470937aca737141183929a5ec inserted a mutex around
7
the entire load_sys(). We had reasoed that deadlocks would only occur if
8
the object creation in instance() recursed into its own instance(),
9
which was already a bug. But we had forgotten that dlopen()/
10
LoadLibrary() executes initialization code from the module being loaded,
11
which could cause a recursion back into the same QPluginLoader or
12
QLibrary object. This recursion is benign because the module *is* loaded
13
and dlopen()/LoadLibrary() returns the same handle.
14
15
[ChangeLog][QtCore][QLibrary and QPluginLoader] Fixed a deadlock that
16
would happen if the plugin or library being loaded has load-time
17
initialization code (C++ global variables) that recursed back into the
18
same QLibrary or QPluginLoader object.
19
20
PS: QLibraryPrivate::loadPlugin() updates pluginState outside a mutex
21
lock, so pluginState should be made an atomic variable. Once that is
22
done, we'll only need locking the mutex to update errorString (no
23
locking before loading).
24
25
Fixes: QTBUG-83207
26
Task-number: QTBUG-39642
27
Change-Id: Ibdc95e9af7bd456a94ecfffd160209304e5ab2eb
28
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
29
Reviewed-by: David Faure <david.faure@kdab.com>
30
---
31
 src/corelib/plugin/qlibrary.cpp      | 2 --
32
 src/corelib/plugin/qlibrary_unix.cpp | 4 ++++
33
 src/corelib/plugin/qlibrary_win.cpp  | 3 +++
34
 3 files changed, 7 insertions(+), 2 deletions(-)
35
36
diff --git a/src/corelib/plugin/qlibrary.cpp b/src/corelib/plugin/qlibrary.cpp
37
index ddb053c26f..be9d92b204 100644
38
--- src/corelib/plugin/qlibrary.cpp
39
+++ src/corelib/plugin/qlibrary.cpp
40
@@ -576,9 +576,7 @@ bool QLibraryPrivate::load()
41
 
42
     Q_TRACE(QLibraryPrivate_load_entry, fileName);
43
 
44
-    mutex.lock();
45
     bool ret = load_sys();
46
-    mutex.unlock();
47
     if (qt_debug_component()) {
48
         if (ret) {
49
             qDebug() << "loaded library" << fileName;
50
diff --git a/src/corelib/plugin/qlibrary_unix.cpp b/src/corelib/plugin/qlibrary_unix.cpp
51
index 017aa97b66..a5c72f81d9 100644
52
--- src/corelib/plugin/qlibrary_unix.cpp
53
+++ src/corelib/plugin/qlibrary_unix.cpp
54
@@ -123,6 +123,7 @@ QStringList QLibraryPrivate::prefixes_sys()
55
 
56
 bool QLibraryPrivate::load_sys()
57
 {
58
+    QMutexLocker locker(&mutex);
59
     QString attempt;
60
     QFileSystemEntry fsEntry(fileName);
61
 
62
@@ -213,6 +214,7 @@ bool QLibraryPrivate::load_sys()
63
     }
64
 #endif
65
 
66
+    locker.unlock();
67
     bool retry = true;
68
     Handle hnd = nullptr;
69
     for (int prefix = 0; retry && !hnd && prefix < prefixes.size(); prefix++) {
70
@@ -273,6 +275,8 @@ bool QLibraryPrivate::load_sys()
71
         }
72
     }
73
 #endif
74
+
75
+    locker.relock();
76
     if (!hnd) {
77
         errorString = QLibrary::tr("Cannot load library %1: %2").arg(fileName, qdlerror());
78
     }
79
diff --git a/src/corelib/plugin/qlibrary_win.cpp b/src/corelib/plugin/qlibrary_win.cpp
80
index 000bf76276..ef58724be8 100644
81
--- src/corelib/plugin/qlibrary_win.cpp
82
+++ src/corelib/plugin/qlibrary_win.cpp
83
@@ -78,6 +78,7 @@ bool QLibraryPrivate::load_sys()
84
     //     fileName
85
     //
86
     // NB If it's a plugin we do not ever try the ".dll" extension
87
+    QMutexLocker locker(&mutex);
88
     QStringList attempts;
89
 
90
     if (pluginState != IsAPlugin)
91
@@ -95,6 +96,7 @@ bool QLibraryPrivate::load_sys()
92
         attempts.prepend(QDir::rootPath() + fileName);
93
 #endif
94
 
95
+    locker.unlock();
96
     Handle hnd = nullptr;
97
     for (const QString &attempt : qAsConst(attempts)) {
98
 #ifndef Q_OS_WINRT
99
@@ -115,6 +117,7 @@ bool QLibraryPrivate::load_sys()
100
 #ifndef Q_OS_WINRT
101
     SetErrorMode(oldmode);
102
 #endif
103
+    locker.relock();
104
     if (!hnd) {
105
         errorString = QLibrary::tr("Cannot load library %1: %2").arg(
106
                     QDir::toNativeSeparators(fileName), qt_error_string());
107
-- 
108
cgit v1.2.1
109
(-)b/devel/qt5-core/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp (-9 / +17 lines)
Lines 1-20 Link Here
1
--- src/corelib/time/qtimezoneprivate_tz.cpp.orig	2019-11-01 21:30:15 UTC
1
--- src/corelib/time/qtimezoneprivate_tz.cpp.orig	2020-05-11 08:15:08 UTC
2
+++ src/corelib/time/qtimezoneprivate_tz.cpp
2
+++ src/corelib/time/qtimezoneprivate_tz.cpp
3
@@ -1126,6 +1126,17 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
3
@@ -1153,6 +1153,25 @@ QByteArray QTzTimeZonePrivate::systemTimeZoneId() cons
4
         }
4
         }
5
     }
5
     }
6
 
6
 
7
+    // On many FreeBSD systems, /etc/localtime is a regular file while the actual name is in /var/db/zoneinfo
7
+    // On some FreeBSD systems, /etc/localtime is a regular file while 
8
+    // the actual name is in /var/db/zoneinfo
8
+    if (ianaId.isEmpty()) {
9
+    if (ianaId.isEmpty()) {
9
+        QFile tzif(QStringLiteral("/var/db/zoneinfo"));
10
+        QFile tzif(QStringLiteral("/var/db/zoneinfo"));
10
+        if (tzif.open(QIODevice::ReadOnly)) {
11
+        if (tzif.open(QIODevice::ReadOnly)) {
11
+            // TODO QTextStream inefficient, replace later
12
+            const int maximumTZNameLength = 256;
12
+            QTextStream ts(&tzif);
13
+            QByteArray tzcontents( tzif.read( maximumTZNameLength ) );
13
+            if (!ts.atEnd())
14
+            if (tzcontents.size() >= 2) {
14
+                ianaId = ts.readLine().toUtf8();
15
+                // Shortest TZ would be UTC, or r/z, but there's special
16
+                // cases "GB" and "US"
17
+                const int newlineIndex = tzcontents.indexOf('\n');
18
+                if (newlineIndex < 0) // No newline in file
19
+                    ianaId = tzcontents;
20
+                if (newlineIndex > 2) // Newline, chop it off
21
+                    ianaId = tzcontents.left(newlineIndex-1);
22
+            }
15
+        }
23
+        }
16
+    }
24
+    }
17
+
25
+
18
     // On some Red Hat distros /etc/localtime is real file with name held in /etc/sysconfig/clock
26
     // Some systems (e.g. uClibc) have a default value for $TZ in /etc/TZ:
19
     // in a line like ZONE="Europe/Oslo" or TIMEZONE="Europe/Oslo"
20
     if (ianaId.isEmpty()) {
27
     if (ianaId.isEmpty()) {
28
         QFile zone(QStringLiteral("/etc/TZ"));
(-)b/devel/qt5-core/pkg-plist (+12 lines)
Lines 9-18 Link Here
9
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracttransition_p.h
9
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qabstracttransition_p.h
10
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h
10
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qanimationgroup_p.h
11
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h
11
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbig5codec_p.h
12
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjson_p.h
13
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonarray_p.h
14
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonobject_p.h
15
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbinaryjsonvalue_p.h
12
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
16
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytearray_p.h
13
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
17
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qbytedata_p.h
14
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h
18
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarbackend_p.h
15
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h
19
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcalendarmath_p.h
20
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborcommon_p.h
16
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h
21
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcborvalue_p.h
17
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h
22
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcfsocketnotifier_p.h
18
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h
23
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qcollator_p.h
Lines 30-35 Link Here
30
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h
35
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdebug_p.h
31
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h
36
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdir_p.h
32
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h
37
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qdoublescanprint_p.h
38
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qduplicatetracker_p.h
33
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h
39
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qelfparser_p.h
34
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qendian_p.h
40
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qendian_p.h
35
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h
41
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qeucjpcodec_p.h
Lines 182-187 Link Here
182
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h
188
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qutfcodec_p.h
183
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h
189
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariant_p.h
184
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h
190
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qvariantanimation_p.h
191
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwaitcondition_p.h
185
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h
192
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowscodec_p.h
186
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h
193
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipereader_p.h
187
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h
194
%%QT_INCDIR%%/QtCore/%%FULLVER%%/QtCore/private/qwindowspipewriter_p.h
Lines 427-432 Link Here
427
%%QT_INCDIR%%/QtCore/QSignalTransition
434
%%QT_INCDIR%%/QtCore/QSignalTransition
428
%%QT_INCDIR%%/QtCore/QSize
435
%%QT_INCDIR%%/QtCore/QSize
429
%%QT_INCDIR%%/QtCore/QSizeF
436
%%QT_INCDIR%%/QtCore/QSizeF
437
%%QT_INCDIR%%/QtCore/QSocketDescriptor
430
%%QT_INCDIR%%/QtCore/QSocketNotifier
438
%%QT_INCDIR%%/QtCore/QSocketNotifier
431
%%QT_INCDIR%%/QtCore/QSortFilterProxyModel
439
%%QT_INCDIR%%/QtCore/QSortFilterProxyModel
432
%%QT_INCDIR%%/QtCore/QSpecialInteger
440
%%QT_INCDIR%%/QtCore/QSpecialInteger
Lines 559-564 Link Here
559
%%QT_INCDIR%%/QtCore/qcborcommon.h
567
%%QT_INCDIR%%/QtCore/qcborcommon.h
560
%%QT_INCDIR%%/QtCore/qcbormap.h
568
%%QT_INCDIR%%/QtCore/qcbormap.h
561
%%QT_INCDIR%%/QtCore/qcborstream.h
569
%%QT_INCDIR%%/QtCore/qcborstream.h
570
%%QT_INCDIR%%/QtCore/qcborstreamreader.h
571
%%QT_INCDIR%%/QtCore/qcborstreamwriter.h
562
%%QT_INCDIR%%/QtCore/qcborvalue.h
572
%%QT_INCDIR%%/QtCore/qcborvalue.h
563
%%QT_INCDIR%%/QtCore/qchar.h
573
%%QT_INCDIR%%/QtCore/qchar.h
564
%%QT_INCDIR%%/QtCore/qcollator.h
574
%%QT_INCDIR%%/QtCore/qcollator.h
Lines 738-749 Link Here
738
%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigVersion.cmake
748
%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreConfigVersion.cmake
739
%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreMacros.cmake
749
%%QT_CMAKEDIR%%/Qt5Core/Qt5CoreMacros.cmake
740
%%QT_BINDIR%%/qlalr
750
%%QT_BINDIR%%/qlalr
751
%%DEBUG%%%%QT_BINDIR%%/qlalr.debug
741
%%QT_LIBDIR%%/libQt5Core.prl
752
%%QT_LIBDIR%%/libQt5Core.prl
742
%%QT_LIBDIR%%/libQt5Core.so
753
%%QT_LIBDIR%%/libQt5Core.so
743
%%QT_LIBDIR%%/libQt5Core.so.5
754
%%QT_LIBDIR%%/libQt5Core.so.5
744
%%QT_LIBDIR%%/libQt5Core.so.%%SHORTVER%%
755
%%QT_LIBDIR%%/libQt5Core.so.%%SHORTVER%%
745
%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%
756
%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%
746
%%DEBUG%%%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%.debug
757
%%DEBUG%%%%QT_LIBDIR%%/libQt5Core.so.%%FULLVER%%.debug
758
%%QT_LIBDIR%%/metatypes/qt5core_metatypes.json
747
%%QT_MKSPECDIR%%/modules/qt_lib_core.pri
759
%%QT_MKSPECDIR%%/modules/qt_lib_core.pri
748
%%QT_MKSPECDIR%%/modules/qt_lib_core_private.pri
760
%%QT_MKSPECDIR%%/modules/qt_lib_core_private.pri
749
libdata/pkgconfig/Qt5Core.pc
761
libdata/pkgconfig/Qt5Core.pc
(-)b/devel/qt5-dbus/pkg-plist (+2 lines)
Lines 75-81 Link Here
75
%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%
75
%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%
76
%%DEBUG%%%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%.debug
76
%%DEBUG%%%%QT_LIBDIR%%/libQt5DBus.so.%%FULLVER%%.debug
77
%%QT_BINDIR%%/qdbuscpp2xml
77
%%QT_BINDIR%%/qdbuscpp2xml
78
%%DEBUG%%%%QT_BINDIR%%/qdbuscpp2xml.debug
78
%%QT_BINDIR%%/qdbusxml2cpp
79
%%QT_BINDIR%%/qdbusxml2cpp
80
%%DEBUG%%%%QT_BINDIR%%/qdbusxml2cpp.debug
79
%%QT_MKSPECDIR%%/modules/qt_lib_dbus.pri
81
%%QT_MKSPECDIR%%/modules/qt_lib_dbus.pri
80
%%QT_MKSPECDIR%%/modules/qt_lib_dbus_private.pri
82
%%QT_MKSPECDIR%%/modules/qt_lib_dbus_private.pri
81
libdata/pkgconfig/Qt5DBus.pc
83
libdata/pkgconfig/Qt5DBus.pc
(-)b/devel/qt5-designer/pkg-plist (+1 lines)
Lines 182-187 Link Here
182
%%QT_CMAKEDIR%%/Qt5DesignerComponents/Qt5DesignerComponentsConfigVersion.cmake
182
%%QT_CMAKEDIR%%/Qt5DesignerComponents/Qt5DesignerComponentsConfigVersion.cmake
183
%%WEBKIT%%%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
183
%%WEBKIT%%%%QT_CMAKEDIR%%/Qt5Designer/Qt5Designer_QWebViewPlugin.cmake
184
%%QT_BINDIR%%/designer
184
%%QT_BINDIR%%/designer
185
%%DEBUG%%%%QT_BINDIR%%/designer.debug
185
%%QT_LIBDIR%%/libQt5Designer.prl
186
%%QT_LIBDIR%%/libQt5Designer.prl
186
%%QT_LIBDIR%%/libQt5Designer.so
187
%%QT_LIBDIR%%/libQt5Designer.so
187
%%QT_LIBDIR%%/libQt5Designer.so.5
188
%%QT_LIBDIR%%/libQt5Designer.so.5
(-)b/devel/qt5-help/Makefile (-3 lines)
Lines 13-21 USE_QT= core gui network sql widgets \ Link Here
13
		buildtools_build sql-sqlite3_run
13
		buildtools_build sql-sqlite3_run
14
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
14
USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
15
15
16
BUILD_WRKSRC=	${WRKSRC}/src/assistant
17
INSTALL_WRKSRC=	${WRKSRC}/src/assistant
18
19
QT_BINARIES=	yes
16
QT_BINARIES=	yes
20
17
21
.include <bsd.port.mk>
18
.include <bsd.port.mk>
(-)b/devel/qt5-help/pkg-plist (-1 / +10 lines)
Lines 1-20 Link Here
1
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qfilternamedialog_p.h
1
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h
2
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpcollectionhandler_p.h
2
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdbreader_p.h
3
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpdbreader_p.h
3
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpengine_p.h
4
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpengine_p.h
5
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpfiltersettings_p.h
4
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h
6
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_default_p.h
5
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h
7
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexreader_p.h
6
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h
8
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qhelpsearchindexwriter_default_p.h
9
%%QT_INCDIR%%/QtHelp/%%FULLVER%%/QtHelp/private/qoptionswidget_p.h
7
%%QT_INCDIR%%/QtHelp/QCompressedHelpInfo
10
%%QT_INCDIR%%/QtHelp/QCompressedHelpInfo
8
%%QT_INCDIR%%/QtHelp/QHelpContentItem
11
%%QT_INCDIR%%/QtHelp/QHelpContentItem
9
%%QT_INCDIR%%/QtHelp/QHelpContentModel
12
%%QT_INCDIR%%/QtHelp/QHelpContentModel
10
%%QT_INCDIR%%/QtHelp/QHelpContentWidget
13
%%QT_INCDIR%%/QtHelp/QHelpContentWidget
11
%%QT_INCDIR%%/QtHelp/QHelpEngine
14
%%QT_INCDIR%%/QtHelp/QHelpEngine
12
%%QT_INCDIR%%/QtHelp/QHelpEngineCore
15
%%QT_INCDIR%%/QtHelp/QHelpEngineCore
13
%%QT_INCDIR%%/QtHelp/QHelpGlobal
14
%%QT_INCDIR%%/QtHelp/QHelpFilterData
16
%%QT_INCDIR%%/QtHelp/QHelpFilterData
15
%%QT_INCDIR%%/QtHelp/QHelpFilterEngine
17
%%QT_INCDIR%%/QtHelp/QHelpFilterEngine
18
%%QT_INCDIR%%/QtHelp/QHelpFilterSettingsWidget
19
%%QT_INCDIR%%/QtHelp/QHelpGlobal
16
%%QT_INCDIR%%/QtHelp/QHelpIndexModel
20
%%QT_INCDIR%%/QtHelp/QHelpIndexModel
17
%%QT_INCDIR%%/QtHelp/QHelpIndexWidget
21
%%QT_INCDIR%%/QtHelp/QHelpIndexWidget
22
%%QT_INCDIR%%/QtHelp/QHelpLink
18
%%QT_INCDIR%%/QtHelp/QHelpSearchEngine
23
%%QT_INCDIR%%/QtHelp/QHelpSearchEngine
19
%%QT_INCDIR%%/QtHelp/QHelpSearchQuery
24
%%QT_INCDIR%%/QtHelp/QHelpSearchQuery
20
%%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget
25
%%QT_INCDIR%%/QtHelp/QHelpSearchQueryWidget
Lines 30-36 Link Here
30
%%QT_INCDIR%%/QtHelp/qhelpenginecore.h
35
%%QT_INCDIR%%/QtHelp/qhelpenginecore.h
31
%%QT_INCDIR%%/QtHelp/qhelpfilterdata.h
36
%%QT_INCDIR%%/QtHelp/qhelpfilterdata.h
32
%%QT_INCDIR%%/QtHelp/qhelpfilterengine.h
37
%%QT_INCDIR%%/QtHelp/qhelpfilterengine.h
38
%%QT_INCDIR%%/QtHelp/qhelpfiltersettingswidget.h
33
%%QT_INCDIR%%/QtHelp/qhelpindexwidget.h
39
%%QT_INCDIR%%/QtHelp/qhelpindexwidget.h
40
%%QT_INCDIR%%/QtHelp/qhelplink.h
34
%%QT_INCDIR%%/QtHelp/qhelpsearchengine.h
41
%%QT_INCDIR%%/QtHelp/qhelpsearchengine.h
35
%%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h
42
%%QT_INCDIR%%/QtHelp/qhelpsearchquerywidget.h
36
%%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h
43
%%QT_INCDIR%%/QtHelp/qhelpsearchresultwidget.h
Lines 45-51 Link Here
45
%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%
52
%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%
46
%%DEBUG%%%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%.debug
53
%%DEBUG%%%%QT_LIBDIR%%/libQt5Help.so.%%FULLVER%%.debug
47
%%QT_BINDIR%%/qcollectiongenerator
54
%%QT_BINDIR%%/qcollectiongenerator
55
%%DEBUG%%%%QT_BINDIR%%/qcollectiongenerator.debug
48
%%QT_BINDIR%%/qhelpgenerator
56
%%QT_BINDIR%%/qhelpgenerator
57
%%DEBUG%%%%QT_BINDIR%%/qhelpgenerator.debug
49
%%QT_MKSPECDIR%%/modules/qt_lib_help.pri
58
%%QT_MKSPECDIR%%/modules/qt_lib_help.pri
50
%%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
59
%%QT_MKSPECDIR%%/modules/qt_lib_help_private.pri
51
libdata/pkgconfig/Qt5Help.pc
60
libdata/pkgconfig/Qt5Help.pc
(-)b/devel/qt5-linguist/pkg-plist (+1 lines)
Lines 1-4 Link Here
1
%%QT_BINDIR%%/linguist
1
%%QT_BINDIR%%/linguist
2
%%DEBUG%%%%QT_BINDIR%%/linguist.debug
2
share/pixmaps/linguist-qt5.png
3
share/pixmaps/linguist-qt5.png
3
%%QT_DATADIR%%/phrasebooks/danish.qph
4
%%QT_DATADIR%%/phrasebooks/danish.qph
4
%%QT_DATADIR%%/phrasebooks/dutch.qph
5
%%QT_DATADIR%%/phrasebooks/dutch.qph
(-)b/devel/qt5-linguisttools/pkg-plist (+6 lines)
Lines 2-11 Link Here
2
%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
2
%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake
3
%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
3
%%QT_CMAKEDIR%%/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake
4
%%QT_BINDIR%%/lconvert
4
%%QT_BINDIR%%/lconvert
5
%%DEBUG%%%%QT_BINDIR%%/lconvert.debug
5
%%QT_BINDIR%%/lprodump
6
%%QT_BINDIR%%/lprodump
7
%%DEBUG%%%%QT_BINDIR%%/lprodump.debug
6
%%QT_BINDIR%%/lrelease
8
%%QT_BINDIR%%/lrelease
7
%%QT_BINDIR%%/lrelease-pro
9
%%QT_BINDIR%%/lrelease-pro
10
%%DEBUG%%%%QT_BINDIR%%/lrelease-pro.debug
11
%%DEBUG%%%%QT_BINDIR%%/lrelease.debug
8
%%QT_BINDIR%%/lupdate
12
%%QT_BINDIR%%/lupdate
9
%%QT_BINDIR%%/lupdate-pro
13
%%QT_BINDIR%%/lupdate-pro
14
%%DEBUG%%%%QT_BINDIR%%/lupdate-pro.debug
15
%%DEBUG%%%%QT_BINDIR%%/lupdate.debug
10
man/man1/lrelease.1.gz
16
man/man1/lrelease.1.gz
11
man/man1/lupdate.1.gz
17
man/man1/lupdate.1.gz
(-)b/devel/qt5-location/pkg-plist (-1 / +7 lines)
Lines 4-9 Link Here
4
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qcache3q_p.h
4
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qcache3q_p.h
5
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecategory_p.h
5
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecategory_p.h
6
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p.h
6
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p.h
7
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecirclemapitem_p_p.h
7
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecontactdetail_p.h
8
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativecontactdetail_p.h
8
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeocodemodel_p.h
9
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeocodemodel_p.h
9
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomaneuver_p.h
10
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomaneuver_p.h
Lines 12-17 Link Here
12
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitembase_p.h
13
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitembase_p.h
13
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemgroup_p.h
14
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemgroup_p.h
14
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemtransitionmanager_p.h
15
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemtransitionmanager_p.h
16
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemutils_p.h
15
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemview_p.h
17
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapitemview_p.h
16
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapparameter_p.h
18
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapparameter_p.h
17
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapquickitem_p.h
19
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativegeomapquickitem_p.h
Lines 31-39 Link Here
31
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceimagemodel_p.h
33
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceimagemodel_p.h
32
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceuser_p.h
34
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeplaceuser_p.h
33
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p.h
35
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p.h
36
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolygonmapitem_p_p.h
34
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p.h
37
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p.h
38
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativepolylinemapitem_p_p.h
35
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeratings_p.h
39
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeratings_p.h
36
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p.h
40
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p.h
41
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativerectanglemapitem_p_p.h
37
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativereviewmodel_p.h
42
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativereviewmodel_p.h
38
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeroutemapitem_p.h
43
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativeroutemapitem_p.h
39
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesearchmodelbase_p.h
44
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qdeclarativesearchmodelbase_p.h
Lines 76-81 Link Here
76
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanager_p.h
81
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanager_p.h
77
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanagerengine_p.h
82
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoroutingmanagerengine_p.h
78
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoserviceprovider_p.h
83
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeoserviceprovider_p.h
84
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeosimplify_p.h
79
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p.h
85
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p.h
80
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p_p.h
86
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmap_p_p.h
81
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmaplabs_p.h
87
%%QT_INCDIR%%/QtLocation/%%FULLVER%%/QtLocation/private/qgeotiledmaplabs_p.h
Lines 235-243 Link Here
235
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h
241
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopolygon_p.h
236
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h
242
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfo_p.h
237
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h
243
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeopositioninfosource_p.h
244
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
238
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfo_p.h
245
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfo_p.h
239
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfosource_p.h
246
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeosatelliteinfosource_p.h
240
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeorectangle_p.h
241
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h
247
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qgeoshape_p.h
242
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h
248
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationdata_simulator_p.h
243
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationutils_p.h
249
%%QT_INCDIR%%/QtPositioning/%%FULLVER%%/QtPositioning/private/qlocationutils_p.h
(-)b/devel/qt5-qdbus/pkg-plist (+1 lines)
Line 1 Link Here
1
%%QT_BINDIR%%/qdbus
1
%%QT_BINDIR%%/qdbus
2
%%DEBUG%%%%QT_BINDIR%%/qdbus.debug
(-)b/devel/qt5-qdbusviewer/pkg-plist (+1 lines)
Lines 1-2 Link Here
1
%%QT_BINDIR%%/qdbusviewer
1
%%QT_BINDIR%%/qdbusviewer
2
%%DEBUG%%%%QT_BINDIR%%/qdbusviewer.debug
2
share/pixmaps/qdbusviewer-qt5.png
3
share/pixmaps/qdbusviewer-qt5.png
(-)b/devel/qt5-qdoc/Makefile (-4 lines)
Lines 17-26 USE_QT= core declarative buildtools_build qdoc-data_run Link Here
17
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
17
BUILD_WRKSRC=	${WRKSRC}/src/${PORTNAME}
18
INSTALL_WRKSRC=	${BUILD_WRKSRC}
18
INSTALL_WRKSRC=	${BUILD_WRKSRC}
19
19
20
PLIST_FILES=	${QT_BINDIR}/qdoc \
21
		${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfig.cmake \
22
		${QT_CMAKEDIR}/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
23
24
CONFIGURE_ENV=	LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}
20
CONFIGURE_ENV=	LLVM_INSTALL_DIR=${LOCALBASE}/llvm${LLVM_DEFAULT}
25
21
26
QT_BINARIES=	yes
22
QT_BINARIES=	yes
(-)b/devel/qt5-qdoc/pkg-plist (+4 lines)
Added Link Here
1
%%QT_BINDIR%%/qdoc
2
%%DEBUG%%%%QT_BINDIR%%/qdoc.debug
3
%%QT_CMAKEDIR%%/Qt5DocTools/Qt5DocToolsConfig.cmake
4
%%QT_CMAKEDIR%%/Qt5DocTools/Qt5DocToolsConfigVersion.cmake
(-)b/devel/qt5-qmake/pkg-plist (-1 / +4 lines)
Lines 90-95 Link Here
90
%%QT_MKSPECDIR%%/devices/freebsd-generic-clang/qplatformdefs.h
90
%%QT_MKSPECDIR%%/devices/freebsd-generic-clang/qplatformdefs.h
91
%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qmake.conf
91
%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qmake.conf
92
%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qplatformdefs.h
92
%%QT_MKSPECDIR%%/devices/freebsd-rasp-pi-clang/qplatformdefs.h
93
%%QT_MKSPECDIR%%/devices/integrity-armv8-SA8155P/qmake.conf
94
%%QT_MKSPECDIR%%/devices/integrity-armv8-SA8155P/qplatformdefs.h
93
%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qmake.conf
95
%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qmake.conf
94
%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qplatformdefs.h
96
%%QT_MKSPECDIR%%/devices/integrity-armv8-drive-cx/qplatformdefs.h
95
%%QT_MKSPECDIR%%/devices/integrity-armv8-msm8996au/qmake.conf
97
%%QT_MKSPECDIR%%/devices/integrity-armv8-msm8996au/qmake.conf
Lines 229-234 Link Here
229
%%QT_MKSPECDIR%%/features/mac/sdk.prf
231
%%QT_MKSPECDIR%%/features/mac/sdk.prf
230
%%QT_MKSPECDIR%%/features/mac/toolchain.prf
232
%%QT_MKSPECDIR%%/features/mac/toolchain.prf
231
%%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf
233
%%QT_MKSPECDIR%%/features/mac/unsupported/objc_namespace.prf
234
%%QT_MKSPECDIR%%/features/metatypes.prf
232
%%QT_MKSPECDIR%%/features/moc.prf
235
%%QT_MKSPECDIR%%/features/moc.prf
233
%%QT_MKSPECDIR%%/features/no_debug_info.prf
236
%%QT_MKSPECDIR%%/features/no_debug_info.prf
234
%%QT_MKSPECDIR%%/features/plugin_bundle.prf
237
%%QT_MKSPECDIR%%/features/plugin_bundle.prf
Lines 408-414 Link Here
408
%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app
411
%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.app
409
%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.dSYM.in
412
%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.dSYM.in
410
%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib
413
%%QT_MKSPECDIR%%/macx-ios-clang/Info.plist.lib
411
%%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.xib
414
%%QT_MKSPECDIR%%/macx-ios-clang/LaunchScreen.storyboard
412
%%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf
415
%%QT_MKSPECDIR%%/macx-ios-clang/features/default_post.prf
413
%%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf
416
%%QT_MKSPECDIR%%/macx-ios-clang/qmake.conf
414
%%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h
417
%%QT_MKSPECDIR%%/macx-ios-clang/qplatformdefs.h
(-)b/devel/qt5-remoteobjects/pkg-plist (+1 lines)
Lines 64-69 Link Here
64
%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfig.cmake
64
%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfig.cmake
65
%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfigVersion.cmake
65
%%QT_CMAKEDIR%%/Qt5RepParser/Qt5RepParserConfigVersion.cmake
66
%%QT_BINDIR%%/repc
66
%%QT_BINDIR%%/repc
67
%%DEBUG%%%%QT_BINDIR%%/repc.debug
67
%%QT_LIBDIR%%/libQt5RemoteObjects.prl
68
%%QT_LIBDIR%%/libQt5RemoteObjects.prl
68
%%QT_LIBDIR%%/libQt5RemoteObjects.so
69
%%QT_LIBDIR%%/libQt5RemoteObjects.so
69
%%QT_LIBDIR%%/libQt5RemoteObjects.so.5
70
%%QT_LIBDIR%%/libQt5RemoteObjects.so.5
(-)b/devel/qt5-scxml/pkg-plist (+1 lines)
Lines 45-50 Link Here
45
%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigVersion.cmake
45
%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlConfigVersion.cmake
46
%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlMacros.cmake
46
%%QT_CMAKEDIR%%/Qt5Scxml/Qt5ScxmlMacros.cmake
47
%%QT_BINDIR%%/qscxmlc
47
%%QT_BINDIR%%/qscxmlc
48
%%DEBUG%%%%QT_BINDIR%%/qscxmlc.debug
48
%%QT_LIBDIR%%/libQt5Scxml.prl
49
%%QT_LIBDIR%%/libQt5Scxml.prl
49
%%QT_LIBDIR%%/libQt5Scxml.so
50
%%QT_LIBDIR%%/libQt5Scxml.so
50
%%QT_LIBDIR%%/libQt5Scxml.so.5
51
%%QT_LIBDIR%%/libQt5Scxml.so.5
(-)b/devel/qt5-testlib/pkg-plist (-3 / +3 lines)
Lines 11-35 Link Here
11
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h
11
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarktimemeasurers_p.h
12
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkvalgrind_p.h
12
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qbenchmarkvalgrind_p.h
13
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h
13
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qcsvbenchmarklogger_p.h
14
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qjunittestlogger_p.h
14
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h
15
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qplaintestlogger_p.h
15
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qsignaldumper_p.h
16
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qsignaldumper_p.h
16
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qteamcitylogger_p.h
17
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtaptestlogger_p.h
17
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtaptestlogger_p.h
18
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qteamcitylogger_p.h
18
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h
19
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestblacklist_p.h
19
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h
20
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcoreelement_p.h
20
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h
21
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestcorelist_p.h
21
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h
22
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelement_p.h
22
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelementattribute_p.h
23
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestelementattribute_p.h
23
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesthelpers_p.h
24
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesthelpers_p.h
25
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestjunitstreamer_p.h
24
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h
26
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestlog_p.h
25
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h
27
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestresult_p.h
26
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h
28
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtesttable_p.h
27
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestutil_macos_p.h
29
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestutil_macos_p.h
28
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qtestxunitstreamer_p.h
29
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qttestlib-config_p.h
30
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qttestlib-config_p.h
30
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h
31
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxctestlogger_p.h
31
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h
32
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxmltestlogger_p.h
32
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/qxunittestlogger_p.h
33
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/valgrind_p.h
33
%%QT_INCDIR%%/QtTest/%%FULLVER%%/QtTest/private/valgrind_p.h
34
%%QT_INCDIR%%/QtTest/QAbstractItemModelTester
34
%%QT_INCDIR%%/QtTest/QAbstractItemModelTester
35
%%QT_INCDIR%%/QtTest/QEventSizeOfChecker
35
%%QT_INCDIR%%/QtTest/QEventSizeOfChecker
(-)b/devel/qt5/distinfo (-81 / +81 lines)
Lines 1-81 Link Here
1
TIMESTAMP = 1586029185
1
TIMESTAMP = 1590590537
2
SHA256 (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 9da82f1cc4b7d416d31ec96224c59d221473a48f6e579eef978f7d2e3932c674
2
SHA256 (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 61856f0c453b79e98b7a1e65ea8f59976fa78230ffa8dec959b5f4b45383dffd
3
SIZE (KDE/Qt/5.14.2/qt3d-everywhere-src-5.14.2.tar.xz) = 81576496
3
SIZE (KDE/Qt/5.15.0/qt3d-everywhere-src-5.15.0.tar.xz) = 81921676
4
SHA256 (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = b53517d5d128719773a2941ba52da10acd7aa3149948862bc08c98f5b64152a9
4
SHA256 (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 1b455eacfb9ef49912d7a79040ea409a6ab88dfa192d313e6b5e02a79d741b51
5
SIZE (KDE/Qt/5.14.2/qtactiveqt-everywhere-src-5.14.2.tar.xz) = 265976
5
SIZE (KDE/Qt/5.15.0/qtactiveqt-everywhere-src-5.15.0.tar.xz) = 267788
6
SHA256 (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 4a8fd92b5c49a663cf0bd492804eaf1574d11137e2cbdd41d6bf5fad0c3c4d76
6
SHA256 (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = c9019185221e94e37e250c84acaebfb7b2f5342e8ad60cdcff052ac2b85ec671
7
SIZE (KDE/Qt/5.14.2/qtandroidextras-everywhere-src-5.14.2.tar.xz) = 105844
7
SIZE (KDE/Qt/5.15.0/qtandroidextras-everywhere-src-5.15.0.tar.xz) = 183492
8
SHA256 (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 48b9e79220941665a9dd827548c6428f7aa3052ccba8f4f7e039a94aa1d2b28a
8
SHA256 (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 9e7af10aece15fa9500369efde69cb220eee8ec3a6818afe01ce1e7d484824c5
9
SIZE (KDE/Qt/5.14.2/qtbase-everywhere-src-5.14.2.tar.xz) = 49865752
9
SIZE (KDE/Qt/5.15.0/qtbase-everywhere-src-5.15.0.tar.xz) = 49931940
10
SHA256 (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = adb25203ea748d886cc3d8993c20def702115eccea311594592058134ba83bb7
10
SHA256 (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 44a24fc16abcaf9ae97ecf3215f6f3b44ebdb3b73bcb4ed3549a51519e4883a7
11
SIZE (KDE/Qt/5.14.2/qtcharts-everywhere-src-5.14.2.tar.xz) = 4250508
11
SIZE (KDE/Qt/5.15.0/qtcharts-everywhere-src-5.15.0.tar.xz) = 4250568
12
SHA256 (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = abe67b3e3a775e2a2e27c62a5391f37007ffbe72bce58b96116995616cfcbc28
12
SHA256 (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = f911fb8f8bf3a9958785d0378d25ced8989047938b7138d619854a94fa0b27dd
13
SIZE (KDE/Qt/5.14.2/qtconnectivity-everywhere-src-5.14.2.tar.xz) = 2804940
13
SIZE (KDE/Qt/5.15.0/qtconnectivity-everywhere-src-5.15.0.tar.xz) = 2803792
14
SHA256 (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 723c03db2d2805b1be4ca534ac7bc867a1a21894d33a7e9261a382f3fa9d0e20
14
SHA256 (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 8f07747f371f7c515c667240a795105c89aa83c08d88ee92fa1ef7efccea10a3
15
SIZE (KDE/Qt/5.14.2/qtdatavis3d-everywhere-src-5.14.2.tar.xz) = 5190800
15
SIZE (KDE/Qt/5.15.0/qtdatavis3d-everywhere-src-5.15.0.tar.xz) = 5190804
16
SHA256 (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = a3c4617adc9760347c93d2eb6c25d22f620cd22f44afa0494eb499a805831650
16
SHA256 (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 9c3c93fb7d340b2f7d738d12408c047318c78973cb45bfc5ff6b3a57e1fef699
17
SIZE (KDE/Qt/5.14.2/qtdeclarative-everywhere-src-5.14.2.tar.xz) = 21305980
17
SIZE (KDE/Qt/5.15.0/qtdeclarative-everywhere-src-5.15.0.tar.xz) = 21493268
18
SHA256 (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5a55cdb55af35eb222d06179567851c175f24a3732f7dee5be073df4a893172b
18
SHA256 (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 07ca8db98c317f25cc9a041c48a6824baf63893bf5b535d6f8d266dea8c7659f
19
SIZE (KDE/Qt/5.14.2/qtdoc-everywhere-src-5.14.2.tar.xz) = 5736088
19
SIZE (KDE/Qt/5.15.0/qtdoc-everywhere-src-5.15.0.tar.xz) = 5742500
20
SHA256 (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = f77daadb4755cf760e11812264259fb103396fd1b06df1e06b5df162081c8d03
20
SHA256 (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = dda54d9f90897944bed5e6af48a904a677fd97eb6f57ab08a2b232c431caf31a
21
SIZE (KDE/Qt/5.14.2/qtgamepad-everywhere-src-5.14.2.tar.xz) = 386940
21
SIZE (KDE/Qt/5.15.0/qtgamepad-everywhere-src-5.15.0.tar.xz) = 386724
22
SHA256 (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 487a7f858244a08264363733055a8cf8b00e77c658c5608cc462817d15e4b50f
22
SHA256 (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 0d2ea4bc73b9df13a4b739dcbc1e3c7b298c7e682f7f9252b232e3bde7b63eda
23
SIZE (KDE/Qt/5.14.2/qtgraphicaleffects-everywhere-src-5.14.2.tar.xz) = 14040880
23
SIZE (KDE/Qt/5.15.0/qtgraphicaleffects-everywhere-src-5.15.0.tar.xz) = 14040716
24
SHA256 (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 733eca0165c15e046b106039c989dac7f6bc2ecf215396d965ed065369264f8c
24
SHA256 (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 83f32101b1a898fcb8ed6f11a657d1125484ac0c2223014b61849d9010efebc8
25
SIZE (KDE/Qt/5.14.2/qtimageformats-everywhere-src-5.14.2.tar.xz) = 1805208
25
SIZE (KDE/Qt/5.15.0/qtimageformats-everywhere-src-5.15.0.tar.xz) = 1811092
26
SHA256 (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = c37708bc396f6dac397b49a6a268d5edb39e1c8296ca2337ce9e80bde04775cc
26
SHA256 (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = c68b0778a521e5522641c41b1778999dd408ebfda1e0de166a83743268be5f3f
27
SIZE (KDE/Qt/5.14.2/qtlocation-everywhere-src-5.14.2.tar.xz) = 6120852
27
SIZE (KDE/Qt/5.15.0/qtlocation-everywhere-src-5.15.0.tar.xz) = 6542152
28
SHA256 (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 55d1392dc92cbec11263084360075dc5fc3fdc25c1969adfbdec84299b285978
28
SHA256 (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 2053f474dcd7184fdcae2507f47af6527f6ca25b4424483f9265853c3626c833
29
SIZE (KDE/Qt/5.14.2/qtlottie-everywhere-src-5.14.2.tar.xz) = 82572
29
SIZE (KDE/Qt/5.15.0/qtlottie-everywhere-src-5.15.0.tar.xz) = 82384
30
SHA256 (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = d12587b46c84a7822194fc3ccf46f7c18ff3b31566d3dde4f5fe772f1d8776e5
30
SHA256 (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 95a8c35b30373224cdd6d1ca0bdda1a314b20e91551a4824e8ca7e50ce8ff439
31
SIZE (KDE/Qt/5.14.2/qtmacextras-everywhere-src-5.14.2.tar.xz) = 69360
31
SIZE (KDE/Qt/5.15.0/qtmacextras-everywhere-src-5.15.0.tar.xz) = 69248
32
SHA256 (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 7acd8ede6835314206e407b35b668f0add67544577fb51fe67afb03137fb9fe9
32
SHA256 (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 0708d867697f392dd3600c5c1c88f5c61b772a5250a4d059dca67b844af0fbd7
33
SIZE (KDE/Qt/5.14.2/qtmultimedia-everywhere-src-5.14.2.tar.xz) = 3793964
33
SIZE (KDE/Qt/5.15.0/qtmultimedia-everywhere-src-5.15.0.tar.xz) = 3796364
34
SHA256 (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 4f00513dd18598487d02187b80b54c669662cf8a8f2573858c7f9282d7b9265e
34
SHA256 (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 96c6107f6e85662a05f114c5b9bd3503a3100bd940e1494c73a99e77f9e7cf85
35
SIZE (KDE/Qt/5.14.2/qtnetworkauth-everywhere-src-5.14.2.tar.xz) = 141424
35
SIZE (KDE/Qt/5.15.0/qtnetworkauth-everywhere-src-5.15.0.tar.xz) = 141360
36
SHA256 (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 69b087001e8fcec5bb49ca333d5f44e6b7eb09f76421dc792fc9cd76dee9e851
36
SHA256 (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 2127f180c4889055d88e2b402b62be80a5a213a0e48d2056cc9a01d9913b3a16
37
SIZE (KDE/Qt/5.14.2/qtpurchasing-everywhere-src-5.14.2.tar.xz) = 208664
37
SIZE (KDE/Qt/5.15.0/qtpurchasing-everywhere-src-5.15.0.tar.xz) = 208560
38
SHA256 (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = d55def1dd4ee1250bd6a4e76849f4e362368b6411c2216d5f669c761216d4461
38
SHA256 (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 7072cf4cd27e9f18b36b1c48dec7c79608cf87ba847d3fc3de133f220ec1acee
39
SIZE (KDE/Qt/5.14.2/qtquickcontrols-everywhere-src-5.14.2.tar.xz) = 5981560
39
SIZE (KDE/Qt/5.15.0/qtquickcontrols-everywhere-src-5.15.0.tar.xz) = 5981340
40
SHA256 (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = faf7d349d8f4a8db36cd3c62a5724bcf689300f2fdb7dc1ea034392aab981560
40
SHA256 (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 839abda9b58cd8656b2e5f46afbb484e63df466481ace43318c4c2022684648f
41
SIZE (KDE/Qt/5.14.2/qtquickcontrols2-everywhere-src-5.14.2.tar.xz) = 8153752
41
SIZE (KDE/Qt/5.15.0/qtquickcontrols2-everywhere-src-5.15.0.tar.xz) = 8164236
42
SHA256 (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = a6a601c4f4aab6fe41a462dae57033819f697e3317240a382cee45c08be614d6
42
SHA256 (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 86fcfdce77f13c7babdec4dc1d0c4b7b6b02e40120a4250dc59e911c53c08abf
43
SIZE (KDE/Qt/5.14.2/qtremoteobjects-everywhere-src-5.14.2.tar.xz) = 376740
43
SIZE (KDE/Qt/5.15.0/qtremoteobjects-everywhere-src-5.15.0.tar.xz) = 369100
44
SHA256 (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = e9fd487ccb3cbf00e86b0b803aa79e9f6bbe7a337b8e97d069e040c3e0789bfe
44
SHA256 (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 02dc21b309621876a89671be27cea86a58e74a96aa28da65fe1b37a3aad29373
45
SIZE (KDE/Qt/5.14.2/qtscript-everywhere-src-5.14.2.tar.xz) = 2654528
45
SIZE (KDE/Qt/5.15.0/qtscript-everywhere-src-5.15.0.tar.xz) = 2654416
46
SHA256 (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 030cea352a56074f577200f967ef37c959b2767127de61f766f59b0d99763790
46
SHA256 (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 9c3a72bf5ebd07553b0049cc1943f04cff93b7e53bde8c81d652422dbf12ff72
47
SIZE (KDE/Qt/5.14.2/qtscxml-everywhere-src-5.14.2.tar.xz) = 433268
47
SIZE (KDE/Qt/5.15.0/qtscxml-everywhere-src-5.15.0.tar.xz) = 433368
48
SHA256 (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = bccfca6910b0383d8f65823496ff5011abed2fa8fd446b4b27333d0fd7bb8c61
48
SHA256 (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 12b17ed6cbe6c49c8ab71958bc5d8ad1c42bf20e2fa72613ede11001e98144da
49
SIZE (KDE/Qt/5.14.2/qtsensors-everywhere-src-5.14.2.tar.xz) = 2050616
49
SIZE (KDE/Qt/5.15.0/qtsensors-everywhere-src-5.15.0.tar.xz) = 2050404
50
SHA256 (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 0b7762175a649a40c4dd619c5de61d772235dc86099343278e2c3229d0836a91
50
SHA256 (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = cee067c84d025e221b83d109b58ea16c4d2dc0af0aea45cc6724acd33a1b7379
51
SIZE (KDE/Qt/5.14.2/qtserialbus-everywhere-src-5.14.2.tar.xz) = 349808
51
SIZE (KDE/Qt/5.15.0/qtserialbus-everywhere-src-5.15.0.tar.xz) = 351232
52
SHA256 (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = a6d977dd723ad4d3368b5163691405b8852f809974a96ec54103494e834aea21
52
SHA256 (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = ba19369069a707dffddca8d9c477bb2bb4aa26630dfee6792254c4bf9bd57a67
53
SIZE (KDE/Qt/5.14.2/qtserialport-everywhere-src-5.14.2.tar.xz) = 316492
53
SIZE (KDE/Qt/5.15.0/qtserialport-everywhere-src-5.15.0.tar.xz) = 316596
54
SHA256 (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 5e9e8ea62f0207ba894df1e136df0af9fc5443c7817d28c39f0ea2bbae9ec6da
54
SHA256 (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 7219a878c14a24d0ca18d52df1717361b13aee96ac9790baf9ad2b383492dd61
55
SIZE (KDE/Qt/5.14.2/qtspeech-everywhere-src-5.14.2.tar.xz) = 101100
55
SIZE (KDE/Qt/5.15.0/qtspeech-everywhere-src-5.15.0.tar.xz) = 101240
56
SHA256 (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = c7d7faa01a3e7a6e4d38fafcec5529a488258218749779e6fa0e09a21173b5a1
56
SHA256 (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = ee4d287e2e205ca8c08921b9cbe0fc58bf46be080b5359ad4d7fbdee44aeee0d
57
SIZE (KDE/Qt/5.14.2/qtsvg-everywhere-src-5.14.2.tar.xz) = 1880100
57
SIZE (KDE/Qt/5.15.0/qtsvg-everywhere-src-5.15.0.tar.xz) = 1870588
58
SHA256 (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 5bb0cf7832b88eb6bc9d4289f98307eb14b16a453ad6cf42cca13c4fe1a053c5
58
SHA256 (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = ddbcb49aab3a2e3672582c6e2e7bec0058feff790f67472343c79e2895e0e437
59
SIZE (KDE/Qt/5.14.2/qttools-everywhere-src-5.14.2.tar.xz) = 8815020
59
SIZE (KDE/Qt/5.15.0/qttools-everywhere-src-5.15.0.tar.xz) = 8850752
60
SHA256 (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 2088ebee9f5dd0336c9fd11436899a95b7ce0141ce072290de1e8f315d82d1a6
60
SHA256 (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 45c43268d9df50784d4d8ca345fce9288a1055fd074ac0ef508097f7aeba22fe
61
SIZE (KDE/Qt/5.14.2/qttranslations-everywhere-src-5.14.2.tar.xz) = 1348684
61
SIZE (KDE/Qt/5.15.0/qttranslations-everywhere-src-5.15.0.tar.xz) = 1356928
62
SHA256 (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 364f3338563e617e7c964a37170b415b546c5f82965e781271f9dada3e3868d7
62
SHA256 (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = f22f9204ab65578d9c8aa832a8a39108f826e00a7d391c7884ff490c587f34be
63
SIZE (KDE/Qt/5.14.2/qtvirtualkeyboard-everywhere-src-5.14.2.tar.xz) = 10957372
63
SIZE (KDE/Qt/5.15.0/qtvirtualkeyboard-everywhere-src-5.15.0.tar.xz) = 10957752
64
SHA256 (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = d31633ca718fb407cf70870613d45d0ed80aa04c058586ac3036bae1aff7832a
64
SHA256 (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 084133e10bfbd32a28125639660c59975f23457bba6a79b30a25802cec76a9fb
65
SIZE (KDE/Qt/5.14.2/qtwayland-everywhere-src-5.14.2.tar.xz) = 544532
65
SIZE (KDE/Qt/5.15.0/qtwayland-everywhere-src-5.15.0.tar.xz) = 562408
66
SHA256 (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 7d1dc8441523638c3d455c7d408ec65aebc073acab80e24063865f929231f874
66
SHA256 (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = ea80510b363e6f92ce99932f06d176e43459c4a5159fe97b5ef96fcfbab5ed4f
67
SIZE (KDE/Qt/5.14.2/qtwebchannel-everywhere-src-5.14.2.tar.xz) = 202592
67
SIZE (KDE/Qt/5.15.0/qtwebchannel-everywhere-src-5.15.0.tar.xz) = 202844
68
SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947
68
SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
69
SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568
69
SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432
70
SHA256 (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = eb4118910b65d03d8448658ac1646e860d337e59b82d6575beda21824e313417
70
SHA256 (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = f7b81f25ddf7b3a0046daa7224bc1e18c8b754b00b1a33775f30f827a5cdca15
71
SIZE (KDE/Qt/5.14.2/qtwebglplugin-everywhere-src-5.14.2.tar.xz) = 74140
71
SIZE (KDE/Qt/5.15.0/qtwebglplugin-everywhere-src-5.15.0.tar.xz) = 73956
72
SHA256 (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = f06e62b18313fe1b40a35566e79645de4a8e7ac9f7717d1d98a06c5b49afca84
72
SHA256 (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 87c2f6542778f9b65b3f208740c1d0db643fd0bede21404b9abb265355da5092
73
SIZE (KDE/Qt/5.14.2/qtwebsockets-everywhere-src-5.14.2.tar.xz) = 252820
73
SIZE (KDE/Qt/5.15.0/qtwebsockets-everywhere-src-5.15.0.tar.xz) = 253616
74
SHA256 (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = c61f9213ee84fd7408898c0194468208ffb51af9d257e87e6b53daf24f65ff4b
74
SHA256 (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = b87ea205ce79c6b438ebe596e91fa80ba11f6aac7e89ffbf52b337d0fc8d6660
75
SIZE (KDE/Qt/5.14.2/qtwebview-everywhere-src-5.14.2.tar.xz) = 132840
75
SIZE (KDE/Qt/5.15.0/qtwebview-everywhere-src-5.15.0.tar.xz) = 133044
76
SHA256 (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 980f1bc31b37c8597c0bac55f69ecf00d1677218ce82f7bc3933236cb6d907f2
76
SHA256 (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = d77f2cb2ce83bdbfd0a970bc8d7d11c96b2df16befc257d6594f79dfd92abff0
77
SIZE (KDE/Qt/5.14.2/qtwinextras-everywhere-src-5.14.2.tar.xz) = 763632
77
SIZE (KDE/Qt/5.15.0/qtwinextras-everywhere-src-5.15.0.tar.xz) = 763572
78
SHA256 (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = be9a84a03a2ee81771215264e5dff7a996d04be6192b8cdaa1d41e319a81545a
78
SHA256 (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = c72b6c188284facddcf82835af048240e721dc8d6d9e8a7bd71d76fd876881a1
79
SIZE (KDE/Qt/5.14.2/qtx11extras-everywhere-src-5.14.2.tar.xz) = 135712
79
SIZE (KDE/Qt/5.15.0/qtx11extras-everywhere-src-5.15.0.tar.xz) = 135648
80
SHA256 (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 219a876665345e3801baff71f31f30f5495c1cb9ab23fbbd27602632c80fcfb7
80
SHA256 (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 2752cf2aa25ebfda89c3736457e27b3d0c7c7ed290dcfd52c209f9f905998507
81
SIZE (KDE/Qt/5.14.2/qtxmlpatterns-everywhere-src-5.14.2.tar.xz) = 1404028
81
SIZE (KDE/Qt/5.15.0/qtxmlpatterns-everywhere-src-5.15.0.tar.xz) = 1403484
(-)b/graphics/qt5-3d/pkg-plist (-50 / +27 lines)
Lines 164-169 Link Here
164
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qframeallocator_p_p.h
164
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qframeallocator_p_p.h
165
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qhandle_p.h
165
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qhandle_p.h
166
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qjoint_p.h
166
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qjoint_p.h
167
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qloadgltf_p.h
167
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qlockableobserverinterface_p.h
168
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qlockableobserverinterface_p.h
168
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qmath3d_p.h
169
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qmath3d_p.h
169
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qnode_p.h
170
%%QT_INCDIR%%/Qt3DCore/%%FULLVER%%/Qt3DCore/private/qnode_p.h
Lines 224-235 Link Here
224
%%QT_INCDIR%%/Qt3DCore/QBackendNodeMapperPtr
225
%%QT_INCDIR%%/Qt3DCore/QBackendNodeMapperPtr
225
%%QT_INCDIR%%/Qt3DCore/QComponent
226
%%QT_INCDIR%%/Qt3DCore/QComponent
226
%%QT_INCDIR%%/Qt3DCore/QComponentAddedChange
227
%%QT_INCDIR%%/Qt3DCore/QComponentAddedChange
227
%%QT_INCDIR%%/Qt3DCore/QComponentAddedChangePtr
228
%%QT_INCDIR%%/Qt3DCore/QComponentRemovedChange
228
%%QT_INCDIR%%/Qt3DCore/QComponentRemovedChange
229
%%QT_INCDIR%%/Qt3DCore/QComponentRemovedChangePtr
230
%%QT_INCDIR%%/Qt3DCore/QComponentVector
229
%%QT_INCDIR%%/Qt3DCore/QComponentVector
231
%%QT_INCDIR%%/Qt3DCore/QDynamicPropertyUpdatedChange
230
%%QT_INCDIR%%/Qt3DCore/QDynamicPropertyUpdatedChange
232
%%QT_INCDIR%%/Qt3DCore/QDynamicPropertyUpdatedChangePtr
233
%%QT_INCDIR%%/Qt3DCore/QEntity
231
%%QT_INCDIR%%/Qt3DCore/QEntity
234
%%QT_INCDIR%%/Qt3DCore/QEntityPtr
232
%%QT_INCDIR%%/Qt3DCore/QEntityPtr
235
%%QT_INCDIR%%/Qt3DCore/QJoint
233
%%QT_INCDIR%%/Qt3DCore/QJoint
Lines 240-272 Link Here
240
%%QT_INCDIR%%/Qt3DCore/QNodeCreatedChangeBase
238
%%QT_INCDIR%%/Qt3DCore/QNodeCreatedChangeBase
241
%%QT_INCDIR%%/Qt3DCore/QNodeCreatedChangeBasePtr
239
%%QT_INCDIR%%/Qt3DCore/QNodeCreatedChangeBasePtr
242
%%QT_INCDIR%%/Qt3DCore/QNodeDestroyedChange
240
%%QT_INCDIR%%/Qt3DCore/QNodeDestroyedChange
243
%%QT_INCDIR%%/Qt3DCore/QNodeDestroyedChangePtr
244
%%QT_INCDIR%%/Qt3DCore/QNodeId
241
%%QT_INCDIR%%/Qt3DCore/QNodeId
245
%%QT_INCDIR%%/Qt3DCore/QNodeIdTypePair
242
%%QT_INCDIR%%/Qt3DCore/QNodeIdTypePair
246
%%QT_INCDIR%%/Qt3DCore/QNodePtr
243
%%QT_INCDIR%%/Qt3DCore/QNodePtr
247
%%QT_INCDIR%%/Qt3DCore/QNodeVector
244
%%QT_INCDIR%%/Qt3DCore/QNodeVector
248
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeAddedChange
245
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeAddedChange
249
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeAddedChangePtr
250
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeRemovedChange
246
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeRemovedChange
251
%%QT_INCDIR%%/Qt3DCore/QPropertyNodeRemovedChangePtr
252
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChange
247
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChange
253
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangeBase
248
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangeBase
254
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangeBasePtr
255
%%QT_INCDIR%%/Qt3DCore/QPropertyUpdatedChangePtr
256
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChange
249
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChange
257
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangeBase
250
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangeBase
258
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangeBasePtr
259
%%QT_INCDIR%%/Qt3DCore/QPropertyValueAddedChangePtr
260
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChange
251
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChange
261
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangeBase
252
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangeBase
262
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangeBasePtr
263
%%QT_INCDIR%%/Qt3DCore/QPropertyValueRemovedChangePtr
264
%%QT_INCDIR%%/Qt3DCore/QSceneChange
253
%%QT_INCDIR%%/Qt3DCore/QSceneChange
265
%%QT_INCDIR%%/Qt3DCore/QSceneChangePtr
254
%%QT_INCDIR%%/Qt3DCore/QSceneChangePtr
266
%%QT_INCDIR%%/Qt3DCore/QSkeleton
255
%%QT_INCDIR%%/Qt3DCore/QSkeleton
267
%%QT_INCDIR%%/Qt3DCore/QSkeletonLoader
256
%%QT_INCDIR%%/Qt3DCore/QSkeletonLoader
268
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyUpdatedChangeBase
257
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyUpdatedChangeBase
269
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyUpdatedChangeBasePtr
270
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyValueAddedChangeBase
258
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyValueAddedChangeBase
271
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyValueRemovedChangeBase
259
%%QT_INCDIR%%/Qt3DCore/QStaticPropertyValueRemovedChangeBase
272
%%QT_INCDIR%%/Qt3DCore/QTransform
260
%%QT_INCDIR%%/Qt3DCore/QTransform
Lines 381-386 Link Here
381
%%QT_INCDIR%%/Qt3DExtras/QSpriteSheetItem
369
%%QT_INCDIR%%/Qt3DExtras/QSpriteSheetItem
382
%%QT_INCDIR%%/Qt3DExtras/QText2DEntity
370
%%QT_INCDIR%%/Qt3DExtras/QText2DEntity
383
%%QT_INCDIR%%/Qt3DExtras/QTextureMaterial
371
%%QT_INCDIR%%/Qt3DExtras/QTextureMaterial
372
%%QT_INCDIR%%/Qt3DExtras/QTexturedMetalRoughMaterial
384
%%QT_INCDIR%%/Qt3DExtras/QTorusGeometry
373
%%QT_INCDIR%%/Qt3DExtras/QTorusGeometry
385
%%QT_INCDIR%%/Qt3DExtras/QTorusMesh
374
%%QT_INCDIR%%/Qt3DExtras/QTorusMesh
386
%%QT_INCDIR%%/Qt3DExtras/Qt3DExtras
375
%%QT_INCDIR%%/Qt3DExtras/Qt3DExtras
Lines 679-684 Link Here
679
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractpickingjob_p.h
668
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractpickingjob_p.h
680
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractrenderer_p.h
669
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/abstractrenderer_p.h
681
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/aligned_malloc_p.h
670
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/aligned_malloc_p.h
671
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/apishadermanager_p.h
682
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/armature_p.h
672
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/armature_p.h
683
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attachmentpack_p.h
673
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attachmentpack_p.h
684
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attribute_p.h
674
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/attribute_p.h
Lines 696-704 Link Here
696
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameralens_p.h
686
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameralens_p.h
697
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameraselectornode_p.h
687
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/cameraselectornode_p.h
698
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/clearbuffers_p.h
688
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/clearbuffers_p.h
699
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/commandexecuter_p.h
700
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/computecommand_p.h
689
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/computecommand_p.h
701
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/computefilteredboundingvolumejob_p.h
690
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/computefilteredboundingvolumejob_p.h
691
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/debugoverlay_p.h
702
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/dispatchcompute_p.h
692
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/dispatchcompute_p.h
703
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/effect_p.h
693
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/effect_p.h
704
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entity_p.h
694
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entity_p.h
Lines 707-713 Link Here
707
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entityvisitor_p.h
697
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/entityvisitor_p.h
708
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/environmentlight_p.h
698
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/environmentlight_p.h
709
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/expandboundingvolumejob_p.h
699
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/expandboundingvolumejob_p.h
710
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filtercompatibletechniquejob_p.h
711
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterentitybycomponentjob_p.h
700
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterentitybycomponentjob_p.h
712
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterkey_p.h
701
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterkey_p.h
713
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterlayerentityjob_p.h
702
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/filterlayerentityjob_p.h
Lines 715-721 Link Here
715
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framecleanupjob_p.h
704
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framecleanupjob_p.h
716
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphnode_p.h
705
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphnode_p.h
717
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphvisitor_p.h
706
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/framegraphvisitor_p.h
718
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frameprofiler_p.h
719
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumculling_p.h
707
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumculling_p.h
720
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumcullingjob_p.h
708
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/frustumcullingjob_p.h
721
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/genericlambdajob_p.h
709
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/genericlambdajob_p.h
Lines 723-745 Link Here
723
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometry_p.h
711
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometry_p.h
724
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderer_p.h
712
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderer_p.h
725
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderermanager_p.h
713
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/geometryrenderermanager_p.h
726
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glbuffer_p.h
727
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/glfence_p.h
728
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexture_p.h
729
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltexturemanager_p.h
730
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltfskeletonloader_p.h
714
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/gltfskeletonloader_p.h
731
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicscontext_p.h
732
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes2_p.h
733
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_1_p.h
734
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_2_p.h
735
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperes3_p.h
736
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl2_p.h
737
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl3_2_p.h
738
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl3_3_p.h
739
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelpergl4_p.h
740
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/graphicshelperinterface_p.h
741
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/handle_types_p.h
715
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/handle_types_p.h
742
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/imagesubmissioncontext_p.h
743
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/job_common_p.h
716
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/job_common_p.h
744
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/joint_p.h
717
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/joint_p.h
745
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/layer_p.h
718
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/layer_p.h
Lines 754-760 Link Here
754
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/loadskeletonjob_p.h
727
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/loadskeletonjob_p.h
755
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/managers_p.h
728
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/managers_p.h
756
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/material_p.h
729
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/material_p.h
757
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/materialparametergathererjob_p.h
758
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/memorybarrier_p.h
730
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/memorybarrier_p.h
759
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodefunctor_p.h
731
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodefunctor_p.h
760
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodemanagers_p.h
732
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nodemanagers_p.h
Lines 762-768 Link Here
762
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nopicking_p.h
734
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/nopicking_p.h
763
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/objectpicker_p.h
735
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/objectpicker_p.h
764
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/offscreensurfacehelper_p.h
736
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/offscreensurfacehelper_p.h
765
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/openglvertexarrayobject_p.h
766
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameter_p.h
737
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameter_p.h
767
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameterpack_p.h
738
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/parameterpack_p.h
768
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/pickboundingvolumejob_p.h
739
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/pickboundingvolumejob_p.h
Lines 795-800 Link Here
795
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcolormask_p.h
766
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcolormask_p.h
796
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcomputecommand_p.h
767
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcomputecommand_p.h
797
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcullface_p.h
768
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qcullface_p.h
769
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdebugoverlay_p.h
798
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdepthrange_p.h
770
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdepthrange_p.h
799
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdepthtest_p.h
771
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdepthtest_p.h
800
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdirectionallight_p.h
772
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qdirectionallight_p.h
Lines 810-816 Link Here
810
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryloaderinterface_p.h
782
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryloaderinterface_p.h
811
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryrenderer_p.h
783
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgeometryrenderer_p.h
812
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgraphicsapifilter_p.h
784
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgraphicsapifilter_p.h
813
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qgraphicsutils_p.h
814
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayer_p.h
785
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayer_p.h
815
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayerfilter_p.h
786
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlayerfilter_p.h
816
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlevelofdetail_p.h
787
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qlevelofdetail_p.h
Lines 833-839 Link Here
833
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qray3d_p.h
804
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qray3d_p.h
834
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qraycastingservice_p.h
805
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qraycastingservice_p.h
835
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderaspect_p.h
806
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderaspect_p.h
807
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendercapabilities_p.h
836
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendercapture_p.h
808
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendercapture_p.h
809
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendererplugin_p.h
810
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrendererpluginfactory_p.h
837
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpass_p.h
811
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpass_p.h
838
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpassfilter_p.h
812
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderpassfilter_p.h
839
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderplugin_p.h
813
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qrenderplugin_p.h
Lines 857-863 Link Here
857
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qscissortest_p.h
831
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qscissortest_p.h
858
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsetfence_p.h
832
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsetfence_p.h
859
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderdata_p.h
833
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderdata_p.h
834
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderformat_p.h
835
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadergenerator_p.h
836
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadergraph_p.h
837
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadergraphloader_p.h
860
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderimage_p.h
838
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderimage_p.h
839
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderlanguage_p.h
840
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadernode_p.h
841
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadernodeport_p.h
842
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshadernodesloader_p.h
861
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogram_p.h
843
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogram_p.h
862
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogrambuilder_p.h
844
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qshaderprogrambuilder_p.h
863
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsortpolicy_p.h
845
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qsortpolicy_p.h
Lines 881-895 Link Here
881
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qwaitfence_p.h
863
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/qwaitfence_p.h
882
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycaster_p.h
864
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycaster_p.h
883
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycastingjob_p.h
865
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/raycastingjob_p.h
884
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderbuffer_p.h
885
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendercapture_p.h
866
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendercapture_p.h
886
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendercommand_p.h
887
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderer_p.h
888
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderercache_p.h
889
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderlogging_p.h
867
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderlogging_p.h
890
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderpass_p.h
868
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderpass_p.h
891
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderpassfilternode_p.h
869
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderpassfilternode_p.h
892
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderqueue_p.h
893
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendersettings_p.h
870
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendersettings_p.h
894
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderstatenode_p.h
871
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderstatenode_p.h
895
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderstates_p.h
872
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderstates_p.h
Lines 899-924 Link Here
899
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendertargetoutput_p.h
876
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendertargetoutput_p.h
900
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendertargetselectornode_p.h
877
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/rendertargetselectornode_p.h
901
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderthread_p.h
878
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderthread_p.h
902
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderview_p.h
903
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewbuilder_p.h
904
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewcommandbuilderjob_p.h
905
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewcommandupdaterjob_p.h
906
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewinitializerjob_p.h
907
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/renderviewjobutils_p.h
908
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/resourceaccessor_p.h
879
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/resourceaccessor_p.h
909
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scene_p.h
880
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scene_p.h
910
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scenemanager_p.h
881
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/scenemanager_p.h
911
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/segmentsvisitor_p.h
882
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/segmentsvisitor_p.h
912
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendbuffercapturejob_p.h
883
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendbuffercapturejob_p.h
913
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sendrendercapturejob_p.h
914
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/setfence_p.h
884
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/setfence_p.h
915
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shader_p.h
885
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shader_p.h
916
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderbuilder_p.h
886
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderbuilder_p.h
917
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadercache_p.h
887
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadercache_p.h
918
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderdata_p.h
888
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderdata_p.h
919
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderimage_p.h
889
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderimage_p.h
920
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shaderparameterpack_p.h
921
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/shadervariables_p.h
922
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/skeleton_p.h
890
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/skeleton_p.h
923
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/skeletondata_p.h
891
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/skeletondata_p.h
924
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sortpolicy_p.h
892
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/sortpolicy_p.h
Lines 927-940 Link Here
927
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/statesetnode_p.h
895
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/statesetnode_p.h
928
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/statevariant_p.h
896
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/statevariant_p.h
929
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/stringtoint_p.h
897
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/stringtoint_p.h
930
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/submissioncontext_p.h
931
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/subtreeenabler_p.h
898
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/subtreeenabler_p.h
932
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/technique_p.h
899
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/technique_p.h
933
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquefilternode_p.h
900
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquefilternode_p.h
934
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquemanager_p.h
901
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/techniquemanager_p.h
935
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texture_p.h
902
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texture_p.h
903
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texturedatamanager_p.h
936
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/textureimage_p.h
904
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/textureimage_p.h
937
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/texturesubmissioncontext_p.h
938
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/transform_p.h
905
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/transform_p.h
939
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/triangleboundingvolume_p.h
906
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/triangleboundingvolume_p.h
940
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesextractor_p.h
907
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/trianglesextractor_p.h
Lines 951-956 Link Here
951
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/viewportnode_p.h
918
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/viewportnode_p.h
952
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/visitorutils_p.h
919
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/visitorutils_p.h
953
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/vsyncframeadvanceservice_p.h
920
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/vsyncframeadvanceservice_p.h
921
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/vulkaninstance_p.h
954
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/waitfence_p.h
922
%%QT_INCDIR%%/Qt3DRender/%%FULLVER%%/Qt3DRender/private/waitfence_p.h
955
%%QT_INCDIR%%/Qt3DRender/FunctorType
923
%%QT_INCDIR%%/Qt3DRender/FunctorType
956
%%QT_INCDIR%%/Qt3DRender/ParameterList
924
%%QT_INCDIR%%/Qt3DRender/ParameterList
Lines 980-985 Link Here
980
%%QT_INCDIR%%/Qt3DRender/QColorMask
948
%%QT_INCDIR%%/Qt3DRender/QColorMask
981
%%QT_INCDIR%%/Qt3DRender/QComputeCommand
949
%%QT_INCDIR%%/Qt3DRender/QComputeCommand
982
%%QT_INCDIR%%/Qt3DRender/QCullFace
950
%%QT_INCDIR%%/Qt3DRender/QCullFace
951
%%QT_INCDIR%%/Qt3DRender/QDebugOverlay
983
%%QT_INCDIR%%/Qt3DRender/QDepthRange
952
%%QT_INCDIR%%/Qt3DRender/QDepthRange
984
%%QT_INCDIR%%/Qt3DRender/QDepthTest
953
%%QT_INCDIR%%/Qt3DRender/QDepthTest
985
%%QT_INCDIR%%/Qt3DRender/QDirectionalLight
954
%%QT_INCDIR%%/Qt3DRender/QDirectionalLight
Lines 1032-1037 Link Here
1032
%%QT_INCDIR%%/Qt3DRender/QRayCaster
1001
%%QT_INCDIR%%/Qt3DRender/QRayCaster
1033
%%QT_INCDIR%%/Qt3DRender/QRayCasterHit
1002
%%QT_INCDIR%%/Qt3DRender/QRayCasterHit
1034
%%QT_INCDIR%%/Qt3DRender/QRenderAspect
1003
%%QT_INCDIR%%/Qt3DRender/QRenderAspect
1004
%%QT_INCDIR%%/Qt3DRender/QRenderCapabilities
1035
%%QT_INCDIR%%/Qt3DRender/QRenderCapture
1005
%%QT_INCDIR%%/Qt3DRender/QRenderCapture
1036
%%QT_INCDIR%%/Qt3DRender/QRenderCaptureReply
1006
%%QT_INCDIR%%/Qt3DRender/QRenderCaptureReply
1037
%%QT_INCDIR%%/Qt3DRender/QRenderPass
1007
%%QT_INCDIR%%/Qt3DRender/QRenderPass
Lines 1101-1106 Link Here
1101
%%QT_INCDIR%%/Qt3DRender/qcolormask.h
1071
%%QT_INCDIR%%/Qt3DRender/qcolormask.h
1102
%%QT_INCDIR%%/Qt3DRender/qcomputecommand.h
1072
%%QT_INCDIR%%/Qt3DRender/qcomputecommand.h
1103
%%QT_INCDIR%%/Qt3DRender/qcullface.h
1073
%%QT_INCDIR%%/Qt3DRender/qcullface.h
1074
%%QT_INCDIR%%/Qt3DRender/qdebugoverlay.h
1104
%%QT_INCDIR%%/Qt3DRender/qdepthrange.h
1075
%%QT_INCDIR%%/Qt3DRender/qdepthrange.h
1105
%%QT_INCDIR%%/Qt3DRender/qdepthtest.h
1076
%%QT_INCDIR%%/Qt3DRender/qdepthtest.h
1106
%%QT_INCDIR%%/Qt3DRender/qdirectionallight.h
1077
%%QT_INCDIR%%/Qt3DRender/qdirectionallight.h
Lines 1145-1151 Link Here
1145
%%QT_INCDIR%%/Qt3DRender/qrastermode.h
1116
%%QT_INCDIR%%/Qt3DRender/qrastermode.h
1146
%%QT_INCDIR%%/Qt3DRender/qraycaster.h
1117
%%QT_INCDIR%%/Qt3DRender/qraycaster.h
1147
%%QT_INCDIR%%/Qt3DRender/qraycasterhit.h
1118
%%QT_INCDIR%%/Qt3DRender/qraycasterhit.h
1119
%%QT_INCDIR%%/Qt3DRender/qrenderapi.h
1148
%%QT_INCDIR%%/Qt3DRender/qrenderaspect.h
1120
%%QT_INCDIR%%/Qt3DRender/qrenderaspect.h
1121
%%QT_INCDIR%%/Qt3DRender/qrendercapabilities.h
1149
%%QT_INCDIR%%/Qt3DRender/qrendercapture.h
1122
%%QT_INCDIR%%/Qt3DRender/qrendercapture.h
1150
%%QT_INCDIR%%/Qt3DRender/qrenderpass.h
1123
%%QT_INCDIR%%/Qt3DRender/qrenderpass.h
1151
%%QT_INCDIR%%/Qt3DRender/qrenderpassfilter.h
1124
%%QT_INCDIR%%/Qt3DRender/qrenderpassfilter.h
Lines 1217-1224 Link Here
1217
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake
1190
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFGeometryLoaderPlugin.cmake
1218
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake
1191
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneExportPlugin.cmake
1219
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneImportPlugin.cmake
1192
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_GLTFSceneImportPlugin.cmake
1193
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_OpenGLRendererPlugin.cmake
1220
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_Scene2DPlugin.cmake
1194
%%QT_CMAKEDIR%%/Qt53DRender/Qt53DRender_Scene2DPlugin.cmake
1221
%%QT_BINDIR%%/qgltf
1195
%%QT_BINDIR%%/qgltf
1196
%%DEBUG%%%%QT_BINDIR%%/qgltf.debug
1222
%%QT_LIBDIR%%/libQt53DAnimation.prl
1197
%%QT_LIBDIR%%/libQt53DAnimation.prl
1223
%%QT_LIBDIR%%/libQt53DAnimation.so
1198
%%QT_LIBDIR%%/libQt53DAnimation.so
1224
%%QT_LIBDIR%%/libQt53DAnimation.so.5
1199
%%QT_LIBDIR%%/libQt53DAnimation.so.5
Lines 1319-1324 Link Here
1319
%%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libdefaultgeometryloader.so.debug
1294
%%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libdefaultgeometryloader.so.debug
1320
%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so
1295
%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so
1321
%%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so.debug
1296
%%DEBUG%%%%QT_PLUGINDIR%%/geometryloaders/libgltfgeometryloader.so.debug
1297
%%QT_PLUGINDIR%%/renderers/libopenglrenderer.so
1298
%%DEBUG%%%%QT_PLUGINDIR%%/renderers/libopenglrenderer.so.debug
1322
%%QT_PLUGINDIR%%/renderplugins/libscene2d.so
1299
%%QT_PLUGINDIR%%/renderplugins/libscene2d.so
1323
%%DEBUG%%%%QT_PLUGINDIR%%/renderplugins/libscene2d.so.debug
1300
%%DEBUG%%%%QT_PLUGINDIR%%/renderplugins/libscene2d.so.debug
1324
%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so
1301
%%QT_PLUGINDIR%%/sceneparsers/libassimpsceneimport.so
(-)b/graphics/qt5-pixeltool/pkg-plist (+1 lines)
Line 1 Link Here
1
%%QT_BINDIR%%/pixeltool
1
%%QT_BINDIR%%/pixeltool
2
%%DEBUG%%%%QT_BINDIR%%/pixeltool.debug
(-)b/graphics/qt5-wayland/pkg-plist (-18 / +24 lines)
Lines 5-10 Link Here
5
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h
5
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-qt-windowmanager.h
6
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h
6
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-server-buffer-extension.h
7
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h
7
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-surface-extension.h
8
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-tablet-unstable-v2.h
8
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
9
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-text-input-unstable-v2.h
9
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h
10
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-touch-extension.h
10
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h
11
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwayland-wayland.h
Lines 50-56 Link Here
50
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandshmwindow_p.h
51
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandshmwindow_p.h
51
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsubsurface_p.h
52
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsubsurface_p.h
52
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsurface_p.h
53
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandsurface_p.h
54
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtabletv2_p.h
53
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h
55
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandtouch_p.h
56
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkaninstance_p.h
57
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandvulkanwindow_p.h
54
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h
58
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindow_p.h
55
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h
59
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/qwaylandwindowmanagerintegration_p.h
56
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h
60
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-hardware-integration-client-protocol.h
Lines 58-63 Link Here
58
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h
62
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-qt-windowmanager-client-protocol.h
59
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h
63
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-server-buffer-extension-client-protocol.h
60
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h
64
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-surface-extension-client-protocol.h
65
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-tablet-unstable-v2-client-protocol.h
61
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
66
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-text-input-unstable-v2-client-protocol.h
62
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
67
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-touch-extension-client-protocol.h
63
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h
68
%%QT_INCDIR%%/QtWaylandClient/%%FULLVER%%/QtWaylandClient/private/wayland-wayland-client-protocol.h
Lines 305-310 Link Here
305
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake
310
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_ShmServerBufferIntegrationPlugin.cmake
306
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_VulkanServerBufferIntegrationPlugin.cmake
311
%%QT_CMAKEDIR%%/Qt5WaylandCompositor/Qt5WaylandCompositor_VulkanServerBufferIntegrationPlugin.cmake
307
%%QT_BINDIR%%/qtwaylandscanner
312
%%QT_BINDIR%%/qtwaylandscanner
313
%%DEBUG%%%%QT_BINDIR%%/qtwaylandscanner.debug
308
%%QT_LIBDIR%%/libQt5WaylandClient.prl
314
%%QT_LIBDIR%%/libQt5WaylandClient.prl
309
%%QT_LIBDIR%%/libQt5WaylandClient.so
315
%%QT_LIBDIR%%/libQt5WaylandClient.so
310
%%QT_LIBDIR%%/libQt5WaylandClient.so.5
316
%%QT_LIBDIR%%/libQt5WaylandClient.so.5
Lines 345-368 Link Here
345
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so.debug
351
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-egl.so.debug
346
%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so
352
%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so
347
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug
353
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-client/libxcomposite-glx.so.debug
348
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so
354
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so
349
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdmabuf-server.so.debug
355
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-dmabuf-server-buffer.so.debug
350
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so
356
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so
351
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libdrm-egl-server.so.debug
357
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-drm-egl-server-buffer.so.debug
352
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so
358
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so
353
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so.debug
359
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-linux-dmabuf-unstable-v1.so.debug
354
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so
360
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so
355
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so.debug
361
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-shm-emulation-server.so.debug
356
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so
362
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so
357
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libshm-emulation-server.so.debug
363
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-vulkan-server.so.debug
358
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so
364
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so
359
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libvulkan-server.so.debug
365
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-egl.so.debug
360
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so
366
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so
361
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libwayland-eglstream-controller.so.debug
367
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-wayland-eglstream-controller.so.debug
362
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so
368
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so
363
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-egl.so.debug
369
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-egl.so.debug
364
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so
370
%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so
365
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libxcomposite-glx.so.debug
371
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-graphics-integration-server/libqt-wayland-compositor-xcomposite-glx.so.debug
366
%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so
372
%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so
367
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so.debug
373
%%DEBUG%%%%QT_PLUGINDIR%%/wayland-shell-integration/libfullscreen-shell-v1.so.debug
368
%%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so
374
%%QT_PLUGINDIR%%/wayland-shell-integration/libivi-shell.so
(-)b/misc/qt5-examples/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1586029328
1
TIMESTAMP = 1590590417
2
SHA256 (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = c6fcd53c744df89e7d3223c02838a33309bd1c291fcb6f9341505fe99f7f19fa
2
SHA256 (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 22b63d7a7a45183865cc4141124f12b673e7a17b1fe2b91e433f6547c5d548c3
3
SIZE (KDE/Qt/5.14.2/qt-everywhere-src-5.14.2.tar.xz) = 549205340
3
SIZE (KDE/Qt/5.15.0/qt-everywhere-src-5.15.0.tar.xz) = 592401236
(-)b/misc/qt5-examples/pkg-plist (-39 / +168 lines)
Lines 101-109 Link Here
101
%%QT_EXAMPLEDIR%%/activeqt/wrapper/wrapperax.rc
101
%%QT_EXAMPLEDIR%%/activeqt/wrapper/wrapperax.rc
102
%%QT_EXAMPLEDIR%%/aggregate/examples.pro
102
%%QT_EXAMPLEDIR%%/aggregate/examples.pro
103
%%QT_EXAMPLEDIR%%/androidextras/androidextras.pro
103
%%QT_EXAMPLEDIR%%/androidextras/androidextras.pro
104
%%QT_EXAMPLEDIR%%/androidextras/notification/android-sources/AndroidManifest.xml
104
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/AndroidManifest.xml
105
%%QT_EXAMPLEDIR%%/androidextras/notification/android-sources/res/drawable/icon.png
105
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-hdpi/icon.png
106
%%QT_EXAMPLEDIR%%/androidextras/notification/android-sources/src/org/qtproject/example/notification/NotificationClient.java
106
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-ldpi/icon.png
107
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-mdpi/icon.png
108
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-xhdpi/icon.png
109
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-xxhdpi/icon.png
110
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/res/drawable-xxxhdpi/icon.png
111
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/android/src/org/qtproject/example/jnimessenger/JniMessenger.java
112
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/doc/src/qtandroidextras-example-jnimessenger.qdoc
113
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/jnimessenger.cpp
114
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/jnimessenger.h
115
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/jnimessenger.pro
116
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.cpp
117
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/main.qml
118
%%QT_EXAMPLEDIR%%/androidextras/jnimessenger/qml.qrc
119
%%QT_EXAMPLEDIR%%/androidextras/notification/android/AndroidManifest.xml
120
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-hdpi/icon.png
121
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-ldpi/icon.png
122
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-mdpi/icon.png
123
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-xhdpi/icon.png
124
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-xxhdpi/icon.png
125
%%QT_EXAMPLEDIR%%/androidextras/notification/android/res/drawable-xxxhdpi/icon.png
126
%%QT_EXAMPLEDIR%%/androidextras/notification/android/src/org/qtproject/example/notification/NotificationClient.java
107
%%QT_EXAMPLEDIR%%/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc
127
%%QT_EXAMPLEDIR%%/androidextras/notification/doc/src/qtandroidextras-example-notification.qdoc
108
%%QT_EXAMPLEDIR%%/androidextras/notification/images/happy.png
128
%%QT_EXAMPLEDIR%%/androidextras/notification/images/happy.png
109
%%QT_EXAMPLEDIR%%/androidextras/notification/images/sad.png
129
%%QT_EXAMPLEDIR%%/androidextras/notification/images/sad.png
Lines 1494-1499 Link Here
1494
%%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint.pro
1514
%%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint.pro
1495
%%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint_pt.ts
1515
%%QT_EXAMPLEDIR%%/linguist/trollprint/trollprint_pt.ts
1496
%%QT_EXAMPLEDIR%%/location/geojson_viewer/GeoJsonDelegate.qml
1516
%%QT_EXAMPLEDIR%%/location/geojson_viewer/GeoJsonDelegate.qml
1517
%%QT_EXAMPLEDIR%%/location/geojson_viewer/GeoJsonDelegateMapObject.qml
1497
%%QT_EXAMPLEDIR%%/location/geojson_viewer/data/01-point.json
1518
%%QT_EXAMPLEDIR%%/location/geojson_viewer/data/01-point.json
1498
%%QT_EXAMPLEDIR%%/location/geojson_viewer/data/02-linestring.json
1519
%%QT_EXAMPLEDIR%%/location/geojson_viewer/data/02-linestring.json
1499
%%QT_EXAMPLEDIR%%/location/geojson_viewer/data/03-multipoint.json
1520
%%QT_EXAMPLEDIR%%/location/geojson_viewer/data/03-multipoint.json
Lines 2056-2070 Link Here
2056
%%QT_EXAMPLEDIR%%/multimediawidgets/videowidget/videoplayer.h
2077
%%QT_EXAMPLEDIR%%/multimediawidgets/videowidget/videoplayer.h
2057
%%QT_EXAMPLEDIR%%/multimediawidgets/videowidget/videowidget.pro
2078
%%QT_EXAMPLEDIR%%/multimediawidgets/videowidget/videowidget.pro
2058
%%QT_EXAMPLEDIR%%/network/README
2079
%%QT_EXAMPLEDIR%%/network/README
2059
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor.cpp
2060
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor.h
2061
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor.pro
2062
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor_240_320.ui
2063
%%QT_EXAMPLEDIR%%/network/bearermonitor/bearermonitor_640_480.ui
2064
%%QT_EXAMPLEDIR%%/network/bearermonitor/main.cpp
2065
%%QT_EXAMPLEDIR%%/network/bearermonitor/sessionwidget.cpp
2066
%%QT_EXAMPLEDIR%%/network/bearermonitor/sessionwidget.h
2067
%%QT_EXAMPLEDIR%%/network/bearermonitor/sessionwidget.ui
2068
%%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingclient.cpp
2080
%%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingclient.cpp
2069
%%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingclient.h
2081
%%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingclient.h
2070
%%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingfortuneclient.pro
2082
%%QT_EXAMPLEDIR%%/network/blockingfortuneclient/blockingfortuneclient.pro
Lines 2486-2491 Link Here
2486
%%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/mainwindow.cpp
2498
%%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/mainwindow.cpp
2487
%%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/mainwindow.h
2499
%%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/mainwindow.h
2488
%%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
2500
%%QT_EXAMPLEDIR%%/opengl/threadedqopenglwidget/threadedqopenglwidget.pro
2501
%%QT_EXAMPLEDIR%%/pdf/multipage/main.cpp
2502
%%QT_EXAMPLEDIR%%/pdf/multipage/multipage.pro
2503
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/document-open.svg
2504
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/edit-clear.svg
2505
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/edit-copy.svg
2506
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/edit-select-all.svg
2507
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-down-search.svg
2508
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-next-view-page.svg
2509
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-previous-view-page.svg
2510
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/go-up-search.svg
2511
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/rotate-left.svg
2512
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/rotate-right.svg
2513
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/test.pdf
2514
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-fit-best.svg
2515
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-fit-width.svg
2516
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-in.svg
2517
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-original.svg
2518
%%QT_EXAMPLEDIR%%/pdf/multipage/resources/zoom-out.svg
2519
%%QT_EXAMPLEDIR%%/pdf/multipage/viewer.qml
2520
%%QT_EXAMPLEDIR%%/pdf/multipage/viewer.qrc
2521
%%QT_EXAMPLEDIR%%/pdf/pdf.pro
2522
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/main.cpp
2523
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/pdfviewer.pro
2524
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/document-open.svg
2525
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-clear.svg
2526
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-copy.svg
2527
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/edit-select-all.svg
2528
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-down-search.svg
2529
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-next-view-page.svg
2530
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-previous-view-page.svg
2531
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/go-up-search.svg
2532
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/rotate-left.svg
2533
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/rotate-right.svg
2534
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/test.pdf
2535
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-fit-best.svg
2536
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-fit-width.svg
2537
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-in.svg
2538
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-original.svg
2539
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/resources/zoom-out.svg
2540
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/viewer.qml
2541
%%QT_EXAMPLEDIR%%/pdf/pdfviewer/viewer.qrc
2542
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/doc/src/pdfviewer.qdoc
2543
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/busy.png
2544
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/fileopen.png
2545
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-next-24.png
2546
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/go-previous-24.png
2547
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-in-24.png
2548
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-in-32.png
2549
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-out-24.png
2550
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/images/zoom-out-32.png
2551
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/main.cpp
2552
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.cpp
2553
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.h
2554
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/mainwindow.ui
2555
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pageselector.cpp
2556
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pageselector.h
2557
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/pdfviewer.pro
2558
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/resources.qrc
2559
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.cpp
2560
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfviewer/zoomselector.h
2561
%%QT_EXAMPLEDIR%%/pdfwidgets/pdfwidgets.pro
2489
%%QT_EXAMPLEDIR%%/positioning/geoflickr/doc/images/qml-flickr-1.jpg
2562
%%QT_EXAMPLEDIR%%/positioning/geoflickr/doc/images/qml-flickr-1.jpg
2490
%%QT_EXAMPLEDIR%%/positioning/geoflickr/doc/src/geoflickr.qdoc
2563
%%QT_EXAMPLEDIR%%/positioning/geoflickr/doc/src/geoflickr.qdoc
2491
%%QT_EXAMPLEDIR%%/positioning/geoflickr/flickr-90.qml
2564
%%QT_EXAMPLEDIR%%/positioning/geoflickr/flickr-90.qml
Lines 2623-2630 Link Here
2623
%%QT_EXAMPLEDIR%%/qml/dynamicscene/content/itemCreation.js
2696
%%QT_EXAMPLEDIR%%/qml/dynamicscene/content/itemCreation.js
2624
%%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/images/qml-dynamicscene-example.png
2697
%%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/images/qml-dynamicscene-example.png
2625
%%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/src/dynamicscene.qdoc
2698
%%QT_EXAMPLEDIR%%/qml/dynamicscene/doc/src/dynamicscene.qdoc
2699
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.pro
2626
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qml
2700
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qml
2627
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qmlproject
2701
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qmlproject
2702
%%QT_EXAMPLEDIR%%/qml/dynamicscene/dynamicscene.qrc
2703
%%QT_EXAMPLEDIR%%/qml/dynamicscene/main.cpp
2628
%%QT_EXAMPLEDIR%%/qml/locale/locale.qml
2704
%%QT_EXAMPLEDIR%%/qml/locale/locale.qml
2629
%%QT_EXAMPLEDIR%%/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc
2705
%%QT_EXAMPLEDIR%%/qml/networkaccessmanagerfactory/doc/src/networkaccessmanagerfactory.qdoc
2630
%%QT_EXAMPLEDIR%%/qml/networkaccessmanagerfactory/main.cpp
2706
%%QT_EXAMPLEDIR%%/qml/networkaccessmanagerfactory/main.cpp
Lines 2638-2645 Link Here
2638
%%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_en.ts
2714
%%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_en.ts
2639
%%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_en_AU.ts
2715
%%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_en_AU.ts
2640
%%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_fr.ts
2716
%%QT_EXAMPLEDIR%%/qml/qml-i18n/i18n/qml_fr.ts
2717
%%QT_EXAMPLEDIR%%/qml/qml-i18n/main.cpp
2718
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.pro
2641
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qml
2719
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qml
2642
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qmlproject
2720
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qmlproject
2721
%%QT_EXAMPLEDIR%%/qml/qml-i18n/qml-i18n.qrc
2643
%%QT_EXAMPLEDIR%%/qml/qml.pro
2722
%%QT_EXAMPLEDIR%%/qml/qml.pro
2644
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/doc/images/qml-plugins-example.png
2723
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/doc/images/qml-plugins-example.png
2645
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc
2724
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/doc/src/qmlpluginex.qdoc
Lines 2653-2658 Link Here
2653
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/plugins.qml
2732
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/plugins.qml
2654
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/plugins.qmlproject
2733
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/plugins.qmlproject
2655
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/qmlextensionplugins.pro
2734
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/qmlextensionplugins.pro
2735
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/timemodel.cpp
2736
%%QT_EXAMPLEDIR%%/qml/qmlextensionplugins/timemodel.h
2656
%%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/adding.pro
2737
%%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/adding.pro
2657
%%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/adding.qrc
2738
%%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/adding.qrc
2658
%%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/example.qml
2739
%%QT_EXAMPLEDIR%%/qml/referenceexamples/adding/example.qml
Lines 2783-2789 Link Here
2783
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qml
2864
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qml
2784
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qrc
2865
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/app.qrc
2785
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro
2866
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/chapter6-plugins.pro
2786
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.cpp
2787
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h
2867
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/chartsplugin.h
2788
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro
2868
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/import.pro
2789
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp
2869
%%QT_EXAMPLEDIR%%/qml/tutorials/extending-qml/chapter6-plugins/import/piechart.cpp
Lines 3304-3309 Link Here
3304
%%QT_EXAMPLEDIR%%/quick/animation/basics/images/star.png
3384
%%QT_EXAMPLEDIR%%/quick/animation/basics/images/star.png
3305
%%QT_EXAMPLEDIR%%/quick/animation/basics/images/sun.png
3385
%%QT_EXAMPLEDIR%%/quick/animation/basics/images/sun.png
3306
%%QT_EXAMPLEDIR%%/quick/animation/basics/property-animation.qml
3386
%%QT_EXAMPLEDIR%%/quick/animation/basics/property-animation.qml
3387
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/FocusRect.qml
3307
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/SideRect.qml
3388
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/SideRect.qml
3308
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/behavior-example.qml
3389
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/behavior-example.qml
3309
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/tvtennis.qml
3390
%%QT_EXAMPLEDIR%%/quick/animation/behaviors/tvtennis.qml
Lines 3354-3361 Link Here
3354
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/content/back.png
3435
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/content/back.png
3355
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/doc/images/qml-flipable-example.png
3436
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/doc/images/qml-flipable-example.png
3356
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/doc/src/flipable.qdoc
3437
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/doc/src/flipable.qdoc
3438
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.pro
3357
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qml
3439
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qml
3358
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qmlproject
3440
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qmlproject
3441
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/flipable.qrc
3442
%%QT_EXAMPLEDIR%%/quick/customitems/flipable/main.cpp
3359
%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_1.png
3443
%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_1.png
3360
%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_2.png
3444
%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/cloud_2.png
3361
%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/moon.png
3445
%%QT_EXAMPLEDIR%%/quick/customitems/maskedmousearea/images/moon.png
Lines 3381-3395 Link Here
3381
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/ScrollBar.qml
3465
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/ScrollBar.qml
3382
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png
3466
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/doc/images/qml-scrollbar-example.png
3383
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/doc/src/scrollbar.qdoc
3467
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/doc/src/scrollbar.qdoc
3468
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/main.cpp
3384
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/main.qml
3469
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/main.qml
3385
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/pics/niagara_falls.jpg
3470
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/pics/niagara_falls.jpg
3471
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.pro
3386
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.qmlproject
3472
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.qmlproject
3473
%%QT_EXAMPLEDIR%%/quick/customitems/scrollbar/scrollbar.qrc
3387
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/SearchBox.qml
3474
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/SearchBox.qml
3388
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/clear.png
3475
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/clear.png
3389
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/lineedit-bg-focus.png
3476
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/lineedit-bg-focus.png
3390
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/lineedit-bg.png
3477
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/images/lineedit-bg.png
3478
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/main.cpp
3391
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/main.qml
3479
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/main.qml
3480
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.pro
3392
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.qmlproject
3481
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.qmlproject
3482
%%QT_EXAMPLEDIR%%/quick/customitems/searchbox/searchbox.qrc
3393
%%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/Switch.qml
3483
%%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/Switch.qml
3394
%%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/background.png
3484
%%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/background.png
3395
%%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/background.svg
3485
%%QT_EXAMPLEDIR%%/quick/customitems/slideswitch/content/background.svg
Lines 3400-3413 Link Here
3400
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/Spinner.qml
3490
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/Spinner.qml
3401
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/spinner-bg.png
3491
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/spinner-bg.png
3402
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/spinner-select.png
3492
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/content/spinner-select.png
3493
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/main.cpp
3403
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/main.qml
3494
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/main.qml
3495
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.pro
3404
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.qmlproject
3496
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.qmlproject
3497
%%QT_EXAMPLEDIR%%/quick/customitems/spinner/spinner.qrc
3405
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/TabWidget.qml
3498
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/TabWidget.qml
3406
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png
3499
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/images/qml-tabwidget-example.png
3407
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/images/tab.png
3500
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/images/tab.png
3408
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/src/tabwidget.qdoc
3501
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/doc/src/tabwidget.qdoc
3502
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/main.cpp
3409
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/main.qml
3503
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/main.qml
3504
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.pro
3410
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.qmlproject
3505
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.qmlproject
3506
%%QT_EXAMPLEDIR%%/quick/customitems/tabwidget/tabwidget.qrc
3411
%%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.pro
3507
%%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.pro
3412
%%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.qml
3508
%%QT_EXAMPLEDIR%%/quick/delegatechooser/delegatechooser.qml
3413
%%QT_EXAMPLEDIR%%/quick/delegatechooser/main.cpp
3509
%%QT_EXAMPLEDIR%%/quick/delegatechooser/main.cpp
Lines 3422-3427 Link Here
3422
%%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DragTile.qml
3518
%%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DragTile.qml
3423
%%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DropTile.qml
3519
%%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/DropTile.qml
3424
%%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/tiles.qml
3520
%%QT_EXAMPLEDIR%%/quick/draganddrop/tiles/tiles.qml
3521
%%QT_EXAMPLEDIR%%/quick/draganddrop/views/Icon.qml
3425
%%QT_EXAMPLEDIR%%/quick/draganddrop/views/gridview.qml
3522
%%QT_EXAMPLEDIR%%/quick/draganddrop/views/gridview.qml
3426
%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/TextBox.qml
3523
%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/TextBox.qml
3427
%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/embeddedinwidgets.pro
3524
%%QT_EXAMPLEDIR%%/quick/embeddedinwidgets/embeddedinwidgets.pro
Lines 3743-3748 Link Here
3743
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.qrc
3840
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/fboitem.qrc
3744
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.cpp
3841
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.cpp
3745
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.qml
3842
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/main.qml
3843
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/+qsb/checker.frag
3844
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/checker.frag
3845
%%QT_EXAMPLEDIR%%/quick/scenegraph/fboitem/shaders/checker_rhi.frag
3746
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/images/graph-example.jpg
3846
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/images/graph-example.jpg
3747
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/src/graph.qdoc
3847
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/doc/src/graph.qdoc
3748
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/graph.cpp
3848
%%QT_EXAMPLEDIR%%/quick/scenegraph/graph/graph.cpp
Lines 3827-3832 Link Here
3827
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.cpp
3927
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.cpp
3828
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.pro
3928
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.pro
3829
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.qrc
3929
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerial.qrc
3930
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerialitem.cpp
3931
%%QT_EXAMPLEDIR%%/quick/scenegraph/simplematerial/simplematerialitem.h
3830
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/images/textureinthread-example.jpg
3932
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/images/textureinthread-example.jpg
3831
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/src/textureinthread.qdoc
3933
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/doc/src/textureinthread.qdoc
3832
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/error.qml
3934
%%QT_EXAMPLEDIR%%/quick/scenegraph/textureinthread/error.qml
Lines 3847-3856 Link Here
3847
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/doc/src/twotextureproviders.qdoc
3949
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/doc/src/twotextureproviders.qdoc
3848
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/main.cpp
3950
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/main.cpp
3849
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/main.qml
3951
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/main.qml
3952
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/+qsb/checker.frag
3953
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/+qsb/xorblender.frag
3954
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/+qsb/xorblender.vert
3955
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/checker.frag
3956
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/checker_rhi.frag
3957
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender.frag
3958
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender.vert
3959
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender_rhi.frag
3960
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/shaders/xorblender_rhi.vert
3850
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.pro
3961
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.pro
3851
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.qrc
3962
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/twotextureproviders.qrc
3852
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.cpp
3963
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.cpp
3853
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.h
3964
%%QT_EXAMPLEDIR%%/quick/scenegraph/twotextureproviders/xorblender.h
3965
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/doc/images/vulkantextureimport-example.jpg
3966
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/doc/src/vulkantextureimport.qdoc
3967
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/main.cpp
3968
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/main.qml
3969
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/squircle.frag.spv
3970
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/squircle.vert.spv
3971
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.cpp
3972
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.h
3973
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.pro
3974
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkantextureimport/vulkantextureimport.qrc
3854
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/images/vulkanunderqml-example.jpg
3975
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/images/vulkanunderqml-example.jpg
3855
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/src/vulkanunderqml.qdoc
3976
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/doc/src/vulkanunderqml.qdoc
3856
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/main.cpp
3977
%%QT_EXAMPLEDIR%%/quick/scenegraph/vulkanunderqml/main.cpp
Lines 3905-3910 Link Here
3905
%%QT_EXAMPLEDIR%%/quick/shapes/content/item14.qml
4026
%%QT_EXAMPLEDIR%%/quick/shapes/content/item14.qml
3906
%%QT_EXAMPLEDIR%%/quick/shapes/content/item15.qml
4027
%%QT_EXAMPLEDIR%%/quick/shapes/content/item15.qml
3907
%%QT_EXAMPLEDIR%%/quick/shapes/content/item17.qml
4028
%%QT_EXAMPLEDIR%%/quick/shapes/content/item17.qml
4029
%%QT_EXAMPLEDIR%%/quick/shapes/content/item18.qml
3908
%%QT_EXAMPLEDIR%%/quick/shapes/content/item2.qml
4030
%%QT_EXAMPLEDIR%%/quick/shapes/content/item2.qml
3909
%%QT_EXAMPLEDIR%%/quick/shapes/content/item3.qml
4031
%%QT_EXAMPLEDIR%%/quick/shapes/content/item3.qml
3910
%%QT_EXAMPLEDIR%%/quick/shapes/content/item4.qml
4032
%%QT_EXAMPLEDIR%%/quick/shapes/content/item4.qml
Lines 4041-4076 Link Here
4041
%%QT_EXAMPLEDIR%%/quick/touchinteraction/touchinteraction.qrc
4163
%%QT_EXAMPLEDIR%%/quick/touchinteraction/touchinteraction.qrc
4042
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml
4164
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/PetsModel.qml
4043
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml
4165
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview.qml
4166
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.pro
4044
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qmlproject
4167
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qmlproject
4168
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/dynamicview1.qrc
4169
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview1/main.cpp
4045
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml
4170
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/PetsModel.qml
4046
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml
4171
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview.qml
4172
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.pro
4047
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qmlproject
4173
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qmlproject
4174
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/dynamicview2.qrc
4175
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview2/main.cpp
4048
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml
4176
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/PetsModel.qml
4049
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml
4177
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview.qml
4178
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.pro
4050
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qmlproject
4179
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qmlproject
4180
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/dynamicview3.qrc
4181
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview3/main.cpp
4051
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml
4182
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/ListSelector.qml
4052
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml
4183
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/PetsModel.qml
4053
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
4184
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview.qml
4185
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.pro
4054
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qmlproject
4186
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qmlproject
4187
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/dynamicview4.qrc
4188
%%QT_EXAMPLEDIR%%/quick/tutorials/dynamicview/dynamicview4/main.cpp
4055
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/Cell.qml
4189
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/Cell.qml
4056
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial1.qml
4190
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial1.qml
4057
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial2.qml
4191
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial2.qml
4058
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial3.qml
4192
%%QT_EXAMPLEDIR%%/quick/tutorials/helloworld/tutorial3.qml
4059
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/Block.qml
4193
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/Block.qml
4060
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/Button.qml
4194
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/Button.qml
4195
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/main.cpp
4061
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame.qml
4196
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame.qml
4197
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.pro
4062
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.qmlproject
4198
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.qmlproject
4199
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame1/samegame1.qrc
4063
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/Block.qml
4200
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/Block.qml
4064
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/Button.qml
4201
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/Button.qml
4202
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/main.cpp
4065
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame.js
4203
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame.js
4066
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame.qml
4204
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame.qml
4205
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.pro
4067
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.qmlproject
4206
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.qmlproject
4207
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame2/samegame2.qrc
4068
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Block.qml
4208
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Block.qml
4069
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Button.qml
4209
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Button.qml
4070
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Dialog.qml
4210
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/Dialog.qml
4211
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/main.cpp
4071
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame.js
4212
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame.js
4072
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame.qml
4213
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame.qml
4214
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.pro
4073
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.qmlproject
4215
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.qmlproject
4216
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame3/samegame3.qrc
4074
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/BoomBlock.qml
4217
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/BoomBlock.qml
4075
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/Button.qml
4218
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/Button.qml
4076
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/Dialog.qml
4219
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/content/Dialog.qml
Lines 4079-4086 Link Here
4079
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/score_data.xml
4222
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/score_data.xml
4080
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
4223
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/score_style.xsl
4081
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/scores.php
4224
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/highscores/scores.php
4225
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/main.cpp
4082
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame.qml
4226
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame.qml
4227
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.pro
4083
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qmlproject
4228
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qmlproject
4229
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/samegame4/samegame4.qrc
4084
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/background.jpg
4230
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/background.jpg
4085
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/blueStar.png
4231
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/blueStar.png
4086
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/blueStone.png
4232
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/blueStone.png
Lines 4088-4098 Link Here
4088
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/greenStone.png
4234
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/greenStone.png
4089
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/redStar.png
4235
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/redStar.png
4090
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/redStone.png
4236
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/redStone.png
4237
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/shared.qrc
4091
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/star.png
4238
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/star.png
4092
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/yellowStone.png
4239
%%QT_EXAMPLEDIR%%/quick/tutorials/samegame/shared/pics/yellowStone.png
4093
%%QT_EXAMPLEDIR%%/quick/tutorials/tutorials.pro
4240
%%QT_EXAMPLEDIR%%/quick/tutorials/tutorials.pro
4094
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/delegatemodel.qmlproject
4241
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/delegatemodel.qmlproject
4095
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/dragselection.qml
4242
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/dragselection.qml
4243
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/flipable.pro
4244
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/flipable.qrc
4245
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/main.cpp
4096
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/slideshow.qml
4246
%%QT_EXAMPLEDIR%%/quick/views/delegatemodel/slideshow.qml
4097
%%QT_EXAMPLEDIR%%/quick/views/doc/images/qml-modelviews-example.png
4247
%%QT_EXAMPLEDIR%%/quick/views/doc/images/qml-modelviews-example.png
4098
%%QT_EXAMPLEDIR%%/quick/views/doc/src/views.qdoc
4248
%%QT_EXAMPLEDIR%%/quick/views/doc/src/views.qdoc
Lines 5739-5759 Link Here
5739
%%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/default.svg
5889
%%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/default.svg
5740
%%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/v-slider-handle.svg
5890
%%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/files/v-slider-handle.svg
5741
%%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/main.cpp
5891
%%QT_EXAMPLEDIR%%/svg/embeddedsvgviewer/main.cpp
5742
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bearercloud.cpp
5743
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bearercloud.h
5744
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bearercloud.pro
5745
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/bluetooth.svg
5746
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/cell.svg
5747
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/cloud.cpp
5748
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/cloud.h
5749
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/gprs.svg
5750
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/icons.qrc
5751
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/lan.svg
5752
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/main.cpp
5753
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/umts.svg
5754
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/unknown.svg
5755
%%QT_EXAMPLEDIR%%/svg/network/bearercloud/wlan.svg
5756
%%QT_EXAMPLEDIR%%/svg/network/network.pro
5757
%%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/bubbles.svg
5892
%%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/bubbles.svg
5758
%%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/designer.png
5893
%%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/designer.png
5759
%%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/framebufferobject.pro
5894
%%QT_EXAMPLEDIR%%/svg/opengl/framebufferobject/framebufferobject.pro
Lines 6709-6714 Link Here
6709
%%QT_EXAMPLEDIR%%/widgets/doc/src/fontsampler.qdoc
6844
%%QT_EXAMPLEDIR%%/widgets/doc/src/fontsampler.qdoc
6710
%%QT_EXAMPLEDIR%%/widgets/doc/src/fridgemagnets.qdoc
6845
%%QT_EXAMPLEDIR%%/widgets/doc/src/fridgemagnets.qdoc
6711
%%QT_EXAMPLEDIR%%/widgets/doc/src/frozencolumn.qdoc
6846
%%QT_EXAMPLEDIR%%/widgets/doc/src/frozencolumn.qdoc
6847
%%QT_EXAMPLEDIR%%/widgets/doc/src/gallery.qdoc
6712
%%QT_EXAMPLEDIR%%/widgets/doc/src/gradients.qdoc
6848
%%QT_EXAMPLEDIR%%/widgets/doc/src/gradients.qdoc
6713
%%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-anchorlayout.qdoc
6849
%%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-anchorlayout.qdoc
6714
%%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-flowlayout.qdoc
6850
%%QT_EXAMPLEDIR%%/widgets/doc/src/graphicsview-flowlayout.qdoc
Lines 6839-6844 Link Here
6839
%%QT_EXAMPLEDIR%%/widgets/effects/fademessage/fademessage.pro
6975
%%QT_EXAMPLEDIR%%/widgets/effects/fademessage/fademessage.pro
6840
%%QT_EXAMPLEDIR%%/widgets/effects/fademessage/fademessage.qrc
6976
%%QT_EXAMPLEDIR%%/widgets/effects/fademessage/fademessage.qrc
6841
%%QT_EXAMPLEDIR%%/widgets/effects/fademessage/main.cpp
6977
%%QT_EXAMPLEDIR%%/widgets/effects/fademessage/main.cpp
6978
%%QT_EXAMPLEDIR%%/widgets/gallery/gallery.pro
6979
%%QT_EXAMPLEDIR%%/widgets/gallery/main.cpp
6980
%%QT_EXAMPLEDIR%%/widgets/gallery/widgetgallery.cpp
6981
%%QT_EXAMPLEDIR%%/widgets/gallery/widgetgallery.h
6842
%%QT_EXAMPLEDIR%%/widgets/gestures/gestures.pro
6982
%%QT_EXAMPLEDIR%%/widgets/gestures/gestures.pro
6843
%%QT_EXAMPLEDIR%%/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc
6983
%%QT_EXAMPLEDIR%%/widgets/gestures/imagegestures/doc/src/imagegestures.qdoc
6844
%%QT_EXAMPLEDIR%%/widgets/gestures/imagegestures/imagegestures.pro
6984
%%QT_EXAMPLEDIR%%/widgets/gestures/imagegestures/imagegestures.pro
Lines 8064-8080 Link Here
8064
%%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.cpp
8204
%%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.cpp
8065
%%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.h
8205
%%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.h
8066
%%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.pro
8206
%%QT_EXAMPLEDIR%%/xml/rsslisting/rsslisting.pro
8067
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/doc/images/saxbookmarks-example.png
8068
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/doc/src/saxbookmarks.qdoc
8069
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/jennifer.xbel
8070
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/main.cpp
8071
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/mainwindow.cpp
8072
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/mainwindow.h
8073
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/saxbookmarks.pro
8074
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelgenerator.cpp
8075
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelgenerator.h
8076
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelhandler.cpp
8077
%%QT_EXAMPLEDIR%%/xml/saxbookmarks/xbelhandler.h
8078
%%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-filemenu.png
8207
%%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-filemenu.png
8079
%%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-helpmenu.png
8208
%%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-helpmenu.png
8080
%%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-screenshot.png
8209
%%QT_EXAMPLEDIR%%/xml/streambookmarks/doc/images/xmlstreamexample-screenshot.png
(-)b/multimedia/qt5-multimedia/pkg-plist (-1 / +1 lines)
Lines 31-40 Link Here
31
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h
31
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsoundeffect_qaudio_p.h
32
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
32
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
33
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
33
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
34
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
35
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
34
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
36
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h
35
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h
37
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaceoutput_p.h
36
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaceoutput_p.h
37
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideosurfaces_p.h
38
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qwavedecoder_p.h
38
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qwavedecoder_p.h
39
%%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo
39
%%QT_INCDIR%%/QtMultimedia/QAbstractAudioDeviceInfo
40
%%QT_INCDIR%%/QtMultimedia/QAbstractAudioInput
40
%%QT_INCDIR%%/QtMultimedia/QAbstractAudioInput
(-)b/net/qt5-network/Makefile (-1 / +8 lines)
Lines 22-27 INSTALL_WRKSRC= ${BUILD_WRKSRC} Link Here
22
QT_DEFINES=	OPENSSL SSL
22
QT_DEFINES=	OPENSSL SSL
23
QT_CONFIG=	openssl
23
QT_CONFIG=	openssl
24
24
25
.include <bsd.port.pre.mk>
26
27
.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200085 && ${SSL_DEFAULT} == "base"
28
# 1200085	339270	October 19, 2018	12.0-STABLE after updating OpenSSL to version 1.1.1.
29
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
30
.endif
31
25
post-patch:
32
post-patch:
26
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
33
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
27
		${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp
34
		${BUILD_WRKSRC}/ssl/qsslsocket_openssl.cpp
Lines 44-47 post-install: Link Here
44
		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
51
		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} \
45
		${MAKE_ARGS} ${INSTALL_TARGET}
52
		${MAKE_ARGS} ${INSTALL_TARGET}
46
53
47
.include <bsd.port.mk>
54
.include <bsd.port.post.mk>
(-)b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp (+18 lines)
Added Link Here
1
--- src/network/ssl/qsslcontext_openssl.cpp.orig	2020-05-17 21:00:32 UTC
2
+++ src/network/ssl/qsslcontext_openssl.cpp
3
@@ -696,6 +696,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
4
     }
5
 #endif // ocsp
6
 
7
+#if !defined(LIBRESSL_VERSION_NUMBER)
8
     QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
9
     if (cctx) {
10
         q_SSL_CONF_CTX_set_ssl_ctx(cctx.data(), sslContext->ctx);
11
@@ -746,6 +747,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
12
         sslContext->errorStr = msgErrorSettingBackendConfig(QSslSocket::tr("SSL_CONF_CTX_new() failed"));
13
         sslContext->errorCode = QSslError::UnspecifiedError;
14
     }
15
+#endif
16
 }
17
 
18
 QT_END_NAMESPACE
(-)a/net/qt5-network/files/patch-src_network_ssl_qsslcontext_openssl.cpp (-11 lines)
Removed Link Here
1
--- src/network/ssl/qsslcontext_openssl.cpp.orig	2019-10-01 08:05:51 UTC
2
+++ src/network/ssl/qsslcontext_openssl.cpp
3
@@ -265,7 +265,7 @@ void QSslContext::applyBackendConfig(QSslContext *sslC
4
     }
5
 #endif // ocsp
6
 
7
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
8
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
9
     if (QSslSocket::sslLibraryVersionNumber() >= 0x10002000L) {
10
         QSharedPointer<SSL_CONF_CTX> cctx(q_SSL_CONF_CTX_new(), &q_SSL_CONF_CTX_free);
11
         if (cctx) {
(-)b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp (-26 / +27 lines)
Lines 1-7 Link Here
1
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2019-10-25 09:16:48.000000000 +0200
1
--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2020-05-05 11:59:27 UTC
2
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp	2019-11-01 20:03:08.715014000 +0100
2
+++ src/network/ssl/qsslsocket_openssl_symbols.cpp
3
@@ -152,6 +152,14 @@
3
@@ -147,6 +147,14 @@ DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *
4
 DEFINEFUNC(int, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX *c, c, return 0, return)
4
 DEFINEFUNC(int, EVP_PKEY_up_ref, EVP_PKEY *a, a, return 0, return)
5
 DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
5
 DEFINEFUNC(int, EVP_PKEY_base_id, EVP_PKEY *a, a, return NID_undef, return)
6
 DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
6
 DEFINEFUNC(int, RSA_bits, RSA *a, a, return 0, return)
7
+#ifdef LIBRESSL_VERSION_NUMBER
7
+#ifdef LIBRESSL_VERSION_NUMBER
Lines 15-21 Link Here
15
 DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
15
 DEFINEFUNC(int, DSA_bits, DSA *a, a, return 0, return)
16
 DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
16
 DEFINEFUNC(int, OPENSSL_sk_num, OPENSSL_STACK *a, a, return -1, return)
17
 DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
17
 DEFINEFUNC2(void, OPENSSL_sk_pop_free, OPENSSL_STACK *a, a, void (*b)(void*), b, return, DUMMYARG)
18
@@ -159,6 +167,7 @@
18
@@ -154,6 +162,7 @@ DEFINEFUNC(OPENSSL_STACK *, OPENSSL_sk_new_null, DUMMY
19
 DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
19
 DEFINEFUNC2(void, OPENSSL_sk_push, OPENSSL_STACK *a, a, void *b, b, return, DUMMYARG)
20
 DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
20
 DEFINEFUNC(void, OPENSSL_sk_free, OPENSSL_STACK *a, a, return, DUMMYARG)
21
 DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
21
 DEFINEFUNC2(void *, OPENSSL_sk_value, OPENSSL_STACK *a, a, int b, b, return nullptr, return)
Lines 23-50 Link Here
23
 DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
23
 DEFINEFUNC(int, SSL_session_reused, SSL *a, a, return 0, return)
24
 DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
24
 DEFINEFUNC2(unsigned long, SSL_CTX_set_options, SSL_CTX *ctx, ctx, unsigned long op, op, return 0, return)
25
 #ifdef TLS1_3_VERSION
25
 #ifdef TLS1_3_VERSION
26
@@ -443,7 +452,7 @@
26
@@ -351,12 +360,14 @@ DEFINEFUNC2(int, SSL_CTX_use_PrivateKey, SSL_CTX *a, a
27
 DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
27
 DEFINEFUNC2(int, SSL_CTX_use_RSAPrivateKey, SSL_CTX *a, a, RSA *b, b, return -1, return)
28
 DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
28
 DEFINEFUNC3(int, SSL_CTX_use_PrivateKey_file, SSL_CTX *a, a, const char *b, b, int c, c, return -1, return)
29
 DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
29
 DEFINEFUNC(X509_STORE *, SSL_CTX_get_cert_store, const SSL_CTX *a, a, return nullptr, return)
30
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
30
+#if !defined(LIBRESSL_VERSION_NUMBER)
31
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
32
 DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
31
 DEFINEFUNC(SSL_CONF_CTX *, SSL_CONF_CTX_new, DUMMYARG, DUMMYARG, return nullptr, return);
33
 DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
32
 DEFINEFUNC(void, SSL_CONF_CTX_free, SSL_CONF_CTX *a, a, return ,return);
34
 DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
33
 DEFINEFUNC2(void, SSL_CONF_CTX_set_ssl_ctx, SSL_CONF_CTX *a, a, SSL_CTX *b, b, return, return);
35
@@ -839,8 +848,8 @@
34
 DEFINEFUNC2(unsigned int, SSL_CONF_CTX_set_flags, SSL_CONF_CTX *a, a, unsigned int b, b, return 0, return);
36
 #endif
35
 DEFINEFUNC(int, SSL_CONF_CTX_finish, SSL_CONF_CTX *a, a, return 0, return);
37
 #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
36
 DEFINEFUNC3(int, SSL_CONF_cmd, SSL_CONF_CTX *a, a, const char *b, b, const char *c, c, return 0, return);
38
     // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
37
+#endif
39
-    libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER));
38
 DEFINEFUNC(void, SSL_free, SSL *a, a, return, DUMMYARG)
40
-    libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER));
39
 DEFINEFUNC(STACK_OF(SSL_CIPHER) *, SSL_get_ciphers, const SSL *a, a, return nullptr, return)
41
+    libssl->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libssl"), QLatin1String(SHLIB_VERSION_NUMBER));
40
 DEFINEFUNC(const SSL_CIPHER *, SSL_get_current_cipher, SSL *a, a, return nullptr, return)
42
+    libcrypto->setFileNameAndVersion(QLatin1String("%%OPENSSLLIB%%/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER));
41
@@ -834,12 +845,21 @@ bool q_resolveOpenSslSymbols()
43
     if (libcrypto->load() && libssl->load()) {
42
     RESOLVEFUNC(EVP_PKEY_up_ref)
44
         // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
45
         return pair;
46
@@ -980,12 +989,21 @@
47
     RESOLVEFUNC(EVP_CIPHER_CTX_reset)
48
     RESOLVEFUNC(EVP_PKEY_base_id)
43
     RESOLVEFUNC(EVP_PKEY_base_id)
49
     RESOLVEFUNC(RSA_bits)
44
     RESOLVEFUNC(RSA_bits)
50
+#ifdef LIBRESSL_VERSION_NUMBER
45
+#ifdef LIBRESSL_VERSION_NUMBER
Lines 64-71 Link Here
64
+#endif
59
+#endif
65
     RESOLVEFUNC(DH_get0_pqg)
60
     RESOLVEFUNC(DH_get0_pqg)
66
     RESOLVEFUNC(SSL_CTX_set_options)
61
     RESOLVEFUNC(SSL_CTX_set_options)
67
 #ifdef TLS1_3_VERSION
62
 
68
@@ -1024,7 +1042,9 @@
63
@@ -881,7 +901,9 @@ bool q_resolveOpenSslSymbols()
69
 
64
 
70
     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
65
     RESOLVEFUNC(SSL_SESSION_get_ticket_lifetime_hint)
71
     RESOLVEFUNC(DH_bits)
66
     RESOLVEFUNC(DH_bits)
Lines 75-86 Link Here
75
 
70
 
76
 #if QT_CONFIG(dtls)
71
 #if QT_CONFIG(dtls)
77
     RESOLVEFUNC(DTLSv1_listen)
72
     RESOLVEFUNC(DTLSv1_listen)
78
@@ -1280,7 +1300,7 @@
73
@@ -1041,12 +1063,14 @@ bool q_resolveOpenSslSymbols()
79
     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
74
     RESOLVEFUNC(SSL_CTX_use_RSAPrivateKey)
80
     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
75
     RESOLVEFUNC(SSL_CTX_use_PrivateKey_file)
81
     RESOLVEFUNC(SSL_CTX_get_cert_store);
76
     RESOLVEFUNC(SSL_CTX_get_cert_store);
82
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
77
+#if !defined(LIBRESSL_VERSION_NUMBER)
83
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)
84
     RESOLVEFUNC(SSL_CONF_CTX_new);
78
     RESOLVEFUNC(SSL_CONF_CTX_new);
85
     RESOLVEFUNC(SSL_CONF_CTX_free);
79
     RESOLVEFUNC(SSL_CONF_CTX_free);
86
     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
80
     RESOLVEFUNC(SSL_CONF_CTX_set_ssl_ctx);
81
     RESOLVEFUNC(SSL_CONF_CTX_set_flags);
82
     RESOLVEFUNC(SSL_CONF_CTX_finish);
83
     RESOLVEFUNC(SSL_CONF_cmd);
84
+#endif
85
     RESOLVEFUNC(SSL_accept)
86
     RESOLVEFUNC(SSL_clear)
87
     RESOLVEFUNC(SSL_connect)
(-)b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h (-14 / +40 lines)
Lines 1-8 Link Here
1
--- src/network/ssl/qsslsocket_openssl11_symbols_p.h.orig	2019-10-01 07:47:24 UTC
1
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2020-05-05 11:59:27 UTC
2
+++ src/network/ssl/qsslsocket_openssl11_symbols_p.h
2
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
3
@@ -77,20 +77,49 @@
3
@@ -72,6 +72,14 @@
4
 #include "qsslsocket_openssl_p.h"
5
 #include <QtCore/qglobal.h>
4
 
6
 
5
 const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
7
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
8
+# define TLS1_2_VERSION 0x0303
9
+# define TLS_MAX_VERSION TLS1_2_VERSION
10
+# define TLS_ANY_VERSION 0x10000
11
+# define DTLS1_2_VERSION                 0xFEFD
12
+# define DTLS_MAX_VERSION                DTLS1_2_VERSION
13
+#endif
14
+
15
 #if QT_CONFIG(ocsp)
16
 #include "qocsp_p.h"
17
 #endif
18
@@ -225,22 +233,50 @@ QT_BEGIN_NAMESPACE
19
 // content of the header here. Later, can be better sorted/split into groups,
20
 // depending on the functionality.
6
 
21
 
7
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
22
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
8
+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
23
+// LibreSSL 2.7 has stack_st but not OPENSSL_STACK
Lines 13-19 Link Here
13
+typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
28
+typedef int (*X509_STORE_CTX_verify_cb)(int, X509_STORE_CTX *);
14
+#endif
29
+#endif
15
+
30
+
16
+
31
 const unsigned char * q_ASN1_STRING_get0_data(const ASN1_STRING *x);
32
 
17
 Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
33
 Q_AUTOTEST_EXPORT BIO *q_BIO_new(const BIO_METHOD *a);
18
 Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
34
 Q_AUTOTEST_EXPORT const BIO_METHOD *q_BIO_s_mem();
19
 
35
 
Lines 50-71 Link Here
50
 int q_SSL_session_reused(SSL *a);
66
 int q_SSL_session_reused(SSL *a);
51
 unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
67
 unsigned long q_SSL_CTX_set_options(SSL_CTX *ctx, unsigned long op);
52
 int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
68
 int q_OPENSSL_init_ssl(uint64_t opts, const OPENSSL_INIT_SETTINGS *settings);
53
@@ -113,12 +142,15 @@
69
@@ -266,8 +302,13 @@ int q_DH_bits(DH *dh);
54
 void q_DH_get0_pqg(const DH *dh, const BIGNUM **p, const BIGNUM **q, const BIGNUM **g);
70
 # define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
55
 int q_DH_bits(DH *dh);
56
 
57
-# define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
58
+#define q_SSL_load_error_strings() q_OPENSSL_init_ssl(OPENSSL_INIT_LOAD_SSL_STRINGS \
59
                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
71
                                                        | OPENSSL_INIT_LOAD_CRYPTO_STRINGS, NULL)
60
-
72
 
61
+#ifdef LIBRESSL_VERSION_NUMBER
73
+#ifdef LIBRESSL_VERSION_NUMBER
62
+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
74
+#define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_sk_num)(st)
63
+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
75
+#define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_sk_value)(st, i)
64
+#else
76
+#else
65
 #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
77
 #define q_SKM_sk_num(type, st) ((int (*)(const STACK_OF(type) *))q_OPENSSL_sk_num)(st)
66
 #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
78
 #define q_SKM_sk_value(type, st,i) ((type * (*)(const STACK_OF(type) *, int))q_OPENSSL_sk_value)(st, i)
67
-
68
+#endif
79
+#endif
80
 
69
 #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
81
 #define q_OPENSSL_add_all_algorithms_conf()  q_OPENSSL_init_crypto(OPENSSL_INIT_ADD_ALL_CIPHERS \
70
                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
82
                                                                    | OPENSSL_INIT_ADD_ALL_DIGESTS \
71
                                                                    | OPENSSL_INIT_LOAD_CONFIG, NULL)
83
@@ -494,12 +535,14 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
84
 int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
85
 int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
86
 X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
87
+#if !defined(LIBRESSL_VERSION_NUMBER)
88
 SSL_CONF_CTX *q_SSL_CONF_CTX_new();
89
 void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
90
 void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
91
 unsigned int q_SSL_CONF_CTX_set_flags(SSL_CONF_CTX *a, unsigned int b);
92
 int q_SSL_CONF_CTX_finish(SSL_CONF_CTX *a);
93
 int q_SSL_CONF_cmd(SSL_CONF_CTX *a, const char *b, const char *c);
94
+#endif
95
 void q_SSL_free(SSL *a);
96
 STACK_OF(SSL_CIPHER) *q_SSL_get_ciphers(const SSL *a);
97
 const SSL_CIPHER *q_SSL_get_current_cipher(SSL *a);
(-)a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl.cpp (-11 lines)
Removed Link Here
1
--- src/network/ssl/qsslsocket_openssl.cpp.orig	2019-10-01 08:09:52 UTC
2
+++ src/network/ssl/qsslsocket_openssl.cpp
3
@@ -604,7 +604,7 @@ bool QSslSocketBackendPrivate::initSslContext()
4
             q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback);
5
     }
6
 #endif
7
-#if OPENSSL_VERSION_NUMBER >= 0x10101006L
8
+#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER)
9
     // Set the client callback for TLSv1.3 PSK
10
     if (mode == QSslSocket::SslClientMode
11
         && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) {
(-)a/net/qt5-network/files/patch-src_network_ssl_qsslsocket_openssl_symbols_p.h (-26 lines)
Removed Link Here
1
--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2019-10-01 07:47:06 UTC
2
+++ src/network/ssl/qsslsocket_openssl_symbols_p.h
3
@@ -72,6 +72,14 @@
4
 #include "qsslsocket_openssl_p.h"
5
 #include <QtCore/qglobal.h>
6
 
7
+#if defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x20700000L
8
+# define TLS1_2_VERSION 0x0303
9
+# define TLS_MAX_VERSION TLS1_2_VERSION
10
+# define TLS_ANY_VERSION 0x10000
11
+# define DTLS1_2_VERSION                 0xFEFD
12
+# define DTLS_MAX_VERSION                DTLS1_2_VERSION
13
+#endif
14
+
15
 #if QT_CONFIG(ocsp)
16
 #include "qocsp_p.h"
17
 #endif
18
@@ -372,7 +378,7 @@ int q_SSL_CTX_use_PrivateKey(SSL_CTX *a, EVP_PKEY *b);
19
 int q_SSL_CTX_use_RSAPrivateKey(SSL_CTX *a, RSA *b);
20
 int q_SSL_CTX_use_PrivateKey_file(SSL_CTX *a, const char *b, int c);
21
 X509_STORE *q_SSL_CTX_get_cert_store(const SSL_CTX *a);
22
-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
23
+#if OPENSSL_VERSION_NUMBER >= 0x10002000L  && !defined(LIBRESSL_VERSION_NUMBER)
24
 SSL_CONF_CTX *q_SSL_CONF_CTX_new();
25
 void q_SSL_CONF_CTX_free(SSL_CONF_CTX *a);
26
 void q_SSL_CONF_CTX_set_ssl_ctx(SSL_CONF_CTX *a, SSL_CTX *b);
(-)b/net/qt5-network/pkg-plist (-2 / +1 lines)
Lines 80-89 Link Here
80
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h
80
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslkey_p.h
81
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslpresharedkeyauthenticator_p.h
81
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslpresharedkeyauthenticator_p.h
82
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_mac_p.h
82
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_mac_p.h
83
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl11_symbols_p.h
84
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h
83
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_p.h
85
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h
84
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_openssl_symbols_p.h
86
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_opensslpre11_symbols_p.h
87
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h
85
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_p.h
88
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_schannel_p.h
86
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_schannel_p.h
89
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h
87
%%QT_INCDIR%%/QtNetwork/%%FULLVER%%/QtNetwork/private/qsslsocket_winrt_p.h
Lines 130-135 Link Here
130
%%QT_INCDIR%%/QtNetwork/QNetworkRequest
128
%%QT_INCDIR%%/QtNetwork/QNetworkRequest
131
%%QT_INCDIR%%/QtNetwork/QNetworkSession
129
%%QT_INCDIR%%/QtNetwork/QNetworkSession
132
%%QT_INCDIR%%/QtNetwork/QOcspResponse
130
%%QT_INCDIR%%/QtNetwork/QOcspResponse
131
%%QT_INCDIR%%/QtNetwork/QPasswordDigestor
133
%%QT_INCDIR%%/QtNetwork/QSctpServer
132
%%QT_INCDIR%%/QtNetwork/QSctpServer
134
%%QT_INCDIR%%/QtNetwork/QSctpSocket
133
%%QT_INCDIR%%/QtNetwork/QSctpSocket
135
%%QT_INCDIR%%/QtNetwork/QSsl
134
%%QT_INCDIR%%/QtNetwork/QSsl
(-)b/sysutils/qt5-qtdiag/Makefile (-11 lines)
Lines 11-27 COMMENT= Tool for reporting diagnostic information about Qt and its environment Link Here
11
USES=		compiler:c++11-lang qmake:outsource qt-dist:5,tools
11
USES=		compiler:c++11-lang qmake:outsource qt-dist:5,tools
12
USE_QT=		core gui
12
USE_QT=		core gui
13
13
14
PLIST_FILES=	${QT_BINDIR}/qtdiag
15
16
# Similarly to x11/qt5-qev, it makes more sense to just run the build system
17
# from the qtdiag directory. If we run it from the top of the source tree, it
18
# will look for a lot more dependencies for other tools such as lupdate, which
19
# we do not really have to depend on.
20
WRKSRC_SUBDIR=	src/${PORTNAME}
21
22
QT_BINARIES=	yes
14
QT_BINARIES=	yes
23
15
24
post-patch:
25
	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
26
27
.include <bsd.port.mk>
16
.include <bsd.port.mk>
(-)b/sysutils/qt5-qtdiag/files/patch-src_src.pro (+58 lines)
Added Link Here
1
--- src/src.pro.orig	2020-04-12 20:01:59 UTC
2
+++ src/src.pro
3
@@ -1,54 +1,3 @@
4
 TEMPLATE = subdirs
5
 
6
-qtHaveModule(widgets) {
7
-    no-png {
8
-        message("Some graphics-related tools are unavailable without PNG support")
9
-    } else {
10
-        QT_FOR_CONFIG += widgets
11
-        qtConfig(pushbutton):qtConfig(toolbutton) {
12
-            SUBDIRS = assistant \
13
-                      designer \
14
-                      pixeltool
15
-
16
-            linguist.depends = designer
17
-        }
18
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
19
-    }
20
-}
21
-
22
-SUBDIRS += linguist \
23
-    qtattributionsscanner
24
-
25
-qtConfig(library) {
26
-    !android|android_app: SUBDIRS += qtplugininfo
27
-}
28
-
29
-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
30
-QT_FOR_CONFIG += qdoc-private
31
-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
32
-
33
-!android|android_app: SUBDIRS += qtpaths
34
-
35
-macos {
36
-    SUBDIRS += macdeployqt
37
-}
38
-
39
-qtHaveModule(dbus): SUBDIRS += qdbus
40
-
41
-win32|winrt:SUBDIRS += windeployqt
42
-winrt:SUBDIRS += winrtrunner
43
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
44
-
45
-qtNomakeTools( \
46
-    distancefieldgenerator \
47
-    pixeltool \
48
-)
49
-
50
-# This is necessary to avoid a race condition between toolchain.prf
51
-# invocations in a module-by-module cross-build.
52
-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
53
-    qdoc.depends += qtattributionsscanner
54
-    windeployqt.depends += qtattributionsscanner
55
-    winrtrunner.depends += qtattributionsscanner
56
-    linguist.depends += qtattributionsscanner
57
-}
58
+SUBDIRS = qtdiag
(-)b/sysutils/qt5-qtdiag/pkg-plist (+2 lines)
Added Link Here
1
%%QT_BINDIR%%/qtdiag
2
%%DEBUG%%%%QT_BINDIR%%/qtdiag.debug
(-)b/sysutils/qt5-qtpaths/Makefile (-11 lines)
Lines 11-27 COMMENT= Command line client to QStandardPaths Link Here
11
USES=		compiler:c++11-lang qmake:outsource qt-dist:5,tools
11
USES=		compiler:c++11-lang qmake:outsource qt-dist:5,tools
12
USE_QT=		core
12
USE_QT=		core
13
13
14
PLIST_FILES=	${QT_BINDIR}/qtpaths
15
16
# Similarly to x11/qt5-qev, it makes more sense to just run the build system
17
# from the qtpaths directory. If we run it from the top of the source tree, it
18
# will look for a lot more dependencies for other tools such as lupdate, which
19
# we do not really have to depend on.
20
WRKSRC_SUBDIR=	src/${PORTNAME}
21
22
QT_BINARIES=	yes
14
QT_BINARIES=	yes
23
15
24
post-patch:
25
	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
26
27
.include <bsd.port.mk>
16
.include <bsd.port.mk>
(-)b/sysutils/qt5-qtpaths/files/patch-src_src.pro (+58 lines)
Added Link Here
1
--- src/src.pro.orig	2020-04-12 20:15:00 UTC
2
+++ src/src.pro
3
@@ -1,54 +1,3 @@
4
 TEMPLATE = subdirs
5
 
6
-qtHaveModule(widgets) {
7
-    no-png {
8
-        message("Some graphics-related tools are unavailable without PNG support")
9
-    } else {
10
-        QT_FOR_CONFIG += widgets
11
-        qtConfig(pushbutton):qtConfig(toolbutton) {
12
-            SUBDIRS = assistant \
13
-                      designer \
14
-                      pixeltool
15
-
16
-            linguist.depends = designer
17
-        }
18
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
19
-    }
20
-}
21
-
22
-SUBDIRS += linguist \
23
-    qtattributionsscanner
24
-
25
-qtConfig(library) {
26
-    !android|android_app: SUBDIRS += qtplugininfo
27
-}
28
-
29
-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
30
-QT_FOR_CONFIG += qdoc-private
31
-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
32
-
33
-!android|android_app: SUBDIRS += qtpaths
34
-
35
-macos {
36
-    SUBDIRS += macdeployqt
37
-}
38
-
39
-qtHaveModule(dbus): SUBDIRS += qdbus
40
-
41
-win32|winrt:SUBDIRS += windeployqt
42
-winrt:SUBDIRS += winrtrunner
43
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
44
-
45
-qtNomakeTools( \
46
-    distancefieldgenerator \
47
-    pixeltool \
48
-)
49
-
50
-# This is necessary to avoid a race condition between toolchain.prf
51
-# invocations in a module-by-module cross-build.
52
-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
53
-    qdoc.depends += qtattributionsscanner
54
-    windeployqt.depends += qtattributionsscanner
55
-    winrtrunner.depends += qtattributionsscanner
56
-    linguist.depends += qtattributionsscanner
57
-}
58
+SUBDIRS = qtpaths
(-)b/sysutils/qt5-qtpaths/pkg-plist (+2 lines)
Added Link Here
1
%%QT_BINDIR%%/qtpaths
2
%%DEBUG%%%%QT_BINDIR%%/qtpaths.debug
(-)b/sysutils/qt5-qtplugininfo/Makefile (-11 lines)
Lines 11-27 COMMENT= Qt5 plugin metadata dumper Link Here
11
USES=		compiler:c++11-lang qmake:outsource qt-dist:5,tools
11
USES=		compiler:c++11-lang qmake:outsource qt-dist:5,tools
12
USE_QT=		core
12
USE_QT=		core
13
13
14
PLIST_FILES=	${QT_BINDIR}/qtplugininfo
15
16
# Similarly to x11/qt5-qev, it makes more sense to just run the build system
17
# from the qtplugininfo directory. If we run it from the top of the source tree, it
18
# will look for a lot more dependencies for other tools such as lupdate, which
19
# we do not really have to depend on.
20
WRKSRC_SUBDIR=	src/${PORTNAME}
21
22
QT_BINARIES=	yes
14
QT_BINARIES=	yes
23
15
24
post-patch:
25
	${CP} ${WRKSRC}/../../.qmake.conf ${WRKSRC}
26
27
.include <bsd.port.mk>
16
.include <bsd.port.mk>
(-)b/sysutils/qt5-qtplugininfo/files/patch-src_src.pro (+58 lines)
Added Link Here
1
--- src/src.pro.orig	2020-04-12 20:04:17 UTC
2
+++ src/src.pro
3
@@ -1,54 +1,3 @@
4
 TEMPLATE = subdirs
5
 
6
-qtHaveModule(widgets) {
7
-    no-png {
8
-        message("Some graphics-related tools are unavailable without PNG support")
9
-    } else {
10
-        QT_FOR_CONFIG += widgets
11
-        qtConfig(pushbutton):qtConfig(toolbutton) {
12
-            SUBDIRS = assistant \
13
-                      designer \
14
-                      pixeltool
15
-
16
-            linguist.depends = designer
17
-        }
18
-        qtHaveModule(quick):qtConfig(thread):qtConfig(toolbutton): SUBDIRS += distancefieldgenerator
19
-    }
20
-}
21
-
22
-SUBDIRS += linguist \
23
-    qtattributionsscanner
24
-
25
-qtConfig(library) {
26
-    !android|android_app: SUBDIRS += qtplugininfo
27
-}
28
-
29
-include($$OUT_PWD/qdoc/qtqdoc-config.pri)
30
-QT_FOR_CONFIG += qdoc-private
31
-qtConfig(qdoc): qtConfig(thread): SUBDIRS += qdoc
32
-
33
-!android|android_app: SUBDIRS += qtpaths
34
-
35
-macos {
36
-    SUBDIRS += macdeployqt
37
-}
38
-
39
-qtHaveModule(dbus): SUBDIRS += qdbus
40
-
41
-win32|winrt:SUBDIRS += windeployqt
42
-winrt:SUBDIRS += winrtrunner
43
-qtHaveModule(gui):!wasm:!android:!uikit:!qnx:!winrt: SUBDIRS += qtdiag
44
-
45
-qtNomakeTools( \
46
-    distancefieldgenerator \
47
-    pixeltool \
48
-)
49
-
50
-# This is necessary to avoid a race condition between toolchain.prf
51
-# invocations in a module-by-module cross-build.
52
-cross_compile:isEmpty(QMAKE_HOST_CXX.INCDIRS) {
53
-    qdoc.depends += qtattributionsscanner
54
-    windeployqt.depends += qtattributionsscanner
55
-    winrtrunner.depends += qtattributionsscanner
56
-    linguist.depends += qtattributionsscanner
57
-}
58
+SUBDIRS = qtplugininfo
(-)b/sysutils/qt5-qtplugininfo/pkg-plist (+2 lines)
Added Link Here
1
%%QT_BINDIR%%/qtplugininfo
2
%%DEBUG%%%%QT_BINDIR%%/qtplugininfo.debug
(-)b/textproc/qt5-xml/pkg-plist (+2 lines)
Lines 1-3 Link Here
1
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qdom_p.h
2
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qdomhelpers_p.h
1
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qtxml-config_p.h
3
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qtxml-config_p.h
2
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qxml_p.h
4
%%QT_INCDIR%%/QtXml/%%FULLVER%%/QtXml/private/qxml_p.h
3
%%QT_INCDIR%%/QtXml/QDomAttr
5
%%QT_INCDIR%%/QtXml/QDomAttr
(-)b/textproc/qt5-xmlpatterns/pkg-plist (+2 lines)
Lines 412-418 Link Here
412
%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%
412
%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%
413
%%DEBUG%%%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%.debug
413
%%DEBUG%%%%QT_LIBDIR%%/libQt5XmlPatterns.so.%%FULLVER%%.debug
414
%%QT_BINDIR%%/xmlpatterns
414
%%QT_BINDIR%%/xmlpatterns
415
%%DEBUG%%%%QT_BINDIR%%/xmlpatterns.debug
415
%%QT_BINDIR%%/xmlpatternsvalidator
416
%%QT_BINDIR%%/xmlpatternsvalidator
417
%%DEBUG%%%%QT_BINDIR%%/xmlpatternsvalidator.debug
416
%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns.pri
418
%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns.pri
417
%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns_private.pri
419
%%QT_MKSPECDIR%%/modules/qt_lib_xmlpatterns_private.pri
418
libdata/pkgconfig/Qt5XmlPatterns.pc
420
libdata/pkgconfig/Qt5XmlPatterns.pc
(-)b/www/qt5-webengine/Makefile (-1 / +1 lines)
Lines 48-54 LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ Link Here
48
		libwebp.so:graphics/webp
48
		libwebp.so:graphics/webp
49
49
50
DISTINFO_FILE=	${.CURDIR}/distinfo
50
DISTINFO_FILE=	${.CURDIR}/distinfo
51
QT5_VERSION=	5.14.2
51
QT5_VERSION=	5.15.0
52
52
53
OPTIONS_SINGLE=		AUDIO
53
OPTIONS_SINGLE=		AUDIO
54
OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO SNDIO
54
OPTIONS_SINGLE_AUDIO=	ALSA PULSEAUDIO SNDIO
(-)b/www/qt5-webengine/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1586559398
1
TIMESTAMP = 1590608885
2
SHA256 (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = e169d6a75d8c397e04f843bc1b9585950fb9a001255cd18d6293f66fa8a6c947
2
SHA256 (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = c38e2fda7ed1b7d5a90f26abf231ec0715d78a5bc39a94673d8e39d75f04c5df
3
SIZE (KDE/Qt/5.14.2/qtwebengine-everywhere-src-5.14.2.tar.xz) = 242467568
3
SIZE (KDE/Qt/5.15.0/qtwebengine-everywhere-src-5.15.0.tar.xz) = 278257432
(-)b/www/qt5-webengine/files/patch-configure.pri (-9 / +9 lines)
Lines 1-21 Link Here
1
--- configure.pri.orig	2019-12-03 07:18:02 UTC
1
--- configure.pri.orig	2020-04-08 09:41:36 UTC
2
+++ configure.pri
2
+++ configure.pri
3
@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
3
@@ -114,7 +114,7 @@ defineTest(qtwebengine_platformError) {
4
 defineTest(qtConfTest_detectPlatform) {
4
 defineTest(qtConfTest_detectPlatform) {
5
     QT_FOR_CONFIG += gui-private
5
     QT_FOR_CONFIG += gui-private
6
 
6
 
7
-    !linux:!win32:!macos {
7
-    !linux:!win32:!macos:!ios {
8
+    !linux:!win32:!macos:!unix: {
8
+    !linux:!win32:!macos:!ios:!unix: {
9
         qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
9
         qtwebengine_platformError("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
10
     } else {
10
     } else {
11
         linux:qtwebengine_isLinuxPlatformSupported() {
11
         linux:qtwebengine_isLinuxPlatformSupported() {
12
@@ -126,6 +126,9 @@ defineTest(qtConfTest_detectPlatform) {
12
@@ -125,6 +125,9 @@ defineTest(qtConfTest_detectPlatform) {
13
         }
13
         macos:qtwebengine_isMacOsPlatformSupported() {
14
         macos:qtwebengine_isMacOsPlatformSupported() {
14
             $${1}.platform = "macos"
15
             $${1}.platform = "macos"
15
         }
16
+        }
16
+        unix:qtwebengine_isLinuxPlatformSupported() {
17
+        unix:qtwebengine_isLinuxPlatformSupported() {
17
+            $${1}.platform = "linux"
18
+            $${1}.platform = "linux"
18
+        }
19
         }
19
     }
20
         ios:qtwebengine_isMacOsPlatformSupported() {
20
 
21
             $${1}.platform = "ios"
21
     !isEmpty(platformError) {
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_allocator_partition__allocator_partition__alloc.cc (-11 lines)
Removed Link Here
1
--- src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc.orig	2019-05-23 12:39:34 UTC
2
+++ src/3rdparty/chromium/base/allocator/partition_allocator/partition_alloc.cc
3
@@ -440,7 +440,7 @@ static size_t PartitionPurgePage(internal::PartitionPa
4
 #endif
5
       }
6
       // Terminate the freelist chain.
7
-      *entry_ptr = nullptr;
8
+      *entry_ptr = internal::PartitionFreelistEntry::Transform(nullptr);
9
       // The freelist head is stored unmasked.
10
       page->freelist_head =
11
           internal::PartitionFreelistEntry::Transform(page->freelist_head);
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_debug_elf__reader.cc (-9 / +9 lines)
Lines 1-18 Link Here
1
--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/base/debug/elf_reader.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/debug/elf_reader.cc
2
+++ src/3rdparty/chromium/base/debug/elf_reader.cc
3
@@ -83,6 +83,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
3
@@ -98,6 +98,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
4
         reinterpret_cast<const Nhdr*>(elf_base + header.p_vaddr);
5
     bool found = false;
4
     bool found = false;
6
     while (current_note < section_end) {
5
     while (current_section < section_end) {
6
       current_note = reinterpret_cast<const Nhdr*>(current_section);
7
+#if !defined(OS_BSD)
7
+#if !defined(OS_BSD)
8
       if (current_note->n_type == NT_GNU_BUILD_ID) {
8
       if (current_note->n_type == NT_GNU_BUILD_ID) {
9
         const char* note_name =
9
         StringPiece note_name(current_section + sizeof(Nhdr),
10
             reinterpret_cast<const char*>(current_note) + sizeof(Nhdr);
10
                               current_note->n_namesz);
11
@@ -92,6 +93,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
11
@@ -107,6 +108,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base,
12
           break;
12
           break;
13
         }
13
         }
14
       }
14
       }
15
+#endif
15
+#endif
16
 
16
 
17
       current_note = reinterpret_cast<const Nhdr*>(
17
       size_t section_size = bits::Align(current_note->n_namesz, 4) +
18
           reinterpret_cast<const char*>(current_note) + sizeof(Nhdr) +
18
                             bits::Align(current_note->n_descsz, 4) +
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_files_file__path__watcher__kqueue.h (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig	2017-01-26 00:49:07 UTC
1
--- src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h
2
+++ src/3rdparty/chromium/base/files/file_path_watcher_kqueue.h
3
@@ -5,6 +5,10 @@
3
@@ -5,6 +5,10 @@
4
 #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
4
 #ifndef BASE_FILES_FILE_PATH_WATCHER_KQUEUE_H_
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_i18n_icu__util.cc (-28 / +16 lines)
Lines 1-32 Link Here
1
--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/base/i18n/icu_util.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/i18n/icu_util.cc
2
+++ src/3rdparty/chromium/base/i18n/icu_util.cc
3
@@ -20,7 +20,7 @@
3
@@ -43,7 +43,7 @@
4
 #include "build/build_config.h"
5
 #include "third_party/icu/source/common/unicode/putil.h"
6
 #include "third_party/icu/source/common/unicode/udata.h"
7
-#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
8
+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)) || defined(OS_ANDROID)
9
 #include "third_party/icu/source/i18n/unicode/timezone.h"
10
 #endif
4
 #endif
11
 
5
 
12
@@ -68,7 +68,11 @@ wchar_t g_debug_icu_pf_filename[_MAX_PATH];
6
 #if defined(OS_ANDROID) || defined(OS_FUCHSIA) || \
13
 // No need to change the filename in multiple places (gyp files, windows
7
-    (defined(OS_LINUX) && !defined(IS_CHROMECAST))
14
 // build pkg configurations, etc). 'l' stands for Little Endian.
8
+    (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
15
 // This variable is exported through the header file.
9
 #include "third_party/icu/source/i18n/unicode/timezone.h"
16
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
17
 const char kIcuDataFileName[] = "icudtl.dat";
18
+#else
19
+const char kIcuDataFileName[] = "icudtb.dat";
20
+#endif
21
 #if defined(OS_ANDROID)
22
 const char kAndroidAssetsIcuDataFileName[] = "assets/icudtl.dat";
23
 #endif
24
@@ -290,7 +294,7 @@ bool InitializeICU() {
25
 // TODO(jungshik): Some callers do not care about tz at all. If necessary,
26
 // add a boolean argument to this function to init'd the default tz only
27
 // when requested.
28
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
29
+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
30
   if (result)
31
     std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault());
32
 #endif
10
 #endif
11
 
12
@@ -293,7 +293,7 @@ void InitializeIcuTimeZone() {
13
       fuchsia::IntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
14
   icu::TimeZone::adoptDefault(
15
       icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
16
-#elif defined(OS_LINUX) && !defined(IS_CHROMECAST)
17
+#elif (defined(OS_LINUX) && !defined(IS_CHROMECAST)) || defined(OS_BSD)
18
   // To respond to the timezone change properly, the default timezone
19
   // cache in ICU has to be populated on starting up.
20
   // See TimeZoneMonitorLinux::NotifyClientsFromImpl().
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_linux__util.cc (-2 / +4 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/base/linux_util.cc.orig	2018-11-13 18:25:11 UTC
1
--- src/3rdparty/chromium/base/linux_util.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/base/linux_util.cc
2
+++ src/3rdparty/chromium/base/linux_util.cc
3
@@ -111,12 +111,14 @@ char g_linux_distro[kDistroSize] =
3
@@ -144,6 +144,8 @@ char g_linux_distro[kDistroSize] =
4
     "CrOS";
4
     "CrOS";
5
 #elif defined(OS_ANDROID)
5
 #elif defined(OS_ANDROID)
6
     "Android";
6
     "Android";
Lines 9-14 Link Here
9
 #else  // if defined(OS_LINUX)
9
 #else  // if defined(OS_LINUX)
10
     "Unknown";
10
     "Unknown";
11
 #endif
11
 #endif
12
@@ -164,7 +166,7 @@ BASE_EXPORT std::string GetKeyValueFromOSReleaseFileFo
13
 }
12
 
14
 
13
 std::string GetLinuxDistro() {
15
 std::string GetLinuxDistro() {
14
-#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
16
-#if defined(OS_CHROMEOS) || defined(OS_ANDROID)
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_madv__free__discardable__memory__posix.cc (+11 lines)
Added Link Here
1
--- src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/memory/madv_free_discardable_memory_posix.cc
3
@@ -271,7 +271,7 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
4
 
5
 bool MadvFreeDiscardableMemoryPosix::IsResident() const {
6
   DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_);
7
-#ifdef OS_MACOSX
8
+#if defined(OS_MACOSX) || defined(OS_BSD)
9
   std::vector<char> vec(allocated_pages_);
10
 #else
11
   std::vector<unsigned char> vec(allocated_pages_);
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_memory_protected__memory__posix.cc (-31 lines)
Removed Link Here
1
--- src/3rdparty/chromium/base/memory/protected_memory_posix.cc.orig	2019-11-27 21:12:25 UTC
2
+++ src/3rdparty/chromium/base/memory/protected_memory_posix.cc
3
@@ -8,9 +8,9 @@
4
 #include <sys/mman.h>
5
 #include <unistd.h>
6
 
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
 #include <sys/resource.h>
10
-#endif  // defined(OS_LINUX)
11
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
12
 
13
 #if defined(OS_MACOSX) && !defined(OS_IOS)
14
 #include <mach/mach.h>
15
@@ -44,7 +44,7 @@ bool AutoWritableMemory::SetMemoryReadOnly(void* start
16
   return SetMemory(start, end, PROT_READ);
17
 }
18
 
19
-#if defined(OS_LINUX)
20
+#if defined(OS_LINUX) || defined(OS_BSD)
21
 void AssertMemoryIsReadOnly(const void* ptr) {
22
 #if DCHECK_IS_ON()
23
   const uintptr_t page_mask = ~(base::GetPageSize() - 1);
24
@@ -74,6 +74,6 @@ void AssertMemoryIsReadOnly(const void* ptr) {
25
   DCHECK_EQ(region_info.protection, VM_PROT_READ);
26
 #endif  // DCHECK_IS_ON()
27
 }
28
-#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS))
29
+#endif  // defined(OS_LINUX) || (defined(OS_MACOSX) && !defined(OS_IOS)) || defined(OS_BSD)
30
 
31
 }  // namespace base
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_register__context.h (+60 lines)
Added Link Here
1
--- src/3rdparty/chromium/base/profiler/register_context.h.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/profiler/register_context.h
3
@@ -17,7 +17,7 @@
4
 #include <windows.h>
5
 #elif defined(OS_MACOSX)
6
 #include <mach/machine/thread_status.h>
7
-#elif defined(OS_ANDROID) || defined(OS_LINUX)
8
+#elif defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
9
 #include <sys/ucontext.h>
10
 #endif
11
 
12
@@ -152,6 +152,48 @@ inline uintptr_t& RegisterContextInstructionPointer(mc
13
 }
14
 
15
 #endif  // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
16
+
17
+#elif defined(OS_FREEBSD)
18
+
19
+using RegisterContext = mcontext_t;
20
+
21
+#if defined(ARCH_CPU_X86_64)
22
+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
23
+  return AsUintPtr(&context->mc_rsp);
24
+}
25
+
26
+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
27
+  return AsUintPtr(&context->mc_rbp);
28
+}
29
+
30
+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
31
+  return AsUintPtr(&context->mc_rip);
32
+}
33
+#elif defined(ARCH_CPU_X86)
34
+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
35
+  return AsUintPtr(&context->mc_esp);
36
+}
37
+
38
+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
39
+  return AsUintPtr(&context->mc_ebp);
40
+}
41
+
42
+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
43
+  return AsUintPtr(&context->mc_eip);
44
+}
45
+#elif defined(ARCH_CPU_ARM64)
46
+inline uintptr_t& RegisterContextStackPointer(mcontext_t* context) {
47
+  return AsUintPtr(&context->mc_gpregs.gp_sp);
48
+}
49
+
50
+inline uintptr_t& RegisterContextFramePointer(mcontext_t* context) {
51
+  return AsUintPtr(&context->mc_gpregs.gp_x[29]);
52
+}
53
+
54
+inline uintptr_t& RegisterContextInstructionPointer(mcontext_t* context) {
55
+  return AsUintPtr(&context->mc_gpregs.gp_elr);
56
+}
57
+#endif
58
 
59
 #else  // #if defined(OS_WIN)
60
 
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.cc (+11 lines)
Added Link Here
1
--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.cc
3
@@ -7,7 +7,7 @@
4
 namespace base {
5
 
6
 SamplingProfilerThreadToken GetSamplingProfilerCurrentThreadToken() {
7
-#if defined(OS_ANDROID) || defined(OS_LINUX)
8
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
9
   return {PlatformThread::CurrentId(), pthread_self()};
10
 #else
11
   return {PlatformThread::CurrentId()};
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_sampling__profiler__thread__token.h (+20 lines)
Added Link Here
1
--- src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/profiler/sampling_profiler_thread_token.h
3
@@ -9,7 +9,7 @@
4
 #include "base/threading/platform_thread.h"
5
 #include "build/build_config.h"
6
 
7
-#if defined(OS_ANDROID) || defined(OS_LINUX)
8
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
9
 #include <pthread.h>
10
 #endif
11
 
12
@@ -21,7 +21,7 @@ namespace base {
13
 // functions used to obtain the stack base address.
14
 struct SamplingProfilerThreadToken {
15
   PlatformThreadId id;
16
-#if defined(OS_ANDROID) || defined(OS_LINUX)
17
+#if defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)
18
   pthread_t pthread_id;
19
 #endif
20
 };
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_stack__copier__signal.cc (+65 lines)
Added Link Here
1
--- src/3rdparty/chromium/base/profiler/stack_copier_signal.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/profiler/stack_copier_signal.cc
3
@@ -4,10 +4,16 @@
4
 
5
 #include "base/profiler/stack_copier_signal.h"
6
 
7
+#if defined(OS_LINUX)
8
 #include <linux/futex.h>
9
+#include <syscall.h>
10
+#elif defined(OS_FREEBSD)
11
+#include <sys/types.h>
12
+#include <sys/thr.h>
13
+#include <sys/umtx.h>
14
+#endif
15
 #include <signal.h>
16
 #include <sys/ucontext.h>
17
-#include <syscall.h>
18
 
19
 #include <atomic>
20
 
21
@@ -35,8 +41,13 @@ class AsyncSafeWaitableEvent {
22
     // for a pthread mutex. So, also check the condition.
23
     while (true) {
24
       int res =
25
+#if defined(OS_LINUX)
26
           syscall(SYS_futex, futex_int_ptr(), FUTEX_WAIT | FUTEX_PRIVATE_FLAG,
27
                   0, nullptr, nullptr, 0);
28
+#elif defined(OS_FREEBSD)
29
+          _umtx_op(futex_int_ptr(), UMTX_OP_WAIT_UINT_PRIVATE, 0, nullptr,
30
+                   nullptr);
31
+#endif
32
       if (futex_.load(std::memory_order_acquire) != 0)
33
         return true;
34
       if (res != 0)
35
@@ -46,8 +57,12 @@ class AsyncSafeWaitableEvent {
36
 
37
   void Signal() {
38
     futex_.store(1, std::memory_order_release);
39
+#if defined(OS_LINUX)
40
     syscall(SYS_futex, futex_int_ptr(), FUTEX_WAKE | FUTEX_PRIVATE_FLAG, 1,
41
             nullptr, nullptr, 0);
42
+#elif defined(OS_FREEBSD)
43
+    _umtx_op(futex_int_ptr(), UMTX_OP_WAKE_PRIVATE, 1, nullptr, nullptr);
44
+#endif
45
   }
46
 
47
  private:
48
@@ -201,11 +216,17 @@ bool StackCopierSignal::CopyStack(StackBuffer* stack_b
49
     if (!scoped_sigaction.succeeded())
50
       return false;
51
 
52
+#if defined(OS_LINUX)
53
     if (syscall(SYS_tgkill, getpid(), thread_delegate_->GetThreadId(),
54
                 SIGURG) != 0) {
55
       NOTREACHED();
56
       return false;
57
     }
58
+#elif defined(OS_FREEBSD)
59
+    if (thr_kill2(getpid(), thread_delegate_->GetThreadId(), SIGURG) != 0) {
60
+      return false;
61
+    }
62
+#endif
63
     bool finished_waiting = wait_event.Wait();
64
     TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cpu_profiler.debug"),
65
                      "StackCopierSignal copy stack");
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_profiler_thread__delegate__posix.cc (+63 lines)
Added Link Here
1
--- src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/profiler/thread_delegate_posix.cc
3
@@ -3,6 +3,9 @@
4
 // found in the LICENSE file.
5
 
6
 #include <pthread.h>
7
+#if defined(__FreeBSD__)
8
+#include <pthread_np.h>
9
+#endif
10
 
11
 #include "base/process/process_handle.h"
12
 #include "base/profiler/thread_delegate_posix.h"
13
@@ -17,12 +20,20 @@ namespace {
14
 uintptr_t GetThreadStackBaseAddressImpl(
15
     SamplingProfilerThreadToken thread_token) {
16
   pthread_attr_t attr;
17
+#if defined(OS_FREEBSD)
18
+  pthread_attr_init(&attr);
19
+  pthread_attr_get_np(thread_token.pthread_id, &attr);
20
+#elif defined(OS_LINUX)
21
   pthread_getattr_np(thread_token.pthread_id, &attr);
22
+#endif
23
   // See crbug.com/617730 for limitations of this approach on Linux.
24
   void* address;
25
   size_t size;
26
   pthread_attr_getstack(&attr, &address, &size);
27
   const uintptr_t base_address = reinterpret_cast<uintptr_t>(address) + size;
28
+#if defined(OS_FREEBSD)
29
+  pthread_attr_destroy(&attr);
30
+#endif
31
   return base_address;
32
 }
33
 
34
@@ -88,11 +99,19 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
35
   for (size_t i = 19; i <= 29; ++i)
36
     registers.push_back(reinterpret_cast<uintptr_t*>(&thread_context->regs[i]));
37
   return registers;
38
-#elif defined(ARCH_CPU_X86_64)  // #if defined(ARCH_CPU_ARM_FAMILY) &&
39
-                                // defined(ARCH_CPU_32_BITS)
40
+#elif defined(ARCH_CPU_X86_64)
41
   return {
42
       // Return the set of callee-save registers per the x86-64 System V ABI
43
       // section 3.2.1, plus the stack pointer.
44
+#if defined(OS_FREEBSD)
45
+      reinterpret_cast<uintptr_t*>(&thread_context->mc_rbp),
46
+      reinterpret_cast<uintptr_t*>(&thread_context->mc_rbx),
47
+      reinterpret_cast<uintptr_t*>(&thread_context->mc_r12),
48
+      reinterpret_cast<uintptr_t*>(&thread_context->mc_r13),
49
+      reinterpret_cast<uintptr_t*>(&thread_context->mc_r14),
50
+      reinterpret_cast<uintptr_t*>(&thread_context->mc_r15),
51
+      reinterpret_cast<uintptr_t*>(&thread_context->mc_rsp),
52
+#else
53
       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBP]),
54
       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RBX]),
55
       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R12]),
56
@@ -100,6 +119,7 @@ std::vector<uintptr_t*> ThreadDelegatePosix::GetRegist
57
       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R14]),
58
       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_R15]),
59
       reinterpret_cast<uintptr_t*>(&thread_context->gregs[REG_RSP]),
60
+#endif
61
   };
62
 #else  // #if defined(ARCH_CPU_ARM_FAMILY) && defined(ARCH_CPU_32_BITS)
63
   // Unimplemented for other architectures.
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_security__unittest.cc (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/base/security_unittest.cc.orig	2018-11-13 18:25:11 UTC
1
--- src/3rdparty/chromium/base/security_unittest.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/security_unittest.cc
2
+++ src/3rdparty/chromium/base/security_unittest.cc
3
@@ -59,7 +59,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
3
@@ -60,7 +60,7 @@ NOINLINE Type HideValueFromCompiler(volatile Type valu
4
 // FAILS_ is too clunky.
4
 // FAILS_ is too clunky.
5
 void OverflowTestsSoftExpectTrue(bool overflow_detected) {
5
 void OverflowTestsSoftExpectTrue(bool overflow_detected) {
6
   if (!overflow_detected) {
6
   if (!overflow_detected) {
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_strings_string__number__conversions__unittest.cc (-24 lines)
Removed Link Here
1
--- src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc.orig	2019-05-23 12:39:34 UTC
2
+++ src/3rdparty/chromium/base/strings/string_number_conversions_unittest.cc
3
@@ -829,12 +829,21 @@ TEST(StringNumberConversionsTest, DoubleToString) {
4
   }
5
 
6
   // The following two values were seen in crashes in the wild.
7
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
8
   const char input_bytes[8] = {0, 0, 0, 0, '\xee', '\x6d', '\x73', '\x42'};
9
+#else
10
+  const char input_bytes[8] = {'\x42', '\x73', '\x6d', '\xee', 0, 0, 0, 0};
11
+#endif
12
   double input = 0;
13
   memcpy(&input, input_bytes, base::size(input_bytes));
14
   EXPECT_EQ("1335179083776", NumberToString(input));
15
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
16
   const char input_bytes2[8] =
17
       {0, 0, 0, '\xa0', '\xda', '\x6c', '\x73', '\x42'};
18
+#else
19
+  const char input_bytes2[8] =
20
+      {'\x42', '\x73', '\x6c', '\xda', '\xa0', 0, 0, 0};
21
+#endif
22
   input = 0;
23
   memcpy(&input, input_bytes2, base::size(input_bytes2));
24
   EXPECT_EQ("1334890332160", NumberToString(input));
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_synchronization_lock__impl.h (+16 lines)
Added Link Here
1
--- src/3rdparty/chromium/base/synchronization/lock_impl.h.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/base/synchronization/lock_impl.h
3
@@ -67,10 +67,13 @@ void LockImpl::Unlock() {
4
   ::ReleaseSRWLockExclusive(reinterpret_cast<PSRWLOCK>(&native_handle_));
5
 }
6
 #elif defined(OS_POSIX) || defined(OS_FUCHSIA)
7
+#pragma GCC diagnostic push
8
+#pragma GCC diagnostic ignored "-Wthread-safety-analysis"
9
 void LockImpl::Unlock() {
10
   int rv = pthread_mutex_unlock(&native_handle_);
11
   DCHECK_EQ(rv, 0) << ". " << strerror(rv);
12
 }
13
+#pragma GCC diagnostic pop
14
 #endif
15
 
16
 // This is an implementation used for AutoLock templated on the lock type.
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info.h (-2 / +11 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/base/system/sys_info.h.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/base/system/sys_info.h.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/base/system/sys_info.h
2
+++ src/3rdparty/chromium/base/system/sys_info.h
3
@@ -192,7 +192,7 @@ class BASE_EXPORT SysInfo {
3
@@ -188,6 +188,8 @@ class BASE_EXPORT SysInfo {
4
   // See also SysUtils.java, method isLowEndDevice.
5
   static bool IsLowEndDevice();
6
 
7
+  static uint64_t MaxSharedMemorySize();
8
+
9
  private:
10
   FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
11
   FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
12
@@ -197,7 +199,7 @@ class BASE_EXPORT SysInfo {
4
   static bool IsLowEndDeviceImpl();
13
   static bool IsLowEndDeviceImpl();
5
   static HardwareInfo GetHardwareInfoSync();
14
   static HardwareInfo GetHardwareInfoSync();
6
 
15
 
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_system_sys__info__freebsd.cc (-14 / +22 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/base/system/sys_info_freebsd.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc
2
+++ src/3rdparty/chromium/base/system/sys_info_freebsd.cc
3
@@ -13,26 +13,46 @@
3
@@ -13,26 +13,59 @@
4
 namespace base {
4
 namespace base {
5
 
5
 
6
 int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
6
 int64_t SysInfo::AmountOfPhysicalMemoryImpl() {
Lines 21-31 Link Here
21
   return static_cast<int64_t>(pages) * page_size;
21
   return static_cast<int64_t>(pages) * page_size;
22
 }
22
 }
23
 
23
 
24
-// static
25
-uint64_t SysInfo::MaxSharedMemorySize() {
26
-  size_t limit;
27
-  size_t size = sizeof(limit);
28
-  if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
29
+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
24
+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() {
30
+  int page_size, r = 0;
25
+  int page_size, r = 0;
31
+  unsigned pgfree, pginact, pgcache;
26
+  unsigned pgfree, pginact, pgcache;
Lines 40-53 Link Here
40
+  if(r == 0)
35
+  if(r == 0)
41
+    r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
36
+    r = sysctlbyname("vm.stats.vm.v_cache_count", &pgcache, &szpg, NULL, 0);
42
+  if(r == -1) {
37
+  if(r == -1) {
43
     NOTREACHED();
38
+    NOTREACHED();
44
     return 0;
39
+    return 0;
45
   }
40
+  }
46
-  return static_cast<uint64_t>(limit);
47
+  return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
41
+  return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size);
48
 }
42
+}
49
 
43
+
50
+// static
44
 // static
51
+std::string SysInfo::CPUModelName() {
45
+std::string SysInfo::CPUModelName() {
52
+  int mib[] = { CTL_HW, HW_MODEL };
46
+  int mib[] = { CTL_HW, HW_MODEL };
53
+  char name[256];
47
+  char name[256];
Lines 56-59 Link Here
56
+    return name;
50
+    return name;
57
+  return std::string();
51
+  return std::string();
58
+}
52
+}
53
+
54
+// static
55
 uint64_t SysInfo::MaxSharedMemorySize() {
56
   size_t limit;
57
   size_t size = sizeof(limit);
58
+
59
   if (sysctlbyname("kern.ipc.shmmax", &limit, &size, NULL, 0) < 0) {
60
     NOTREACHED();
61
     return 0;
62
   }
63
+
64
   return static_cast<uint64_t>(limit);
65
 }
66
-
59
 }  // namespace base
67
 }  // namespace base
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_base_third__party_dmg__fp_dtoa.cc (-14 lines)
Removed Link Here
1
--- src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc.orig	2019-05-23 12:39:34 UTC
2
+++ src/3rdparty/chromium/base/third_party/dmg_fp/dtoa.cc
3
@@ -186,7 +186,11 @@
4
  *	used for input more than STRTOD_DIGLIM digits long (default 40).
5
  */
6
 
7
+#ifdef __BIG_ENDIAN__
8
+#define IEEE_MC68k
9
+#else
10
 #define IEEE_8087
11
+#endif
12
 #define NO_HEX_FP
13
 
14
 #ifndef Long
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_compiler_BUILD.gn (-14 / +23 lines)
Lines 1-4 Link Here
1
--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/build/config/compiler/BUILD.gn.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
2
+++ src/3rdparty/chromium/build/config/compiler/BUILD.gn
3
@@ -60,7 +60,7 @@ declare_args() {
3
@@ -60,7 +60,7 @@ declare_args() {
4
   # only two architectures that are currently checked in). Turn this off when
4
   # only two architectures that are currently checked in). Turn this off when
Lines 9-24 Link Here
9
       (current_cpu == "x64" || current_cpu == "x86")
9
       (current_cpu == "x64" || current_cpu == "x86")
10
   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
10
   binutils_path = rebase_path("//third_party/binutils/Linux_x64/Release/bin",
11
                               root_build_dir)
11
                               root_build_dir)
12
@@ -301,7 +301,7 @@ config("compiler") {
12
@@ -309,7 +309,7 @@ config("compiler") {
13
 
13
     # Linker warnings.
14
     # Linker warnings.
14
     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
15
     if (fatal_linker_warnings && !(is_chromeos && current_cpu == "arm") &&
15
         !(is_android && use_order_profiling) && !is_mac && !is_ios &&
16
-        !is_mac && !is_ios && current_os != "aix") {
16
-        current_os != "aix") {
17
+        !is_mac && !is_ios && current_os != "aix" && !is_bsd) {
17
+        current_os != "aix" && !is_bsd) {
18
       # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
18
       # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580
19
       # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1
19
       ldflags += [ "-Wl,--fatal-warnings" ]
20
       # crbug.com/485542
20
     }
21
@@ -407,7 +407,7 @@ config("compiler") {
21
@@ -416,7 +416,7 @@ config("compiler") {
22
 
22
 
23
     # Compiler instrumentation can introduce dependencies in DSOs to symbols in
23
     # Compiler instrumentation can introduce dependencies in DSOs to symbols in
24
     # the executable they are loaded into, so they are unresolved at link-time.
24
     # the executable they are loaded into, so they are unresolved at link-time.
Lines 27-33 Link Here
27
       ldflags += [
27
       ldflags += [
28
         "-Wl,-z,defs",
28
         "-Wl,-z,defs",
29
         "-Wl,--as-needed",
29
         "-Wl,--as-needed",
30
@@ -786,7 +786,7 @@ config("compiler_cpu_abi") {
30
@@ -516,7 +516,7 @@ config("compiler") {
31
     }
32
   }
33
 
34
-  if (is_clang && !is_nacl && !use_xcode_clang && !use_qt) {
35
+  if (is_clang && !is_nacl && !use_xcode_clang && !use_qt && !is_bsd) {
36
     cflags += [ "-fcrash-diagnostics-dir=" +
37
                 rebase_path("//tools/clang/crashreports", root_build_dir) ]
38
 
39
@@ -787,7 +787,7 @@ config("compiler_cpu_abi") {
31
         cflags += [ "-mtune=$arm_tune" ]
40
         cflags += [ "-mtune=$arm_tune" ]
32
       }
41
       }
33
     } else if (current_cpu == "arm64") {
42
     } else if (current_cpu == "arm64") {
Lines 36-42 Link Here
36
         cflags += [ "--target=aarch64-linux-gnu" ]
45
         cflags += [ "--target=aarch64-linux-gnu" ]
37
         ldflags += [ "--target=aarch64-linux-gnu" ]
46
         ldflags += [ "--target=aarch64-linux-gnu" ]
38
       }
47
       }
39
@@ -1147,7 +1147,7 @@ config("compiler_deterministic") {
48
@@ -1138,7 +1138,7 @@ config("compiler_deterministic") {
40
       "-Xclang",
49
       "-Xclang",
41
       ".",
50
       ".",
42
     ]
51
     ]
Lines 45-51 Link Here
45
       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
54
       # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
46
       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
55
       asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
47
     }
56
     }
48
@@ -1553,7 +1553,7 @@ config("default_warnings") {
57
@@ -1545,7 +1545,7 @@ config("default_warnings") {
49
         cflags += [ "-Wno-nonportable-include-path" ]
58
         cflags += [ "-Wno-nonportable-include-path" ]
50
       }
59
       }
51
 
60
 
Lines 54-60 Link Here
54
         # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
63
         # Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
55
         # recognize.
64
         # recognize.
56
         cflags += [
65
         cflags += [
57
@@ -1761,7 +1761,7 @@ config("thin_archive") {
66
@@ -1775,7 +1775,7 @@ config("thin_archive") {
58
   # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
67
   # Mac and iOS use the mac-specific "libtool" command, not ar, which doesn't
59
   # have a "thin archive" mode (it does accept -T, but it means truncating
68
   # have a "thin archive" mode (it does accept -T, but it means truncating
60
   # archive names to 16 characters, which is not what we want).
69
   # archive names to 16 characters, which is not what we want).
Lines 63-69 Link Here
63
     arflags = [ "-T" ]
72
     arflags = [ "-T" ]
64
   } else if (is_win && use_lld) {
73
   } else if (is_win && use_lld) {
65
     arflags = [ "/llvmlibthin" ]
74
     arflags = [ "/llvmlibthin" ]
66
@@ -2356,7 +2356,7 @@ config("symbols") {
75
@@ -2373,7 +2373,7 @@ config("symbols") {
67
     # flag, so we can use use -g1 for pnacl and nacl-clang compiles.
76
     # flag, so we can use use -g1 for pnacl and nacl-clang compiles.
68
     # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
77
     # gcc nacl is is_nacl && !is_clang, pnacl and nacl-clang are && is_clang.
69
     if (!is_nacl || is_clang) {
78
     if (!is_nacl || is_clang) {
Lines 72-78 Link Here
72
     }
81
     }
73
 
82
 
74
     if (use_debug_fission && !is_nacl && !is_android) {
83
     if (use_debug_fission && !is_nacl && !is_android) {
75
@@ -2377,7 +2377,7 @@ config("symbols") {
84
@@ -2394,7 +2394,7 @@ config("symbols") {
76
     # DWARF info may be corrupt; offsets in a range list entry are in different
85
     # DWARF info may be corrupt; offsets in a range list entry are in different
77
     # sections" there.  Maybe just a bug in nacl_switch_32.S.
86
     # sections" there.  Maybe just a bug in nacl_switch_32.S.
78
     if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&
87
     if (!is_mac && !is_ios && !is_nacl && current_cpu != "x86" &&
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_config_features.gni (-3 / +3 lines)
Lines 1-7 Link Here
1
--- src/3rdparty/chromium/build/config/features.gni.orig	2018-11-13 18:25:11 UTC
1
--- src/3rdparty/chromium/build/config/features.gni.orig	2020-04-29 07:57:35 UTC
2
+++ src/3rdparty/chromium/build/config/features.gni
2
+++ src/3rdparty/chromium/build/config/features.gni
3
@@ -46,7 +46,7 @@ declare_args() {
3
@@ -26,7 +26,7 @@ declare_args() {
4
   fieldtrial_testing_like_official_build = is_chrome_branded
4
   proprietary_codecs = is_chrome_branded || is_chromecast
5
 
5
 
6
   # libudev usage. This currently only affects the content layer.
6
   # libudev usage. This currently only affects the content layer.
7
-  use_udev = is_linux && !is_chromecast
7
-  use_udev = is_linux && !is_chromecast
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_build_linux_unbundle_libxml.gn (+53 lines)
Added Link Here
1
--- src/3rdparty/chromium/build/linux/unbundle/libxml.gn.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/build/linux/unbundle/libxml.gn
3
@@ -8,11 +8,48 @@ pkg_config("system_libxml") {
4
   packages = [ "libxml-2.0" ]
5
 }
6
 
7
-static_library("libxml") {
8
+source_set("libxml") {
9
+  public_configs = [ ":system_libxml" ]
10
+}
11
+
12
+static_library("libxml_utils") {
13
+  # Do not expand this visibility list without first consulting with the
14
+  # Security Team.
15
+  visibility = [
16
+    ":xml_reader",
17
+    ":xml_writer",
18
+    "//base/test:test_support",
19
+    "//services/data_decoder:xml_parser_fuzzer",
20
+  ]
21
   sources = [
22
     "chromium/libxml_utils.cc",
23
     "chromium/libxml_utils.h",
24
   ]
25
-
26
   public_configs = [ ":system_libxml" ]
27
+}
28
+
29
+static_library("xml_reader") {
30
+  # Do not expand this visibility list without first consulting with the
31
+  # Security Team.
32
+  visibility = [
33
+    "//base/test:test_support",
34
+    "//components/policy/core/common:unit_tests",
35
+    "//services/data_decoder:*",
36
+    "//tools/traffic_annotation/auditor:auditor_sources",
37
+  ]
38
+  sources = [
39
+    "chromium/xml_reader.cc",
40
+    "chromium/xml_reader.h",
41
+  ]
42
+  deps = [ ":libxml_utils" ]
43
+}
44
+
45
+static_library("xml_writer") {
46
+  # The XmlWriter is considered safe to use from any target.
47
+  visibility = [ "*" ]
48
+  sources = [
49
+    "chromium/xml_writer.cc",
50
+    "chromium/xml_writer.h",
51
+  ]
52
+  deps = [ ":libxml_utils" ]
53
 }
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_app_theme_chrome__unscaled__resources.grd (-10 / +1 lines)
Lines 1-4 Link Here
1
--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd
2
+++ src/3rdparty/chromium/chrome/app/theme/chrome_unscaled_resources.grd
3
@@ -18,7 +18,7 @@
3
@@ -18,7 +18,7 @@
4
         <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
4
         <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/product_logo_64.png" type="BINDATA" />
Lines 9-20 Link Here
9
           <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
9
           <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/product_logo_128_beta.png" type="BINDATA" />
10
           <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
10
           <include name="IDR_PRODUCT_LOGO_128_DEV" file="google_chrome/product_logo_128_dev.png" type="BINDATA" />
11
         </if>
11
         </if>
12
@@ -109,7 +109,7 @@
13
         <include name="IDR_PROFILE_AVATAR_2X_25" file="default_200_percent/common/profile_avatar_sun_cloud.png" type="BINDATA" />
14
         <include name="IDR_PROFILE_AVATAR_2X_26" file="default_200_percent/common/profile_avatar_placeholder.png" type="BINDATA" />
15
       </if>
16
-      <if expr="is_linux and enable_app_list">
17
+      <if expr="is_posix and enable_app_list">
18
         <!-- App Launcher icons for desktop icon. -->
19
         <if expr="_google_chrome">
20
           <then>
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc (-11 / +11 lines)
Lines 1-7 Link Here
1
--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
2
+++ src/3rdparty/chromium/chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
3
@@ -206,11 +206,11 @@
3
@@ -209,11 +209,11 @@
4
 #include "chrome/browser/ui/webui/set_as_default_browser_ui_win.h"
4
 #include "chrome/browser/ui/webui/conflicts/conflicts_ui.h"
5
 #endif
5
 #endif
6
 
6
 
7
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
7
-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
Lines 9-20 Link Here
9
 #include "chrome/browser/ui/webui/discards/discards_ui.h"
9
 #include "chrome/browser/ui/webui/discards/discards_ui.h"
10
 #endif
10
 #endif
11
 
11
 
12
-#if defined(OS_LINUX) || defined(OS_ANDROID)
12
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
13
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
13
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
14
 #include "chrome/browser/ui/webui/sandbox_internals_ui.h"
14
 #include "chrome/browser/ui/webui/sandbox/sandbox_internals_ui.h"
15
 #endif
15
 #endif
16
 
16
 
17
@@ -323,7 +323,7 @@ bool IsAboutUI(const GURL& url) {
17
@@ -311,7 +311,7 @@ bool IsAboutUI(const GURL& url) {
18
 #if !defined(OS_ANDROID)
18
 #if !defined(OS_ANDROID)
19
           || url.host_piece() == chrome::kChromeUITermsHost
19
           || url.host_piece() == chrome::kChromeUITermsHost
20
 #endif
20
 #endif
Lines 23-29 Link Here
23
           || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
23
           || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
24
 #endif
24
 #endif
25
 #if defined(OS_CHROMEOS)
25
 #if defined(OS_CHROMEOS)
26
@@ -638,7 +638,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
26
@@ -624,7 +624,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
27
   if (url.host_piece() == chrome::kChromeUINaClHost)
27
   if (url.host_piece() == chrome::kChromeUINaClHost)
28
     return &NewWebUI<NaClUI>;
28
     return &NewWebUI<NaClUI>;
29
 #endif
29
 #endif
Lines 32-43 Link Here
32
   if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
32
   if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
33
     return &NewWebUI<ConstrainedWebDialogUI>;
33
     return &NewWebUI<ConstrainedWebDialogUI>;
34
 #endif
34
 #endif
35
@@ -681,17 +681,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
35
@@ -674,17 +674,17 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
36
     return &NewWebUI<CastUI>;
36
     return &NewWebUI<CastUI>;
37
   }
37
   }
38
 #endif
38
 #endif
39
-#if defined(OS_LINUX) || defined(OS_ANDROID)
39
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
40
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
40
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
41
   if (url.host_piece() == chrome::kChromeUISandboxHost) {
41
   if (url.host_piece() == chrome::kChromeUISandboxHost) {
42
     return &NewWebUI<SandboxInternalsUI>;
42
     return &NewWebUI<SandboxInternalsUI>;
43
   }
43
   }
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_chrome__paths.cc (-12 / +22 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/chrome/common/chrome_paths.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/chrome/common/chrome_paths.cc
2
+++ src/3rdparty/chromium/chrome/common/chrome_paths.cc
3
@@ -52,21 +52,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
3
@@ -51,21 +51,21 @@ const base::FilePath::CharType kPepperFlashSystemBaseD
4
     FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
4
     FILE_PATH_LITERAL("Internet Plug-Ins/PepperFlashPlayer");
5
 #endif
5
 #endif
6
 
6
 
Lines 24-32 Link Here
24
-#endif  // defined(OS_LINUX)
24
-#endif  // defined(OS_LINUX)
25
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
25
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
26
 
26
 
27
 #if defined(OS_CHROMEOS)
27
 #if defined(OS_LINUX) && BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
28
 const base::FilePath::CharType kChromeOSComponentFlash[] = FILE_PATH_LITERAL(
28
 // The name of the hint file that tells the latest component updated Widevine
29
@@ -197,7 +197,7 @@ bool PathProvider(int key, base::FilePath* result) {
29
@@ -204,7 +204,7 @@ bool PathProvider(int key, base::FilePath* result) {
30
         return false;
30
         return false;
31
       break;
31
       break;
32
     case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
32
     case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
Lines 35-41 Link Here
35
       if (!GetUserDownloadsDirectorySafe(&cur))
35
       if (!GetUserDownloadsDirectorySafe(&cur))
36
         return false;
36
         return false;
37
       break;
37
       break;
38
@@ -470,7 +470,7 @@ bool PathProvider(int key, base::FilePath* result) {
38
@@ -495,6 +495,9 @@ bool PathProvider(int key, base::FilePath* result) {
39
     case chrome::DIR_POLICY_FILES: {
40
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
41
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/opt/chrome/policies"));
42
+#elif defined(OS_BSD)
43
+      cur = base::FilePath(FILE_PATH_LITERAL(
44
+          "/usr/local/etc/chrome/policies"));
45
 #else
46
       cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
47
 #endif
48
@@ -502,7 +505,7 @@ bool PathProvider(int key, base::FilePath* result) {
39
     }
49
     }
40
 #endif
50
 #endif
41
 #if defined(OS_CHROMEOS) || \
51
 #if defined(OS_CHROMEOS) || \
Lines 44-50 Link Here
44
     case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
54
     case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
45
       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
55
       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
46
         return false;
56
         return false;
47
@@ -478,7 +478,7 @@ bool PathProvider(int key, base::FilePath* result) {
57
@@ -510,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
48
       break;
58
       break;
49
     }
59
     }
50
 #endif
60
 #endif
Lines 53-59 Link Here
53
     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
63
     case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
54
       cur = base::FilePath(kFilepathSinglePrefExtensions);
64
       cur = base::FilePath(kFilepathSinglePrefExtensions);
55
       break;
65
       break;
56
@@ -513,7 +513,7 @@ bool PathProvider(int key, base::FilePath* result) {
66
@@ -545,7 +548,7 @@ bool PathProvider(int key, base::FilePath* result) {
57
 #endif
67
 #endif
58
       break;
68
       break;
59
 
69
 
Lines 62-68 Link Here
62
     case chrome::DIR_NATIVE_MESSAGING:
72
     case chrome::DIR_NATIVE_MESSAGING:
63
 #if defined(OS_MACOSX)
73
 #if defined(OS_MACOSX)
64
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
74
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
65
@@ -527,6 +527,9 @@ bool PathProvider(int key, base::FilePath* result) {
75
@@ -559,6 +562,9 @@ bool PathProvider(int key, base::FilePath* result) {
66
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
76
 #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
67
       cur = base::FilePath(FILE_PATH_LITERAL(
77
       cur = base::FilePath(FILE_PATH_LITERAL(
68
           "/etc/opt/chrome/native-messaging-hosts"));
78
           "/etc/opt/chrome/native-messaging-hosts"));
Lines 72-78 Link Here
72
 #else
82
 #else
73
       cur = base::FilePath(FILE_PATH_LITERAL(
83
       cur = base::FilePath(FILE_PATH_LITERAL(
74
           "/etc/chromium/native-messaging-hosts"));
84
           "/etc/chromium/native-messaging-hosts"));
75
@@ -539,7 +542,7 @@ bool PathProvider(int key, base::FilePath* result) {
85
@@ -571,7 +577,7 @@ bool PathProvider(int key, base::FilePath* result) {
76
         return false;
86
         return false;
77
       cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
87
       cur = cur.Append(FILE_PATH_LITERAL("NativeMessagingHosts"));
78
       break;
88
       break;
Lines 81-87 Link Here
81
 #if !defined(OS_ANDROID)
91
 #if !defined(OS_ANDROID)
82
     case chrome::DIR_GLOBAL_GCM_STORE:
92
     case chrome::DIR_GLOBAL_GCM_STORE:
83
       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
93
       if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
84
@@ -547,7 +550,7 @@ bool PathProvider(int key, base::FilePath* result) {
94
@@ -579,7 +585,7 @@ bool PathProvider(int key, base::FilePath* result) {
85
       cur = cur.Append(kGCMStoreDirname);
95
       cur = cur.Append(kGCMStoreDirname);
86
       break;
96
       break;
87
 #endif  // !defined(OS_ANDROID)
97
 #endif  // !defined(OS_ANDROID)
Lines 90-96 Link Here
90
     case chrome::FILE_COMPONENT_FLASH_HINT:
100
     case chrome::FILE_COMPONENT_FLASH_HINT:
91
       if (!base::PathService::Get(
101
       if (!base::PathService::Get(
92
               chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
102
               chrome::DIR_COMPONENT_UPDATED_PEPPER_FLASH_PLUGIN, &cur)) {
93
@@ -555,7 +558,7 @@ bool PathProvider(int key, base::FilePath* result) {
103
@@ -587,7 +593,7 @@ bool PathProvider(int key, base::FilePath* result) {
94
       }
104
       }
95
       cur = cur.Append(kComponentUpdatedFlashHint);
105
       cur = cur.Append(kComponentUpdatedFlashHint);
96
       break;
106
       break;
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.cc (-9 / +9 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/chrome/common/webui_url_constants.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc
2
+++ src/3rdparty/chromium/chrome/common/webui_url_constants.cc
3
@@ -314,7 +314,7 @@ const char kChromeUIMetroFlowURL[] = "chrome://make-me
3
@@ -318,7 +318,7 @@ bool IsSystemWebUIHost(base::StringPiece host) {
4
 const char kChromeUICastHost[] = "cast";
4
 const char kChromeUICastHost[] = "cast";
5
 #endif
5
 #endif
6
 
6
 
Lines 9-20 Link Here
9
 const char kChromeUIDiscardsHost[] = "discards";
9
 const char kChromeUIDiscardsHost[] = "discards";
10
 const char kChromeUIDiscardsURL[] = "chrome://discards/";
10
 const char kChromeUIDiscardsURL[] = "chrome://discards/";
11
 const char kChromeUIHatsHost[] = "hats";
11
 const char kChromeUIHatsHost[] = "hats";
12
@@ -325,17 +325,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
12
@@ -329,17 +329,17 @@ const char kChromeUIHatsURL[] = "chrome://hats/";
13
 const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
13
 const char kChromeUILinuxProxyConfigHost[] = "linux-proxy-config";
14
 #endif
14
 #endif
15
 
15
 
16
-#if defined(OS_LINUX) || defined(OS_ANDROID)
16
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
17
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
17
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
18
 const char kChromeUISandboxHost[] = "sandbox";
18
 const char kChromeUISandboxHost[] = "sandbox";
19
 #endif
19
 #endif
20
 
20
 
Lines 26-36 Link Here
26
 #endif
26
 #endif
27
 
27
 
28
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
28
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
29
+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
29
+#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
30
 const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
30
 const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
31
 #endif
31
 #endif
32
 
32
 
33
@@ -579,13 +579,13 @@ const char* const kChromeHostURLs[] = {
33
@@ -605,13 +605,13 @@ const char* const kChromeHostURLs[] = {
34
     kChromeUIInternetDetailDialogHost,
34
     kChromeUIInternetDetailDialogHost,
35
     kChromeUIAssistantOptInHost,
35
     kChromeUIAssistantOptInHost,
36
 #endif
36
 #endif
Lines 41-48 Link Here
41
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
41
 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
42
     kChromeUILinuxProxyConfigHost,
42
     kChromeUILinuxProxyConfigHost,
43
 #endif
43
 #endif
44
-#if defined(OS_LINUX) || defined(OS_ANDROID)
44
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
45
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
45
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
46
     kChromeUISandboxHost,
46
     kChromeUISandboxHost,
47
 #endif
47
 #endif
48
 #if defined(OS_WIN)
48
 #if defined(OS_WIN)
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_chrome_common_webui__url__constants.h (-6 / +6 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/chrome/common/webui_url_constants.h.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/chrome/common/webui_url_constants.h
2
+++ src/3rdparty/chromium/chrome/common/webui_url_constants.h
3
@@ -272,7 +272,7 @@ extern const char kChromeUIMetroFlowURL[];
3
@@ -268,7 +268,7 @@ bool IsSystemWebUIHost(base::StringPiece host);
4
 extern const char kChromeUICastHost[];
4
 extern const char kChromeUICastHost[];
5
 #endif
5
 #endif
6
 
6
 
Lines 9-20 Link Here
9
 extern const char kChromeUIDiscardsHost[];
9
 extern const char kChromeUIDiscardsHost[];
10
 extern const char kChromeUIDiscardsURL[];
10
 extern const char kChromeUIDiscardsURL[];
11
 extern const char kChromeUIHatsHost[];
11
 extern const char kChromeUIHatsHost[];
12
@@ -284,17 +284,17 @@ extern const char kChromeUIHatsURL[];
12
@@ -280,17 +280,17 @@ extern const char kChromeUIHatsURL[];
13
 extern const char kChromeUILinuxProxyConfigHost[];
13
 extern const char kChromeUILinuxProxyConfigHost[];
14
 #endif
14
 #endif
15
 
15
 
16
-#if defined(OS_LINUX) || defined(OS_ANDROID)
16
-#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID)
17
+#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
17
+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD)
18
 extern const char kChromeUISandboxHost[];
18
 extern const char kChromeUISandboxHost[];
19
 #endif
19
 #endif
20
 
20
 
Lines 26-32 Link Here
26
 #endif
26
 #endif
27
 
27
 
28
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
28
-#if (defined(OS_LINUX) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
29
+#if ((defined(OS_BSD) || defined(OS_LINUX)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
29
+#if ((defined(OS_LINUX) || defined(OS_BSD)) && defined(TOOLKIT_VIEWS)) || defined(USE_AURA)
30
 extern const char kChromeUITabModalConfirmDialogHost[];
30
 extern const char kChromeUITabModalConfirmDialogHost[];
31
 #endif
31
 #endif
32
 
32
 
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_content_app_BUILD.gn (-9 / +41 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/components/crash/content/app/BUILD.gn.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/components/crash/content/app/BUILD.gn
2
+++ src/3rdparty/chromium/components/crash/content/app/BUILD.gn
3
@@ -54,7 +54,7 @@ static_library("app") {
3
@@ -51,17 +51,20 @@ static_library("app") {
4
     "crashpad_win.cc",
5
   ]
6
 
7
-  if (is_mac || is_win || is_android || is_linux) {
8
+  if ((is_mac || is_win || is_android || is_linux) && !is_bsd) {
4
     sources += [ "crashpad.cc" ]
9
     sources += [ "crashpad.cc" ]
5
   }
10
   }
6
 
11
 
Lines 9-20 Link Here
9
     sources += [
14
     sources += [
10
       "breakpad_linux.cc",
15
       "breakpad_linux.cc",
11
       "breakpad_linux.h",
16
       "breakpad_linux.h",
12
@@ -96,7 +96,7 @@ static_library("app") {
17
       "breakpad_linux_impl.h",
13
       "//sandbox",
18
     ]
19
   }
20
+  if (is_bsd) {
21
+    sources -= [ "crashpad_linux.cc" ]
22
+  }
23
 
24
   defines = [ "CRASH_IMPLEMENTATION" ]
25
 
26
@@ -73,7 +76,7 @@ static_library("app") {
27
     "//build:branding_buildflags",
28
   ]
29
 
30
-  if (is_mac || is_win || is_android || is_linux) {
31
+  if ((is_mac || is_win || is_android || is_linux) && !is_bsd) {
32
     deps += [
33
       "//third_party/crashpad/crashpad/client",
34
       "//third_party/crashpad/crashpad/util",
35
@@ -99,7 +102,7 @@ static_library("app") {
14
     ]
36
     ]
37
   }
38
 
39
-  if (is_linux) {
40
+  if (is_linux && !is_bsd) {
41
     deps += [ "//third_party/breakpad:client" ]
42
   }
43
 
44
@@ -130,7 +133,7 @@ static_library("app") {
45
     libs = [ "log" ]
46
   }
15
 
47
 
16
-    if (is_linux) {
48
-  if (is_linux) {
17
+    if (is_linux && !is_bsd) {
49
+  if (is_linux && !is_bsd) {
18
       deps += [
50
     data_deps = [
19
         "//content/public/common",
51
       "//third_party/crashpad/crashpad/handler:crashpad_handler",
20
         "//third_party/breakpad:client",
52
     ]
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_crash_core_common_BUILD.gn (-6 / +9 lines)
Lines 1-4 Link Here
1
--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/components/crash/core/common/BUILD.gn.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/components/crash/core/common/BUILD.gn
2
+++ src/3rdparty/chromium/components/crash/core/common/BUILD.gn
3
@@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
3
@@ -7,7 +7,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
4
 
4
 
Lines 9-23 Link Here
9
 }
9
 }
10
 
10
 
11
 group("common") {
11
 group("common") {
12
@@ -93,7 +93,6 @@ target(crash_key_target_type, "crash_key") {
12
@@ -110,7 +110,9 @@ target(crash_key_target_type, "crash_key_lib") {
13
       ]
13
       ]
14
     }
14
     }
15
 
15
 
16
-    deps += [ "//third_party/breakpad:client" ]
16
-    deps += [ "//third_party/breakpad:client" ]
17
   }
17
+    if (!is_bsd) {
18
 }
18
+      deps += [ "//third_party/breakpad:client" ]
19
 
19
+    }
20
@@ -153,7 +152,7 @@ source_set("unit_tests") {
20
     if (use_combined_annotations) {
21
       public_deps += [ "//third_party/crashpad/crashpad/client" ]
22
     }
23
@@ -173,7 +175,7 @@ source_set("unit_tests") {
21
     sources += [ "objc_zombie_unittest.mm" ]
24
     sources += [ "objc_zombie_unittest.mm" ]
22
   }
25
   }
23
 
26
 
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_neterror_resources_neterror.js (-3 / +3 lines)
Lines 1-9 Link Here
1
--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig	2018-11-13 18:25:11 UTC
1
--- src/3rdparty/chromium/components/neterror/resources/neterror.js.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/components/neterror/resources/neterror.js
2
+++ src/3rdparty/chromium/components/neterror/resources/neterror.js
3
@@ -153,7 +153,7 @@ function setUpCachedButton(buttonStrings) {
3
@@ -201,7 +201,7 @@ function setUpCachedButton(buttonStrings) {
4
 }
4
 }
5
 
5
 
6
 var primaryControlOnLeft = true;
6
 let primaryControlOnLeft = true;
7
-// <if expr="is_macosx or is_ios or is_linux or is_android">
7
-// <if expr="is_macosx or is_ios or is_linux or is_android">
8
+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
8
+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
9
 primaryControlOnLeft = false;
9
 primaryControlOnLeft = false;
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_components_safe__browsing_db_util__unittest.cc (-24 lines)
Removed Link Here
1
--- src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc.orig	2019-05-23 12:39:34 UTC
2
+++ src/3rdparty/chromium/components/safe_browsing/db/util_unittest.cc
3
@@ -12,6 +12,12 @@
4
 #include "testing/gtest/include/gtest/gtest.h"
5
 #include "url/gurl.h"
6
 
7
+#if defined(OS_WIN)
8
+#include <winsock2.h>
9
+#elif defined(OS_POSIX)
10
+#include <arpa/inet.h>
11
+#endif
12
+
13
 namespace safe_browsing {
14
 
15
 TEST(SafeBrowsingDbUtilTest, UrlToFullHashes) {
16
@@ -83,7 +89,7 @@ TEST(SafeBrowsingDbUtilTest, StringToSBFullHashAndSBFu
17
   // 31 chars plus the last \0 as full_hash.
18
   const std::string hash_in = "12345678902234567890323456789012";
19
   SBFullHash hash_out = StringToSBFullHash(hash_in);
20
-  EXPECT_EQ(0x34333231U, hash_out.prefix);
21
+  EXPECT_EQ(htonl(0x31323334U), hash_out.prefix);
22
   EXPECT_EQ(0, memcmp(hash_in.data(), hash_out.full_hash, sizeof(SBFullHash)));
23
 
24
   std::string hash_final = SBFullHashToString(hash_out);
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_builtin__service__manifests.cc (-20 lines)
Removed Link Here
1
--- src/3rdparty/chromium/content/browser/builtin_service_manifests.cc.orig	2019-11-27 21:12:25 UTC
2
+++ src/3rdparty/chromium/content/browser/builtin_service_manifests.cc
3
@@ -32,7 +32,7 @@
4
 #include "services/tracing/manifest.h"
5
 #include "services/video_capture/public/cpp/manifest.h"
6
 
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
 #include "components/services/font/public/cpp/manifest.h"  // nogncheck
10
 #endif
11
 
12
@@ -99,7 +99,7 @@ const std::vector<service_manager::Manifest>& GetBuilt
13
                   : service_manager::Manifest::ExecutionMode::
14
                         kInProcessBuiltin),
15
 #endif
16
-#if defined(OS_LINUX)
17
+#if defined(OS_LINUX) || defined(OS_BSD)
18
           font_service::GetManifest(),
19
 #endif
20
 #if defined(OS_CHROMEOS)
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_gpu__process__transport__factory.cc (+11 lines)
Added Link Here
1
--- src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/browser/compositor/gpu_process_transport_factory.cc
3
@@ -114,7 +114,7 @@ viz::FrameSinkManagerImpl* GetFrameSinkManager() {
4
   return content::BrowserMainLoop::GetInstance()->GetFrameSinkManager();
5
 }
6
 
7
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
9
 class HostDisplayClient : public viz::HostDisplayClient {
10
  public:
11
   explicit HostDisplayClient(ui::Compositor* compositor)
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.cc (+20 lines)
Added Link Here
1
--- src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.cc
3
@@ -89,7 +89,7 @@ void SoftwareBrowserCompositorOutputSurface::SwapBuffe
4
     const gfx::Size& pixel_size) {
5
   latency_tracker_.OnGpuSwapBuffersCompleted(latency_info);
6
   client_->DidReceiveSwapBuffersAck({swap_time, swap_time});
7
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
9
   if (needs_swap_size_notifications_)
10
     client_->DidSwapWithSize(pixel_size);
11
 #endif
12
@@ -129,7 +129,7 @@ unsigned SoftwareBrowserCompositorOutputSurface::Updat
13
   return 0;
14
 }
15
 
16
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
17
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
18
 void SoftwareBrowserCompositorOutputSurface::SetNeedsSwapSizeNotifications(
19
     bool needs_swap_size_notifications) {
20
   needs_swap_size_notifications_ = needs_swap_size_notifications;
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_compositor_software__browser__compositor__output__surface.h (+20 lines)
Added Link Here
1
--- src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.h.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/browser/compositor/software_browser_compositor_output_surface.h
3
@@ -39,7 +39,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu
4
   gfx::BufferFormat GetOverlayBufferFormat() const override;
5
   uint32_t GetFramebufferCopyTextureFormat() override;
6
   unsigned UpdateGpuFence() override;
7
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
8
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
9
   void SetNeedsSwapSizeNotifications(
10
       bool needs_swap_size_notifications) override;
11
 #endif
12
@@ -55,7 +55,7 @@ class CONTENT_EXPORT SoftwareBrowserCompositorOutputSu
13
   base::TimeDelta refresh_interval_;
14
   ui::LatencyTracker latency_tracker_;
15
 
16
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
17
+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
18
   bool needs_swap_size_notifications_ = false;
19
 #endif
20
 
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_devtools_protocol_system__info__handler.cc (+11 lines)
Added Link Here
1
--- src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/browser/devtools/protocol/system_info_handler.cc
3
@@ -48,7 +48,7 @@ std::unique_ptr<SystemInfo::Size> GfxSizeToSystemInfoS
4
 // Give the GPU process a few seconds to provide GPU info.
5
 // Linux Debug builds need more time -- see Issue 796437.
6
 // Windows builds need more time -- see Issue 873112 and 1004472.
7
-#if (defined(OS_LINUX) && !defined(NDEBUG))
8
+#if ((defined(OS_LINUX) || defined(OS_BSD)) && !defined(NDEBUG))
9
 const int kGPUInfoWatchdogTimeoutMs = 20000;
10
 #elif defined(OS_WIN)
11
 const int kGPUInfoWatchdogTimeoutMs = 30000;
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_ppapi__plugin__process__host__receiver__bindings.cc (+20 lines)
Added Link Here
1
--- src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/browser/ppapi_plugin_process_host_receiver_bindings.cc
3
@@ -8,7 +8,7 @@
4
 
5
 #include "build/build_config.h"
6
 
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
 #include "components/services/font/public/mojom/font_service.mojom.h"  // nogncheck
10
 #include "content/browser/font_service.h"  // nogncheck
11
 #endif
12
@@ -17,7 +17,7 @@ namespace content {
13
 
14
 void PpapiPluginProcessHost::BindHostReceiver(
15
     mojo::GenericPendingReceiver receiver) {
16
-#if defined(OS_LINUX)
17
+#if defined(OS_LINUX) || defined(OS_BSD)
18
   if (auto font_receiver = receiver.As<font_service::mojom::FontService>())
19
     ConnectToFontService(std::move(font_receiver));
20
 #endif
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_renderer__host_render__process__host__impl.cc (-7 / +16 lines)
Lines 1-15 Link Here
1
--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc
2
+++ src/3rdparty/chromium/content/browser/renderer_host/render_process_host_impl.cc
3
@@ -230,7 +230,7 @@
3
@@ -236,7 +236,7 @@
4
 #include "content/browser/compositor/image_transport_factory.h"
4
 #include "content/browser/gpu/gpu_data_manager_impl.h"
5
 #endif
5
 #endif
6
 
6
 
7
-#if defined(OS_LINUX)
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
 #include <sys/resource.h>
9
 #include <sys/resource.h>
10
 #include <sys/time.h>
10
 #include <sys/time.h>
11
 #endif
11
 
12
@@ -1232,7 +1232,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
12
@@ -1165,7 +1165,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
13
 // to indicate failure and std::numeric_limits<size_t>::max() to indicate
13
 // to indicate failure and std::numeric_limits<size_t>::max() to indicate
14
 // unlimited.
14
 // unlimited.
15
 size_t GetPlatformProcessLimit() {
15
 size_t GetPlatformProcessLimit() {
Lines 18-24 Link Here
18
   struct rlimit limit;
18
   struct rlimit limit;
19
   if (getrlimit(RLIMIT_NPROC, &limit) != 0)
19
   if (getrlimit(RLIMIT_NPROC, &limit) != 0)
20
     return kUnknownPlatformProcessLimit;
20
     return kUnknownPlatformProcessLimit;
21
@@ -1243,7 +1243,7 @@ size_t GetPlatformProcessLimit() {
21
@@ -1176,7 +1176,7 @@ size_t GetPlatformProcessLimit() {
22
 #else
22
 #else
23
   // TODO(https://crbug.com/104689): Implement on other platforms.
23
   // TODO(https://crbug.com/104689): Implement on other platforms.
24
   return kUnknownPlatformProcessLimit;
24
   return kUnknownPlatformProcessLimit;
Lines 27-33 Link Here
27
 }
27
 }
28
 #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
28
 #endif  // !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
29
 
29
 
30
@@ -1651,7 +1651,7 @@ bool RenderProcessHostImpl::Init() {
30
@@ -1218,7 +1218,7 @@ void RenderProcessHostImpl::IOThreadHostImpl::BindHost
31
       return;
32
   }
33
 
34
-#if defined(OS_LINUX)
35
+#if defined(OS_LINUX) || defined(OS_BSD)
36
   if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
37
     ConnectToFontService(std::move(font_receiver));
38
     return;
39
@@ -1588,7 +1588,7 @@ bool RenderProcessHostImpl::Init() {
31
   renderer_prefix =
40
   renderer_prefix =
32
       browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
41
       browser_command_line.GetSwitchValueNative(switches::kRendererCmdPrefix);
33
 
42
 
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_service__manager_service__manager__context.cc (-35 lines)
Removed Link Here
1
--- src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc.orig	2019-11-27 21:12:25 UTC
2
+++ src/3rdparty/chromium/content/browser/service_manager/service_manager_context.cc
3
@@ -98,7 +98,7 @@
4
 #include "content/public/android/content_jni_headers/ContentNfcDelegate_jni.h"
5
 #endif
6
 
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
 #include "components/services/font/font_service_app.h"
10
 #include "components/services/font/public/mojom/constants.mojom.h"  // nogncheck
11
 #endif
12
@@ -341,12 +341,12 @@ void CreateInProcessAudioService(
13
                      BrowserMainLoop::GetAudioManager(), std::move(request)));
14
 }
15
 
16
-#if defined(OS_LINUX)
17
+#if defined(OS_LINUX) || defined(OS_BSD)
18
 std::unique_ptr<service_manager::Service> CreateFontService(
19
     service_manager::mojom::ServiceRequest request) {
20
   return std::make_unique<font_service::FontServiceApp>(std::move(request));
21
 }
22
-#endif  // defined(OS_LINUX)
23
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
24
 
25
 std::unique_ptr<service_manager::Service> CreateResourceCoordinatorService(
26
     service_manager::mojom::ServiceRequest request) {
27
@@ -657,7 +657,7 @@ ServiceManagerContext::ServiceManagerContext(
28
         base::BindRepeating(&CreateVideoCaptureService));
29
   }
30
 
31
-#if defined(OS_LINUX)
32
+#if defined(OS_LINUX) || defined(OS_BSD)
33
   RegisterInProcessService(
34
       font_service::mojom::kServiceName,
35
       base::CreateSequencedTaskRunnerWithTraits(
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_browser_utility__process__host.cc (-2 / +2 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/content/browser/utility_process_host.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/content/browser/utility_process_host.cc
2
+++ src/3rdparty/chromium/content/browser/utility_process_host.cc
3
@@ -211,7 +211,7 @@ UtilityProcessHost::UtilityProcessHost()
3
@@ -209,7 +209,7 @@ UtilityProcessHost::UtilityProcessHost()
4
 
4
 
5
 UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
5
 UtilityProcessHost::UtilityProcessHost(std::unique_ptr<Client> client)
6
     : sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),
6
     : sandbox_type_(service_manager::SANDBOX_TYPE_UTILITY),
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_gpu_gpu__main.cc (-8 / +8 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/content/gpu/gpu_main.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/gpu/gpu_main.cc
2
+++ src/3rdparty/chromium/content/gpu/gpu_main.cc
3
@@ -84,7 +84,7 @@
3
@@ -85,7 +85,7 @@
4
 #include "ui/gfx/x/x11_switches.h"    // nogncheck
4
 #include "ui/gfx/x/x11_switches.h"    // nogncheck
5
 #endif
5
 #endif
6
 
6
 
Lines 9-15 Link Here
9
 #include "content/gpu/gpu_sandbox_hook_linux.h"
9
 #include "content/gpu/gpu_sandbox_hook_linux.h"
10
 #include "content/public/common/sandbox_init.h"
10
 #include "content/public/common/sandbox_init.h"
11
 #include "services/service_manager/sandbox/linux/sandbox_linux.h"
11
 #include "services/service_manager/sandbox/linux/sandbox_linux.h"
12
@@ -113,7 +113,7 @@ namespace content {
12
@@ -106,7 +106,7 @@ namespace content {
13
 
13
 
14
 namespace {
14
 namespace {
15
 
15
 
Lines 18-24 Link Here
18
 bool StartSandboxLinux(gpu::GpuWatchdogThread*,
18
 bool StartSandboxLinux(gpu::GpuWatchdogThread*,
19
                        const gpu::GPUInfo*,
19
                        const gpu::GPUInfo*,
20
                        const gpu::GpuPreferences&);
20
                        const gpu::GpuPreferences&);
21
@@ -174,7 +174,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
21
@@ -167,7 +167,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
22
   bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
22
   bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
23
                                 const gpu::GPUInfo* gpu_info,
23
                                 const gpu::GPUInfo* gpu_info,
24
                                 const gpu::GpuPreferences& gpu_prefs) override {
24
                                 const gpu::GpuPreferences& gpu_prefs) override {
Lines 27-42 Link Here
27
     return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
27
     return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
28
 #elif defined(OS_WIN)
28
 #elif defined(OS_WIN)
29
     return StartSandboxWindows(sandbox_info_);
29
     return StartSandboxWindows(sandbox_info_);
30
@@ -280,7 +280,7 @@ int GpuMain(const MainFunctionParams& parameters) {
30
@@ -273,7 +273,7 @@ int GpuMain(const MainFunctionParams& parameters) {
31
     main_thread_task_executor =
31
     main_thread_task_executor =
32
         std::make_unique<base::SingleThreadTaskExecutor>(
32
         std::make_unique<base::SingleThreadTaskExecutor>(
33
             gpu_preferences.message_loop_type);
33
             gpu_preferences.message_pump_type);
34
-#elif defined(OS_LINUX)
34
-#elif defined(OS_LINUX)
35
+#elif defined(OS_LINUX) || defined(OS_BSD)
35
+#elif defined(OS_LINUX) || defined(OS_BSD)
36
 #error "Unsupported Linux platform."
36
 #error "Unsupported Linux platform."
37
 #elif defined(OS_MACOSX)
37
 #elif defined(OS_MACOSX)
38
     // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
38
     // Cross-process CoreAnimation requires a CFRunLoop to function at all, and
39
@@ -388,7 +388,7 @@ int GpuMain(const MainFunctionParams& parameters) {
39
@@ -379,7 +379,7 @@ int GpuMain(const MainFunctionParams& parameters) {
40
 
40
 
41
 namespace {
41
 namespace {
42
 
42
 
Lines 45-51 Link Here
45
 bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
45
 bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread,
46
                        const gpu::GPUInfo* gpu_info,
46
                        const gpu::GPUInfo* gpu_info,
47
                        const gpu::GpuPreferences& gpu_prefs) {
47
                        const gpu::GpuPreferences& gpu_prefs) {
48
@@ -423,7 +423,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
48
@@ -414,7 +414,7 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
49
 
49
 
50
   return res;
50
   return res;
51
 }
51
 }
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_ppapi__plugin_ppapi__blink__platform__impl.cc (-17 / +8 lines)
Lines 1-34 Link Here
1
--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2019-05-23 12:39:34 UTC
1
--- src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc
2
+++ src/3rdparty/chromium/content/ppapi_plugin/ppapi_blink_platform_impl.cc
3
@@ -20,7 +20,7 @@
3
@@ -19,7 +19,7 @@
4
 
4
 
5
 #if defined(OS_MACOSX)
5
 #if defined(OS_MACOSX)
6
 #include "content/child/child_process_sandbox_support_impl_mac.h"
6
 #include "content/child/child_process_sandbox_support_impl_mac.h"
7
-#elif defined(OS_LINUX)
7
-#elif defined(OS_LINUX)
8
+#elif defined(OS_LINUX) || defined(OS_BSD)
8
+#elif defined(OS_LINUX) || defined(OS_BSD)
9
 #include "content/child/child_process_sandbox_support_impl_linux.h"
9
 #include "content/child/child_process_sandbox_support_impl_linux.h"
10
 #include "mojo/public/cpp/bindings/pending_remote.h"
10
 #endif
11
 #endif
11
 
12
@@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef;
12
@@ -34,7 +34,7 @@ typedef struct CGFont* CGFontRef;
13
 namespace content {
13
 namespace content {
14
 
14
 
15
 PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() {
15
 PpapiBlinkPlatformImpl::PpapiBlinkPlatformImpl() {
16
-#if defined(OS_LINUX)
16
-#if defined(OS_LINUX)
17
+#if defined(OS_LINUX) || defined(OS_BSD)
17
+#if defined(OS_LINUX) || defined(OS_BSD)
18
   font_loader_ =
18
   mojo::PendingRemote<font_service::mojom::FontService> font_service;
19
       sk_make_sp<font_service::FontLoader>(ChildThread::Get()->GetConnector());
19
   ChildThread::Get()->BindHostReceiver(
20
   SkFontConfigInterface::SetGlobal(font_loader_);
20
       font_service.InitWithNewPipeAndPassReceiver());
21
@@ -49,7 +49,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
21
@@ -52,7 +52,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
22
 }
22
 void PpapiBlinkPlatformImpl::Shutdown() {}
23
 
24
 void PpapiBlinkPlatformImpl::Shutdown() {
25
-#if defined(OS_LINUX) || defined(OS_MACOSX)
26
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
27
   // SandboxSupport contains a map of OutOfProcessFont objects, which hold
28
   // WebStrings and WebVectors, which become invalidated when blink is shut
29
   // down. Hence, we need to clear that map now, just before blink::shutdown()
30
@@ -59,7 +59,7 @@ void PpapiBlinkPlatformImpl::Shutdown() {
31
 }
32
 
23
 
33
 blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
24
 blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
34
-#if defined(OS_LINUX) || defined(OS_MACOSX)
25
-#if defined(OS_LINUX) || defined(OS_MACOSX)
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_app_v8__snapshot__overlay__manifest.cc (-11 lines)
Removed Link Here
1
--- src/3rdparty/chromium/content/public/app/v8_snapshot_overlay_manifest.cc.orig	2019-05-23 12:39:34 UTC
2
+++ src/3rdparty/chromium/content/public/app/v8_snapshot_overlay_manifest.cc
3
@@ -15,7 +15,7 @@ namespace content {
4
 const service_manager::Manifest& GetV8SnapshotOverlayManifest() {
5
   static base::NoDestructor<service_manager::Manifest> manifest {
6
     service_manager::ManifestBuilder()
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
         .PreloadFile(kV8NativesDataDescriptor,
10
                      base::FilePath(FILE_PATH_LITERAL("natives_blob.bin")))
11
 #if defined(USE_V8_CONTEXT_SNAPSHOT)
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_common__param__traits__macros.h (-3 / +3 lines)
Lines 1-9 Link Here
1
--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig	2019-05-23 12:39:34 UTC
1
--- src/3rdparty/chromium/content/public/common/common_param_traits_macros.h.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h
2
+++ src/3rdparty/chromium/content/public/common/common_param_traits_macros.h
3
@@ -328,7 +328,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::RendererPreferences)
3
@@ -333,7 +333,7 @@ IPC_STRUCT_TRAITS_BEGIN(blink::mojom::RendererPreferen
4
   IPC_STRUCT_TRAITS_MEMBER(accept_languages)
4
   IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
5
   IPC_STRUCT_TRAITS_MEMBER(disable_client_blocked_error_page)
5
   IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
6
   IPC_STRUCT_TRAITS_MEMBER(plugin_fullscreen_allowed)
6
   IPC_STRUCT_TRAITS_MEMBER(network_contry_iso)
7
-#if defined(OS_LINUX)
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
   IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)
9
   IPC_STRUCT_TRAITS_MEMBER(system_font_family_name)
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_public_common_content__features.cc (-7 / +7 lines)
Lines 1-15 Link Here
1
--- src/3rdparty/chromium/content/public/common/content_features.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/content/public/common/content_features.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/public/common/content_features.cc
2
+++ src/3rdparty/chromium/content/public/common/content_features.cc
3
@@ -43,7 +43,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
3
@@ -54,7 +54,7 @@ const base::Feature kAudioServiceLaunchOnStartup{
4
 // Runs the audio service in a separate process.
5
 const base::Feature kAudioServiceOutOfProcess{
4
 const base::Feature kAudioServiceOutOfProcess{
6
   "AudioServiceOutOfProcess",
5
   "AudioServiceOutOfProcess",
7
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
6
 #if defined(OS_WIN) || defined(OS_MACOSX) || \
8
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
7
-    (defined(OS_LINUX) && !defined(OS_CHROMEOS))
8
+    (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD)
9
       base::FEATURE_ENABLED_BY_DEFAULT
9
       base::FEATURE_ENABLED_BY_DEFAULT
10
 #else
10
 #else
11
       base::FEATURE_DISABLED_BY_DEFAULT
11
       base::FEATURE_DISABLED_BY_DEFAULT
12
@@ -618,7 +618,7 @@ const base::Feature kWebAssemblyThreads {
12
@@ -634,7 +634,7 @@ const base::Feature kWebAssemblyThreads {
13
 };
13
 };
14
 
14
 
15
 // Enable WebAssembly trap handler.
15
 // Enable WebAssembly trap handler.
Lines 18-24 Link Here
18
     defined(ARCH_CPU_X86_64)
18
     defined(ARCH_CPU_X86_64)
19
 const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
19
 const base::Feature kWebAssemblyTrapHandler{"WebAssemblyTrapHandler",
20
                                             base::FEATURE_ENABLED_BY_DEFAULT};
20
                                             base::FEATURE_ENABLED_BY_DEFAULT};
21
@@ -653,7 +653,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
21
@@ -669,7 +669,7 @@ const base::Feature kWebAuthBle{"WebAuthenticationBle"
22
 // https://w3c.github.io/webauthn
22
 // https://w3c.github.io/webauthn
23
 const base::Feature kWebAuthCable {
23
 const base::Feature kWebAuthCable {
24
   "WebAuthenticationCable",
24
   "WebAuthenticationCable",
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_render__thread__impl.cc (-8 / +8 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/content/renderer/render_thread_impl.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc
2
+++ src/3rdparty/chromium/content/renderer/render_thread_impl.cc
3
@@ -186,12 +186,21 @@
3
@@ -188,12 +188,21 @@
4
 #include "mojo/public/cpp/bindings/message_dumper.h"
4
 #include "mojo/public/cpp/bindings/message_dumper.h"
5
 #endif
5
 #endif
6
 
6
 
Lines 22-28 Link Here
22
 using base::ThreadRestrictions;
22
 using base::ThreadRestrictions;
23
 using blink::WebDocument;
23
 using blink::WebDocument;
24
 using blink::WebFrame;
24
 using blink::WebFrame;
25
@@ -904,7 +913,7 @@ void RenderThreadImpl::Init() {
25
@@ -927,7 +936,7 @@ void RenderThreadImpl::Init() {
26
   DCHECK(parsed_num_raster_threads) << string_value;
26
   DCHECK(parsed_num_raster_threads) << string_value;
27
   DCHECK_GT(num_raster_threads, 0);
27
   DCHECK_GT(num_raster_threads, 0);
28
 
28
 
Lines 31-46 Link Here
31
   categorized_worker_pool_->SetBackgroundingCallback(
31
   categorized_worker_pool_->SetBackgroundingCallback(
32
       main_thread_scheduler_->DefaultTaskRunner(),
32
       main_thread_scheduler_->DefaultTaskRunner(),
33
       base::BindOnce(
33
       base::BindOnce(
34
@@ -933,7 +942,7 @@ void RenderThreadImpl::Init() {
34
@@ -957,7 +966,7 @@ void RenderThreadImpl::Init() {
35
   base::DiscardableMemoryAllocator::SetInstance(
35
   base::DiscardableMemoryAllocator::SetInstance(
36
       discardable_shared_memory_manager_.get());
36
       discardable_shared_memory_manager_.get());
37
 
37
 
38
-#if defined(OS_LINUX)
38
-#if defined(OS_LINUX)
39
+#if defined(OS_LINUX) || defined(OS_BSD)
39
+#if defined(OS_LINUX) || defined(OS_BSD)
40
   render_message_filter()->SetThreadPriority(
40
   if (base::FeatureList::IsEnabled(
41
       ChildProcess::current()->io_thread_id(), base::ThreadPriority::DISPLAY);
41
           blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
42
 #endif
42
     render_message_filter()->SetThreadPriority(
43
@@ -1313,7 +1322,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
43
@@ -1333,7 +1342,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
44
       !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
44
       !cmd_line->HasSwitch(switches::kDisableGpuMemoryBufferVideoFrames);
45
 #else
45
 #else
46
       cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
46
       cmd_line->HasSwitch(switches::kEnableGpuMemoryBufferVideoFrames);
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.cc (-22 / +13 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig	2019-05-23 12:39:34 UTC
1
--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc
2
+++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.cc
3
@@ -109,7 +109,7 @@
3
@@ -99,7 +99,7 @@
4
 
4
 
5
 #if defined(OS_MACOSX)
5
 #if defined(OS_MACOSX)
6
 #include "content/child/child_process_sandbox_support_impl_mac.h"
6
 #include "content/child/child_process_sandbox_support_impl_mac.h"
Lines 9-42 Link Here
9
 #include "content/child/child_process_sandbox_support_impl_linux.h"
9
 #include "content/child/child_process_sandbox_support_impl_linux.h"
10
 #endif
10
 #endif
11
 
11
 
12
@@ -204,7 +204,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
12
@@ -174,7 +174,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
13
                      ->Clone();
13
   if (RenderThreadImpl::current()) {
14
     io_runner_ = RenderThreadImpl::current()->GetIOTaskRunner();
14
     thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();
15
     thread_safe_sender_ = RenderThreadImpl::current()->thread_safe_sender();
15
     blob_registry_.reset(new WebBlobRegistryImpl(thread_safe_sender_.get()));
16
-#if defined(OS_LINUX)
16
-#if defined(OS_LINUX)
17
+#if defined(OS_LINUX) || defined(OS_BSD)
17
+#if defined(OS_LINUX) || defined(OS_BSD)
18
     font_loader_ = sk_make_sp<font_service::FontLoader>(connector_.get());
18
     mojo::PendingRemote<font_service::mojom::FontService> font_service;
19
     SkFontConfigInterface::SetGlobal(font_loader_);
19
     RenderThreadImpl::current()->BindHostReceiver(
20
         font_service.InitWithNewPipeAndPassReceiver());
21
@@ -184,7 +184,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
20
 #endif
22
 #endif
21
@@ -213,7 +213,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
22
     connector_ = service_manager::Connector::Create(&request);
23
   }
23
   }
24
 
24
 
25
-#if defined(OS_LINUX) || defined(OS_MACOSX)
25
-#if defined(OS_LINUX) || defined(OS_MACOSX)
26
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
26
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
27
   if (g_sandbox_enabled && sandboxEnabled()) {
27
   if (sandboxEnabled()) {
28
 #if defined(OS_MACOSX)
28
 #if defined(OS_MACOSX)
29
     sandbox_support_.reset(new WebSandboxSupportMac(connector_.get()));
29
     sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
30
@@ -241,7 +241,7 @@ RendererBlinkPlatformImpl::~RendererBlinkPlatformImpl(
30
@@ -266,7 +266,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
31
 }
32
 
33
 void RendererBlinkPlatformImpl::Shutdown() {
34
-#if defined(OS_LINUX) || defined(OS_MACOSX)
35
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
36
   // SandboxSupport contains a map of OutOfProcessFont objects, which hold
37
   // WebStrings and WebVectors, which become invalidated when blink is shut
38
   // down. Hence, we need to clear that map now, just before blink::shutdown()
39
@@ -322,7 +322,7 @@ RendererBlinkPlatformImpl::CreateNetworkURLLoaderFacto
40
 
31
 
41
 void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
32
 void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
42
     base::PlatformThreadId thread_id) {
33
     base::PlatformThreadId thread_id) {
Lines 45-51 Link Here
45
   if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
36
   if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
46
     render_thread->render_message_filter()->SetThreadPriority(
37
     render_thread->render_message_filter()->SetThreadPriority(
47
         thread_id, base::ThreadPriority::DISPLAY);
38
         thread_id, base::ThreadPriority::DISPLAY);
48
@@ -335,7 +335,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
39
@@ -279,7 +279,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
49
 }
40
 }
50
 
41
 
51
 blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
42
 blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_renderer_renderer__blink__platform__impl.h (-8 / +8 lines)
Lines 1-16 Link Here
1
--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig	2019-05-23 12:39:34 UTC
1
--- src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h.orig	2020-04-29 07:57:35 UTC
2
+++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h
2
+++ src/3rdparty/chromium/content/renderer/renderer_blink_platform_impl.h
3
@@ -29,7 +29,7 @@
3
@@ -31,7 +31,7 @@
4
 #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
4
 #include "third_party/blink/public/mojom/loader/code_cache.mojom.h"
5
 #include "third_party/blink/public/mojom/loader/code_cache.mojom.h"
5
 #include "third_party/blink/public/platform/modules/webdatabase/web_database.mojom.h"
6
 
6
 
7
-#if defined(OS_LINUX)
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
 #include "components/services/font/public/cpp/font_loader.h"  // nogncheck
9
 #include "components/services/font/public/cpp/font_loader.h"  // nogncheck
10
 #include "third_party/skia/include/core/SkRefCnt.h"           // nogncheck
10
 #include "third_party/skia/include/core/SkRefCnt.h"           // nogncheck
11
 #endif
11
 #endif
12
@@ -263,7 +263,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
12
@@ -221,7 +221,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
13
   std::unique_ptr<service_manager::Connector> connector_;
13
 
14
   scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
14
   scoped_refptr<base::SingleThreadTaskRunner> io_runner_;
15
 
15
 
16
-#if defined(OS_LINUX) || defined(OS_MACOSX)
16
-#if defined(OS_LINUX) || defined(OS_MACOSX)
Lines 18-26 Link Here
18
   std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
18
   std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
19
 #endif
19
 #endif
20
 
20
 
21
@@ -298,7 +298,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
21
@@ -245,7 +245,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
22
   blink::mojom::CodeCacheHostPtrInfo code_cache_host_info_;
22
   mojo::PendingRemote<blink::mojom::CodeCacheHost> code_cache_host_remote_;
23
   scoped_refptr<blink::mojom::ThreadSafeCodeCacheHostPtr> code_cache_host_;
23
   mojo::SharedRemote<blink::mojom::CodeCacheHost> code_cache_host_;
24
 
24
 
25
-#if defined(OS_LINUX)
25
-#if defined(OS_LINUX)
26
+#if defined(OS_LINUX) || defined(OS_BSD)
26
+#if defined(OS_LINUX) || defined(OS_BSD)
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_content_utility_utility__blink__platform__with__sandbox__support__impl.cc (-8 / +8 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2019-05-23 12:39:34 UTC
1
--- src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc
2
+++ src/3rdparty/chromium/content/utility/utility_blink_platform_with_sandbox_support_impl.cc
3
@@ -8,7 +8,7 @@
3
@@ -9,7 +9,7 @@
4
 
4
 
5
 #if defined(OS_MACOSX)
5
 #if defined(OS_MACOSX)
6
 #include "content/child/child_process_sandbox_support_impl_mac.h"
6
 #include "content/child/child_process_sandbox_support_impl_mac.h"
Lines 10-24 Link Here
10
 #endif
10
 #endif
11
 
11
 
12
@@ -17,7 +17,7 @@ namespace content {
12
@@ -17,7 +17,7 @@ namespace content {
13
 
13
 UtilityBlinkPlatformWithSandboxSupportImpl::
14
 UtilityBlinkPlatformWithSandboxSupportImpl::
14
     UtilityBlinkPlatformWithSandboxSupportImpl(
15
     UtilityBlinkPlatformWithSandboxSupportImpl() {
15
         service_manager::Connector* connector) {
16
-#if defined(OS_LINUX)
16
-#if defined(OS_LINUX)
17
+#if defined(OS_LINUX) || defined(OS_BSD)
17
+#if defined(OS_LINUX) || defined(OS_BSD)
18
   font_loader_ = sk_make_sp<font_service::FontLoader>(connector);
18
   mojo::PendingRemote<font_service::mojom::FontService> font_service;
19
   SkFontConfigInterface::SetGlobal(font_loader_);
19
   UtilityThread::Get()->BindHostReceiver(
20
   sandbox_support_ = std::make_unique<WebSandboxSupportLinux>(font_loader_);
20
       font_service.InitWithNewPipeAndPassReceiver());
21
@@ -31,7 +31,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
21
@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
22
 
22
 
23
 blink::WebSandboxSupport*
23
 blink::WebSandboxSupport*
24
 UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
24
 UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_device_gamepad_hid__writer__linux.cc (+11 lines)
Added Link Here
1
--- src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/device/gamepad/hid_writer_linux.cc
3
@@ -4,6 +4,8 @@
4
 
5
 #include "device/gamepad/hid_writer_linux.h"
6
 
7
+#include <unistd.h>
8
+
9
 #include "base/posix/eintr_wrapper.h"
10
 
11
 namespace device {
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_extensions_browser_browser__context__keyed__service__factories.cc (-5 / +5 lines)
Lines 1-9 Link Here
1
--- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig	2019-05-23 12:39:34 UTC
1
--- src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc
2
+++ src/3rdparty/chromium/extensions/browser/browser_context_keyed_service_factories.cc
3
@@ -93,7 +93,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
3
@@ -81,7 +81,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() 
4
 #if defined(OS_CHROMEOS)
4
   IdleManagerFactory::GetInstance();
5
   NetworkingConfigServiceFactory::GetInstance();
5
 #endif // !defined(TOOLKIT_QT)
6
 #endif
6
   ManagementAPI::GetFactoryInstance();
7
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
7
-#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX)
8
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
8
+#if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
9
   NetworkingPrivateEventRouterFactory::GetInstance();
9
   NetworkingPrivateEventRouterFactory::GetInstance();
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.cc (-13 / +57 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc
2
+++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.cc
3
@@ -25,7 +25,7 @@
3
@@ -26,7 +26,7 @@
4
 #include "ui/gl/buildflags.h"
5
 #include "ui/gl/gl_context.h"
6
 
7
-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
8
+#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
9
 #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h"
10
 #endif
11
 
12
@@ -34,7 +34,7 @@
4
 #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"
13
 #include "gpu/vulkan/fuchsia/vulkan_fuchsia_ext.h"
5
 #endif
14
 #endif
6
 
15
 
Lines 9-29 Link Here
9
 #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
18
 #define GL_HANDLE_TYPE_OPAQUE_FD_EXT 0x9586
10
 #endif
19
 #endif
11
 
20
 
12
@@ -451,7 +451,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
21
@@ -537,7 +537,7 @@ std::unique_ptr<SharedImageRepresentationDawn>
13
 #if defined(OS_FUCHSIA)
22
 ExternalVkImageBacking::ProduceDawn(SharedImageManager* manager,
23
                                     MemoryTypeTracker* tracker,
24
                                     WGPUDevice wgpuDevice) {
25
-#if defined(OS_LINUX) && BUILDFLAG(USE_DAWN)
26
+#if (defined(OS_LINUX) || defined(OS_BSD)) && BUILDFLAG(USE_DAWN)
27
   if (!wgpu_format_) {
28
     DLOG(ERROR) << "Format not supported for Dawn";
29
     return nullptr;
30
@@ -560,14 +560,14 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
31
   return std::make_unique<ExternalVkImageDawnRepresentation>(
32
       manager, this, tracker, wgpuDevice, wgpu_format_.value(), memory_fd,
33
       image_info.fAlloc.fSize, memory_type_index_.value());
34
-#else  // !defined(OS_LINUX) || !BUILDFLAG(USE_DAWN)
35
+#else  // !defined(OS_LINUX) || !defined(OS_BSD) || !BUILDFLAG(USE_DAWN)
14
   NOTIMPLEMENTED_LOG_ONCE();
36
   NOTIMPLEMENTED_LOG_ONCE();
15
   return nullptr;
37
   return nullptr;
16
-#elif defined(OS_LINUX)
38
 #endif
17
+#elif defined(OS_LINUX) || defined(OS_BSD)
39
 }
40
 
41
 GLuint ExternalVkImageBacking::ProduceGLTextureInternal() {
42
-#if defined(OS_LINUX)
43
+#if defined(OS_LINUX) || defined(OS_BSD)
18
   GrVkImageInfo image_info;
44
   GrVkImageInfo image_info;
19
   bool result = backend_texture_.getVkImageInfo(&image_info);
45
   bool result = backend_texture_.getVkImageInfo(&image_info);
20
   DCHECK(result);
46
   DCHECK(result);
21
@@ -520,7 +520,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
47
@@ -631,7 +631,7 @@ ExternalVkImageBacking::ProduceGLTexture(SharedImageMa
48
     return nullptr;
22
   }
49
   }
23
   return std::make_unique<ExternalVkImageGlRepresentation>(
50
 
24
       manager, this, tracker, texture_, texture_->service_id());
51
-#if defined(OS_LINUX)
25
-#else  // !defined(OS_LINUX) && !defined(OS_FUCHSIA)
52
+#if defined(OS_LINUX) || defined(OS_BSD)
26
+#else  // !defined(OS_LINUX) && !defined(OS_FUCHSIA) && !defined(OS_BSD)
53
   if (!texture_) {
27
 #error Unsupported OS
54
     GLuint texture_service_id = ProduceGLTextureInternal();
28
 #endif
55
     if (!texture_service_id)
56
@@ -677,7 +677,7 @@ ExternalVkImageBacking::ProduceGLTexturePassthrough(
57
     return nullptr;
58
   }
59
 
60
-#if defined(OS_LINUX)
61
+#if defined(OS_LINUX) || defined(OS_BSD)
62
   if (!texture_passthrough_) {
63
     GLuint texture_service_id = ProduceGLTextureInternal();
64
     if (!texture_service_id)
65
@@ -715,7 +715,7 @@ ExternalVkImageBacking::ProduceSkia(
66
                                                              tracker);
29
 }
67
 }
68
 
69
-#ifdef OS_LINUX
70
+#if defined(OS_LINUX) || defined(OS_BSD)
71
 int ExternalVkImageBacking::GetMemoryFd(const GrVkImageInfo& image_info) {
72
   VkMemoryGetFdInfoKHR get_fd_info;
73
   get_fd_info.sType = VK_STRUCTURE_TYPE_MEMORY_GET_FD_INFO_KHR;
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_command__buffer_service_external__vk__image__backing.h (+11 lines)
Added Link Here
1
--- src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.h.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/gpu/command_buffer/service/external_vk_image_backing.h
3
@@ -131,7 +131,7 @@ class ExternalVkImageBacking final : public SharedImag
4
                          base::Optional<DawnTextureFormat> dawn_format,
5
                          base::Optional<uint32_t> memory_type_index);
6
 
7
-#ifdef OS_LINUX
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
   // Extract file descriptor from image
10
   int GetMemoryFd(const GrVkImageInfo& image_info);
11
 #endif
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_common_gpu__memory__buffer__support.cc (-5 / +5 lines)
Lines 1-4 Link Here
1
--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc
2
+++ src/3rdparty/chromium/gpu/ipc/common/gpu_memory_buffer_support.cc
3
@@ -12,7 +12,7 @@
3
@@ -12,7 +12,7 @@
4
 #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"
4
 #include "gpu/ipc/common/gpu_memory_buffer_impl_io_surface.h"
Lines 18-33 Link Here
18
 #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
18
 #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
19
 #endif
19
 #endif
20
 
20
 
21
@@ -111,7 +111,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
21
@@ -112,7 +112,7 @@ bool GpuMemoryBufferSupport::IsNativeGpuMemoryBufferCo
22
 #elif defined(USE_OZONE)
22
 #elif defined(USE_OZONE)
23
   return ui::OzonePlatform::EnsureInstance()->IsNativePixmapConfigSupported(
23
   return ui::OzonePlatform::GetInstance()->IsNativePixmapConfigSupported(format,
24
       format, usage);
24
                                                                          usage);
25
-#elif defined(OS_LINUX)
25
-#elif defined(OS_LINUX)
26
+#elif defined(OS_LINUX) || defined(OS_BSD)
26
+#elif defined(OS_LINUX) || defined(OS_BSD)
27
   return false;  // TODO(julian.isorce): Add linux support.
27
   return false;  // TODO(julian.isorce): Add linux support.
28
 #elif defined(OS_WIN)
28
 #elif defined(OS_WIN)
29
   switch (usage) {
29
   switch (usage) {
30
@@ -167,7 +167,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH
30
@@ -168,7 +168,7 @@ GpuMemoryBufferSupport::CreateGpuMemoryBufferImplFromH
31
       return GpuMemoryBufferImplIOSurface::CreateFromHandle(
31
       return GpuMemoryBufferImplIOSurface::CreateFromHandle(
32
           std::move(handle), size, format, usage, std::move(callback));
32
           std::move(handle), size, format, usage, std::move(callback));
33
 #endif
33
 #endif
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__init.cc (-24 / +24 lines)
Lines 1-4 Link Here
1
--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc
2
+++ src/3rdparty/chromium/gpu/ipc/service/gpu_init.cc
3
@@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
3
@@ -109,7 +109,7 @@ void InitializePlatformOverlaySettings(GPUInfo* gpu_in
4
 #endif
4
 #endif
Lines 16-24 Link Here
16
-#endif  // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST
16
-#endif  // OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST
17
+#endif  // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD
17
+#endif  // (OS_LINUX && !OS_CHROMEOS && !IS_CHROMECAST) || OS_BSD
18
 
18
 
19
 }  // namespace
19
 class GpuWatchdogInit {
20
 
20
  public:
21
@@ -152,7 +152,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
21
@@ -165,7 +165,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
22
   // crash during feature collection.
22
   // crash during feature collection.
23
   gpu::SetKeysForCrashLogging(gpu_info_);
23
   gpu::SetKeysForCrashLogging(gpu_info_);
24
 
24
 
Lines 27-33 Link Here
27
   if (gpu_info_.gpu.vendor_id == 0x10de &&  // NVIDIA
27
   if (gpu_info_.gpu.vendor_id == 0x10de &&  // NVIDIA
28
       gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
28
       gpu_info_.gpu.driver_vendor == "NVIDIA" && !CanAccessNvidiaDeviceFile())
29
     return false;
29
     return false;
30
@@ -228,7 +228,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
30
@@ -246,7 +246,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
31
   sandbox_helper_->PreSandboxStartup();
31
   sandbox_helper_->PreSandboxStartup();
32
 
32
 
33
   bool attempted_startsandbox = false;
33
   bool attempted_startsandbox = false;
Lines 36-42 Link Here
36
   // On Chrome OS ARM Mali, GPU driver userspace creates threads when
36
   // On Chrome OS ARM Mali, GPU driver userspace creates threads when
37
   // initializing a GL context, so start the sandbox early.
37
   // initializing a GL context, so start the sandbox early.
38
   // TODO(zmo): Need to collect OS version before this.
38
   // TODO(zmo): Need to collect OS version before this.
39
@@ -237,7 +237,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
39
@@ -255,7 +255,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
40
         watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
40
         watchdog_thread_.get(), &gpu_info_, gpu_preferences_);
41
     attempted_startsandbox = true;
41
     attempted_startsandbox = true;
42
   }
42
   }
Lines 45-51 Link Here
45
 
45
 
46
   base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
46
   base::TimeTicks before_initialize_one_off = base::TimeTicks::Now();
47
 
47
 
48
@@ -284,14 +284,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
48
@@ -280,14 +280,14 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
49
   }
49
   }
50
   if (gl_initialized && use_swiftshader &&
50
   if (gl_initialized && use_swiftshader &&
51
       gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
51
       gl::GetGLImplementation() != gl::kGLImplementationSwiftShaderGL) {
Lines 62-86 Link Here
62
   }
62
   }
63
   if (!gl_initialized)
63
   if (!gl_initialized)
64
     gl_initialized = gl::init::InitializeGLNoExtensionsOneOff();
64
     gl_initialized = gl::init::InitializeGLNoExtensionsOneOff();
65
@@ -317,7 +317,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
65
@@ -314,7 +314,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
66
         command_line, gpu_feature_info_,
66
           command_line, gpu_feature_info_,
67
         gpu_preferences_.disable_software_rasterizer, false);
67
           gpu_preferences_.disable_software_rasterizer, false);
68
     if (use_swiftshader) {
68
       if (use_swiftshader) {
69
-#if defined(OS_LINUX)
69
-#if defined(OS_LINUX)
70
+#if defined(OS_LINUX) || defined(OS_BSD)
70
+#if defined(OS_LINUX) || defined(OS_BSD)
71
       VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
71
         VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
72
               << "on Linux";
72
                 << "on Linux";
73
       return false;
74
@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
75
                 << "failed";
76
         return false;
73
         return false;
77
       }
74
@@ -326,7 +326,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
75
               << "failed";
76
           return false;
77
         }
78
-#endif  // OS_LINUX
78
-#endif  // OS_LINUX
79
+#endif  // OS_LINUX || OS_BSD
79
+#endif  // OS_LINUX || OS_BSD
80
     }
80
       }
81
   }
81
     } else {  // use_swiftshader == true
82
 
82
       switch (gpu_preferences_.use_vulkan) {
83
@@ -357,7 +357,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
83
@@ -413,7 +413,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
84
 
84
 
85
   InitializePlatformOverlaySettings(&gpu_info_);
85
   InitializePlatformOverlaySettings(&gpu_info_);
86
 
86
 
Lines 89-95 Link Here
89
   // Driver may create a compatibility profile context when collect graphics
89
   // Driver may create a compatibility profile context when collect graphics
90
   // information on Linux platform. Try to collect graphics information
90
   // information on Linux platform. Try to collect graphics information
91
   // based on core profile context after disabling platform extensions.
91
   // based on core profile context after disabling platform extensions.
92
@@ -376,7 +376,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
92
@@ -432,7 +432,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
93
       return false;
93
       return false;
94
     }
94
     }
95
   }
95
   }
Lines 98-104 Link Here
98
 
98
 
99
   if (use_swiftshader) {
99
   if (use_swiftshader) {
100
     AdjustInfoToSwiftShader();
100
     AdjustInfoToSwiftShader();
101
@@ -552,7 +552,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
101
@@ -604,7 +604,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
102
 
102
 
103
   InitializePlatformOverlaySettings(&gpu_info_);
103
   InitializePlatformOverlaySettings(&gpu_info_);
104
 
104
 
Lines 107-113 Link Here
107
   // Driver may create a compatibility profile context when collect graphics
107
   // Driver may create a compatibility profile context when collect graphics
108
   // information on Linux platform. Try to collect graphics information
108
   // information on Linux platform. Try to collect graphics information
109
   // based on core profile context after disabling platform extensions.
109
   // based on core profile context after disabling platform extensions.
110
@@ -572,7 +572,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
110
@@ -624,7 +624,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
111
       }
111
       }
112
     }
112
     }
113
   }
113
   }
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.cc (-43 / +23 lines)
Lines 1-52 Link Here
1
--- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc
2
+++ src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.cc
3
@@ -45,8 +45,10 @@ const int kGpuTimeout = 10000;
3
@@ -40,7 +40,7 @@ const int kGpuTimeout = 15000;
4
 const int kGpuTimeout = 10000;
4
 #endif
5
 #endif
5
 
6
 
6
 #if defined(USE_X11)
7
-#if defined(USE_X11)
7
+#if !defined(OS_BSD)
8
+#if defined(USE_X11) && !defined(OS_BSD)
8
 const base::FilePath::CharType kTtyFilePath[] =
9
 const base::FilePath::CharType kTtyFilePath[] =
9
     FILE_PATH_LITERAL("/sys/class/tty/tty0/active");
10
     FILE_PATH_LITERAL("/sys/class/tty/tty0/active");
10
+#endif
11
 const unsigned char text[20] = "check";
12
 #endif
11
 #endif
13
 
12
@@ -59,7 +59,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
14
@@ -68,9 +70,12 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
13
       arm_cpu_time_(),
14
 #endif
15
       suspension_counter_(this)
16
-#if defined(USE_X11)
17
+#if defined(USE_X11) && !defined(OS_BSD)
15
       ,
18
       ,
16
       display_(nullptr),
17
       window_(0),
18
-      atom_(x11::None),
19
+      atom_(x11::None)
20
+#if !defined(OS_BSD)
21
+      ,
22
       host_tty_(-1)
19
       host_tty_(-1)
23
 #endif
20
 #endif
24
+#endif
21
@@ -76,7 +76,7 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
25
 {
22
   DCHECK(result);
26
   base::subtle::NoBarrier_Store(&awaiting_acknowledge_, false);
27
 
28
@@ -85,7 +90,9 @@ GpuWatchdogThreadImplV1::GpuWatchdogThreadImplV1()
29
 #endif
23
 #endif
30
 
24
 
31
 #if defined(USE_X11)
25
-#if defined(USE_X11)
32
+#if !defined(OS_BSD)
26
+#if defined(USE_X11) && !defined(OS_BSD)
33
   tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
27
   tty_file_ = base::OpenFile(base::FilePath(kTtyFilePath), "r");
34
+#endif
28
   host_tty_ = GetActiveTTY();
35
   SetupXServer();
36
 #endif
29
 #endif
37
   base::MessageLoopCurrent::Get()->AddTaskObserver(&task_observer_);
30
@@ -222,7 +222,7 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
38
@@ -230,8 +237,10 @@ GpuWatchdogThreadImplV1::~GpuWatchdogThreadImplV1() {
31
 
39
   base::PowerMonitor::RemoveObserver(this);
32
   base::PowerMonitor::RemoveObserver(this);
40
 
33
 
41
 #if defined(USE_X11)
34
-#if defined(USE_X11)
42
+#if !defined(OS_BSD)
35
+#if defined(USE_X11) && !defined(OS_BSD)
43
   if (tty_file_)
36
   if (tty_file_)
44
     fclose(tty_file_);
37
     fclose(tty_file_);
45
+#endif
38
 #endif
46
   if (display_) {
39
@@ -371,7 +371,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
47
     DCHECK(window_);
48
     XDestroyWindow(display_, window_);
49
@@ -431,7 +440,7 @@ void GpuWatchdogThreadImplV1::DeliberatelyTerminateToR
50
     return;
40
     return;
51
 #endif
41
 #endif
52
 
42
 
Lines 55-71 Link Here
55
   // Don't crash if we're not on the TTY of our host X11 server.
45
   // Don't crash if we're not on the TTY of our host X11 server.
56
   int active_tty = GetActiveTTY();
46
   int active_tty = GetActiveTTY();
57
   if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) {
47
   if (host_tty_ != -1 && active_tty != -1 && host_tty_ != active_tty) {
58
@@ -515,7 +524,9 @@ void GpuWatchdogThreadImplV1::SetupXServer() {
48
@@ -528,7 +528,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
59
                       CopyFromParent, InputOutput, CopyFromParent, 0, nullptr);
60
     atom_ = XInternAtom(display_, "CHECK", x11::False);
61
   }
62
+#if !defined(OS_BSD)
63
   host_tty_ = GetActiveTTY();
64
+#endif
65
 }
66
 
67
 void GpuWatchdogThreadImplV1::SetupXChangeProp() {
68
@@ -615,7 +626,7 @@ base::ThreadTicks GpuWatchdogThreadImplV1::GetWatchedT
69
 }
49
 }
70
 #endif
50
 #endif
71
 
51
 
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_ipc_service_gpu__watchdog__thread.h (-9 / +16 lines)
Lines 1-13 Link Here
1
--- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.h.orig	2019-05-23 12:39:34 UTC
1
--- src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.h.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.h
2
+++ src/3rdparty/chromium/gpu/ipc/service/gpu_watchdog_thread.h
3
@@ -191,8 +191,10 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThread : publi
3
@@ -171,7 +171,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
4
   XDisplay* display_;
4
   base::ThreadTicks GetWatchedThreadTime();
5
   gfx::AcceleratedWidget window_;
5
 #endif
6
   XAtom atom_;
6
 
7
+#if !defined(OS_BSD)
7
-#if defined(USE_X11)
8
+#if defined(USE_X11) && !defined(OS_BSD)
9
   int GetActiveTTY() const;
10
 #endif
11
 
12
@@ -219,7 +219,7 @@ class GPU_IPC_SERVICE_EXPORT GpuWatchdogThreadImplV1
13
   base::Time check_time_;
14
   base::TimeTicks check_timeticks_;
15
 
16
-#if defined(USE_X11)
17
+#if defined(USE_X11) && !defined(OS_BSD)
8
   FILE* tty_file_;
18
   FILE* tty_file_;
9
   int host_tty_;
19
   int host_tty_;
10
+#endif
11
 #endif
20
 #endif
12
 
13
   base::RepeatingClosure alternative_terminate_for_testing_;
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_gpu_vulkan_vulkan__function__pointers.h (-3 / +6 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h
2
+++ src/3rdparty/chromium/gpu/vulkan/vulkan_function_pointers.h
3
@@ -161,14 +161,14 @@ struct VulkanFunctionPointers {
3
@@ -178,15 +178,15 @@ struct VulkanFunctionPointers {
4
       vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr;
4
       vkGetAndroidHardwareBufferPropertiesANDROIDFn = nullptr;
5
 #endif  // defined(OS_ANDROID)
5
 #endif  // defined(OS_ANDROID)
6
 
6
 
Lines 14-25 Link Here
14
-#if defined(OS_LINUX)
14
-#if defined(OS_LINUX)
15
+#if defined(OS_LINUX) || defined(OS_BSD)
15
+#if defined(OS_LINUX) || defined(OS_BSD)
16
   PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;
16
   PFN_vkGetMemoryFdKHR vkGetMemoryFdKHRFn = nullptr;
17
   PFN_vkGetMemoryFdPropertiesKHR vkGetMemoryFdPropertiesKHRFn = nullptr;
17
-#endif  // defined(OS_LINUX)
18
-#endif  // defined(OS_LINUX)
18
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
19
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
19
 
20
 
20
 #if defined(OS_FUCHSIA)
21
 #if defined(OS_FUCHSIA)
21
   PFN_vkImportSemaphoreZirconHandleFUCHSIA
22
   PFN_vkImportSemaphoreZirconHandleFUCHSIA
22
@@ -342,16 +342,16 @@ struct VulkanFunctionPointers {
23
@@ -374,18 +374,18 @@ struct VulkanFunctionPointers {
23
       ->vkGetAndroidHardwareBufferPropertiesANDROIDFn
24
       ->vkGetAndroidHardwareBufferPropertiesANDROIDFn
24
 #endif  // defined(OS_ANDROID)
25
 #endif  // defined(OS_ANDROID)
25
 
26
 
Lines 35-40 Link Here
35
-#if defined(OS_LINUX)
36
-#if defined(OS_LINUX)
36
+#if defined(OS_LINUX) || defined(OS_BSD)
37
+#if defined(OS_LINUX) || defined(OS_BSD)
37
 #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn
38
 #define vkGetMemoryFdKHR gpu::GetVulkanFunctionPointers()->vkGetMemoryFdKHRFn
39
 #define vkGetMemoryFdPropertiesKHR \
40
   gpu::GetVulkanFunctionPointers()->vkGetMemoryFdPropertiesKHRFn
38
-#endif  // defined(OS_LINUX)
41
-#endif  // defined(OS_LINUX)
39
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
42
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
40
 
43
 
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.cc (-13 / +13 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/media/base/video_frame.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/media/base/video_frame.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/media/base/video_frame.cc
2
+++ src/3rdparty/chromium/media/base/video_frame.cc
3
@@ -52,7 +52,7 @@ static std::string StorageTypeToString(
3
@@ -57,7 +57,7 @@ std::string VideoFrame::StorageTypeToString(
4
       return "OWNED_MEMORY";
4
       return "OWNED_MEMORY";
5
     case VideoFrame::STORAGE_SHMEM:
5
     case VideoFrame::STORAGE_SHMEM:
6
       return "SHMEM";
6
       return "SHMEM";
Lines 9-15 Link Here
9
     case VideoFrame::STORAGE_DMABUFS:
9
     case VideoFrame::STORAGE_DMABUFS:
10
       return "DMABUFS";
10
       return "DMABUFS";
11
 #endif
11
 #endif
12
@@ -67,7 +67,7 @@ static std::string StorageTypeToString(
12
@@ -74,7 +74,7 @@ std::string VideoFrame::StorageTypeToString(
13
 // static
13
 // static
14
 bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
14
 bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) {
15
   return
15
   return
Lines 18-24 Link Here
18
       // This is not strictly needed but makes explicit that, at VideoFrame
18
       // This is not strictly needed but makes explicit that, at VideoFrame
19
       // level, DmaBufs are not mappable from userspace.
19
       // level, DmaBufs are not mappable from userspace.
20
       storage_type != VideoFrame::STORAGE_DMABUFS &&
20
       storage_type != VideoFrame::STORAGE_DMABUFS &&
21
@@ -186,7 +186,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
21
@@ -257,7 +257,7 @@ static base::Optional<VideoFrameLayout> GetDefaultLayo
22
   return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
22
   return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes);
23
 }
23
 }
24
 
24
 
Lines 27-33 Link Here
27
 // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
27
 // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and
28
 // thus to have several VideoFrames share the same set of DMABUF FDs.
28
 // thus to have several VideoFrames share the same set of DMABUF FDs.
29
 class VideoFrame::DmabufHolder
29
 class VideoFrame::DmabufHolder
30
@@ -204,7 +204,7 @@ class VideoFrame::DmabufHolder
30
@@ -275,7 +275,7 @@ class VideoFrame::DmabufHolder
31
   friend class base::RefCountedThreadSafe<DmabufHolder>;
31
   friend class base::RefCountedThreadSafe<DmabufHolder>;
32
   ~DmabufHolder() = default;
32
   ~DmabufHolder() = default;
33
 };
33
 };
Lines 36-42 Link Here
36
 
36
 
37
 // static
37
 // static
38
 bool VideoFrame::IsValidConfig(VideoPixelFormat format,
38
 bool VideoFrame::IsValidConfig(VideoPixelFormat format,
39
@@ -510,7 +510,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuva
39
@@ -588,7 +588,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
40
   return frame;
40
   return frame;
41
 }
41
 }
42
 
42
 
Lines 45-61 Link Here
45
 // static
45
 // static
46
 scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
46
 scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
47
     const VideoFrameLayout& layout,
47
     const VideoFrameLayout& layout,
48
@@ -642,7 +642,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
48
@@ -724,7 +724,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
49
     }
49
     }
50
   }
50
   }
51
 
51
 
52
-#if defined(OS_LINUX)
52
-#if defined(OS_LINUX)
53
+#if defined(OS_LINUX) || defined(OS_BSD)
53
+#if defined(OS_LINUX) || defined(OS_BSD)
54
   DCHECK(frame.dmabuf_fds_);
54
   DCHECK(frame->dmabuf_fds_);
55
   // If there are any |dmabuf_fds_| plugged in, we should refer them too.
55
   // If there are any |dmabuf_fds_| plugged in, we should refer them too.
56
   wrapping_frame->dmabuf_fds_ = frame.dmabuf_fds_;
56
   wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_;
57
@@ -960,7 +960,7 @@ size_t VideoFrame::shared_memory_offset() const {
57
@@ -1050,7 +1050,7 @@ VideoFrame::mailbox_holder(size_t texture_index) const
58
   return shared_memory_offset_;
58
                         : mailbox_holders_[texture_index];
59
 }
59
 }
60
 
60
 
61
-#if defined(OS_LINUX)
61
-#if defined(OS_LINUX)
Lines 63-72 Link Here
63
 const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
63
 const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const {
64
   DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
64
   DCHECK_EQ(storage_type_, STORAGE_DMABUFS);
65
 
65
 
66
@@ -1112,7 +1112,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
66
@@ -1133,7 +1133,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
67
       storage_type_(storage_type),
67
       visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
68
       visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))),
68
       natural_size_(natural_size),
69
       natural_size_(natural_size),
69
       shared_memory_offset_(0),
70
-#if defined(OS_LINUX)
70
-#if defined(OS_LINUX)
71
+#if defined(OS_LINUX) || defined(OS_BSD)
71
+#if defined(OS_LINUX) || defined(OS_BSD)
72
       dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()),
72
       dmabuf_fds_(base::MakeRefCounted<DmabufHolder>()),
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_base_video__frame.h (-14 / +14 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/media/base/video_frame.h.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/media/base/video_frame.h.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/media/base/video_frame.h
2
+++ src/3rdparty/chromium/media/base/video_frame.h
3
@@ -42,9 +42,9 @@
3
@@ -39,9 +39,9 @@
4
 #include "base/mac/scoped_cftyperef.h"
4
 #include "base/mac/scoped_cftyperef.h"
5
 #endif  // defined(OS_MACOSX)
5
 #endif  // defined(OS_MACOSX)
6
 
6
 
Lines 10-28 Link Here
10
-#endif  // defined(OS_LINUX)
10
-#endif  // defined(OS_LINUX)
11
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
11
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
12
 
12
 
13
 namespace media {
13
 namespace gfx {
14
 
14
 class GpuMemoryBuffer;
15
@@ -79,7 +79,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
15
@@ -80,7 +80,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
16
     STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
16
     STORAGE_UNOWNED_MEMORY = 2,  // External, non owned data pointers.
17
     STORAGE_OWNED_MEMORY = 3,  // VideoFrame has allocated its own data buffer.
17
     STORAGE_OWNED_MEMORY = 3,  // VideoFrame has allocated its own data buffer.
18
     STORAGE_SHMEM = 4,         // Pixels are backed by Shared Memory.
18
     STORAGE_SHMEM = 4,         // Backed by unsafe (writable) shared memory.
19
-#if defined(OS_LINUX)
19
-#if defined(OS_LINUX)
20
+#if defined(OS_LINUX) || defined(OS_BSD)
20
+#if defined(OS_LINUX) || defined(OS_BSD)
21
     // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
21
     // TODO(mcasas): Consider turning this type into STORAGE_NATIVE
22
     // based on the idea of using this same enum value for both DMA
22
     // based on the idea of using this same enum value for both DMA
23
     // buffers on Linux and CVPixelBuffers on Mac (which currently use
23
     // buffers on Linux and CVPixelBuffers on Mac (which currently use
24
@@ -273,7 +273,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
24
@@ -245,7 +245,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
25
       uint8_t* a_data,
25
       ReleaseMailboxCB mailbox_holder_release_cb,
26
       base::TimeDelta timestamp);
26
       base::TimeDelta timestamp);
27
 
27
 
28
-#if defined(OS_LINUX)
28
-#if defined(OS_LINUX)
Lines 30-47 Link Here
30
   // Wraps provided dmabufs
30
   // Wraps provided dmabufs
31
   // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
31
   // (https://www.kernel.org/doc/html/latest/driver-api/dma-buf.html) with a
32
   // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
32
   // VideoFrame. The frame will take ownership of |dmabuf_fds|, and will
33
@@ -469,7 +469,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
33
@@ -476,7 +476,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
34
   // Returns the offset into the shared memory where the frame data begins.
34
   // mailbox, the caller must wait for the included sync point.
35
   size_t shared_memory_offset() const;
35
   const gpu::MailboxHolder& mailbox_holder(size_t texture_index) const;
36
 
36
 
37
-#if defined(OS_LINUX)
37
-#if defined(OS_LINUX)
38
+#if defined(OS_LINUX) || defined(OS_BSD)
38
+#if defined(OS_LINUX) || defined(OS_BSD)
39
   // Returns a vector containing the backing DmaBufs for this frame. The number
39
   // Returns a vector containing the backing DmaBufs for this frame. The number
40
   // of returned DmaBufs will be equal or less than the number of planes of
40
   // of returned DmaBufs will be equal or less than the number of planes of
41
   // the frame. If there are less, this means that the last FD contains the
41
   // the frame. If there are less, this means that the last FD contains the
42
@@ -672,7 +672,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
42
@@ -662,7 +662,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
43
   // memory.
43
   // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER.
44
   size_t shared_memory_offset_;
44
   std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_;
45
 
45
 
46
-#if defined(OS_LINUX)
46
-#if defined(OS_LINUX)
47
+#if defined(OS_LINUX) || defined(OS_BSD)
47
+#if defined(OS_LINUX) || defined(OS_BSD)
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__factory__linux.cc (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc
2
+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_factory_linux.cc
3
@@ -315,6 +315,7 @@ void VideoCaptureDeviceFactoryLinux::GetSupportedForma
3
@@ -315,6 +315,7 @@ void VideoCaptureDeviceFactoryLinux::GetSupportedForma
4
     supported_format.pixel_format =
4
     supported_format.pixel_format =
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_linux_video__capture__device__linux.cc (-1 / +1 lines)
Lines 1-4 Link Here
1
--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc
2
+++ src/3rdparty/chromium/media/capture/video/linux/video_capture_device_linux.cc
3
@@ -17,8 +17,10 @@
3
@@ -17,8 +17,10 @@
4
 #include <sys/videoio.h>
4
 #include <sys/videoio.h>
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_mock__gpu__memory__buffer__manager.cc (-11 lines)
Removed Link Here
1
--- src/3rdparty/chromium/media/capture/video/mock_gpu_memory_buffer_manager.cc.orig	2019-05-23 12:39:34 UTC
2
+++ src/3rdparty/chromium/media/capture/video/mock_gpu_memory_buffer_manager.cc
3
@@ -103,7 +103,7 @@ class FakeGpuMemoryBuffer : public gfx::GpuMemoryBuffe
4
     gfx::GpuMemoryBufferHandle handle;
5
     handle.type = gfx::NATIVE_PIXMAP;
6
     handle.id = handle_.id;
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
     handle.native_pixmap_handle =
10
         gfx::CloneHandleForIPC(handle_.native_pixmap_handle);
11
 #endif
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.cc (-11 lines)
Removed Link Here
1
--- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.cc.orig	2019-03-07 09:23:57 UTC
2
+++ src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.cc
3
@@ -63,7 +63,7 @@ bool SharedMemoryHandleProvider::InitFromMojoHandle(
4
   return true;
5
 }
6
 
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
 bool SharedMemoryHandleProvider::InitAsReadOnlyFromRawFileDescriptor(
10
     mojo::ScopedHandle fd_handle,
11
     uint32_t memory_size_in_bytes) {
(-)a/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_capture_video_shared__memory__handle__provider.h (-11 lines)
Removed Link Here
1
--- src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.h.orig	2019-03-07 09:23:57 UTC
2
+++ src/3rdparty/chromium/media/capture/video/shared_memory_handle_provider.h
3
@@ -38,7 +38,7 @@ class CAPTURE_EXPORT SharedMemoryHandleProvider
4
 
5
 // This requires platforms where base::SharedMemoryHandle is backed by a
6
 // file descriptor.
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
   bool InitAsReadOnlyFromRawFileDescriptor(mojo::ScopedHandle fd_handle,
10
                                            uint32_t memory_size_in_bytes);
11
 #endif  // defined(OS_LINUX)
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_buffer__validation.cc (+48 lines)
Added Link Here
1
--- src/3rdparty/chromium/media/gpu/buffer_validation.cc.orig	2020-03-16 14:04:24 UTC
2
+++ src/3rdparty/chromium/media/gpu/buffer_validation.cc
3
@@ -12,15 +12,15 @@
4
 #include "ui/gfx/geometry/size.h"
5
 #include "ui/gfx/gpu_memory_buffer.h"
6
 
7
-#if defined(OS_LINUX)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
 #include <sys/types.h>
10
 #include <unistd.h>
11
-#endif  // defined(OS_LINUX)
12
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
13
 
14
 namespace media {
15
 
16
 bool GetFileSize(const int fd, size_t* size) {
17
-#if defined(OS_LINUX)
18
+#if defined(OS_LINUX) || defined(OS_BSD)
19
   if (fd < 0) {
20
     VLOGF(1) << "Invalid file descriptor";
21
     return false;
22
@@ -46,7 +46,7 @@ bool GetFileSize(const int fd, size_t* size) {
23
 #else
24
   NOTIMPLEMENTED();
25
   return false;
26
-#endif  // defined(OS_LINUX)
27
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
28
 }
29
 
30
 bool VerifyGpuMemoryBufferHandle(media::VideoPixelFormat pixel_format,
31
@@ -56,7 +56,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm
32
     VLOGF(1) << "Unexpected GpuMemoryBufferType: " << gmb_handle.type;
33
     return false;
34
   }
35
-#if defined(OS_LINUX)
36
+#if defined(OS_LINUX) || defined(OS_BSD)
37
   const size_t num_planes = media::VideoFrame::NumPlanes(pixel_format);
38
   if (num_planes != gmb_handle.native_pixmap_handle.planes.size() ||
39
       num_planes == 0) {
40
@@ -108,7 +108,7 @@ bool VerifyGpuMemoryBufferHandle(media::VideoPixelForm
41
 #else
42
   NOTIMPLEMENTED();
43
   return false;
44
-#endif  // defined(OS_LINUX)
45
+#endif  // defined(OS_LINUX) || defined(OS_BSD)
46
 }
47
 
48
 }  // namespace media
(-)b/www/qt5-webengine/files/patch-src_3rdparty_chromium_media_gpu_chromeos_libyuv__image__processor.cc (-7 / +7 lines)
Lines 1-6 Link Here
1
--- src/3rdparty/chromium/media/gpu/libyuv_image_processor.cc.orig	2019-11-27 21:12:25 UTC
1
--- src/3rdparty/chromium/media/gpu/chromeos/libyuv_image_processor.cc.orig	2020-04-08 09:41:36 UTC
2
+++ src/3rdparty/chromium/media/gpu/libyuv_image_processor.cc
2
+++ src/3rdparty/chromium/media/gpu/chromeos/libyuv_image_processor.cc
3
@@ -91,7 +91,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
3
@@ -82,7 +82,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
4
   // LibYUVImageProcessor supports only memory-based video frame for input.
4
   // LibYUVImageProcessor supports only memory-based video frame for input.
5
   VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN;
5
   VideoFrame::StorageType input_storage_type = VideoFrame::STORAGE_UNKNOWN;
6
   for (auto input_type : input_config.preferred_storage_types) {
6
   for (auto input_type : input_config.preferred_storage_types) {
Lines 8-15 Link Here
8
+#if defined(OS_LINUX) || defined(OS_BSD)
8
+#if defined(OS_LINUX) || defined(OS_BSD)
9
     if (input_type == VideoFrame::STORAGE_DMABUFS) {
9
     if (input_type == VideoFrame::STORAGE_DMABUFS) {
10
       video_frame_mapper = VideoFrameMapperFactory::CreateMapper(
10
       video_frame_mapper = VideoFrameMapperFactory::CreateMapper(
11
           input_config.layout.format(), true);
11
           input_config.fourcc.ToVideoPixelFormat(), VideoFrame::STORAGE_DMABUFS,
12
@@ -100,7 +100,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
12
@@ -92,7 +92,7 @@ std::unique_ptr<LibYUVImageProcessor> LibYUVImageProce
13
         break;
13
         break;
14
       }
14
       }
15
     }
15
     }
Lines 18-24 Link Here
18
 
18
 
19
     if (VideoFrame::IsStorageTypeMappable(input_type)) {
19
     if (VideoFrame::IsStorageTypeMappable(input_type)) {
20
       input_storage_type = input_type;
20
       input_storage_type = input_type;
21
@@ -203,7 +203,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
21
@@ -191,7 +191,7 @@ void LibYUVImageProcessor::ProcessTask(scoped_refptr<V
22
                                        FrameReadyCB cb) {
22
                                        FrameReadyCB cb) {