diff options
Diffstat (limited to 'src')
18 files changed, 30 insertions, 0 deletions
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 23dc00dfa..ff8c958cb 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -535,6 +535,10 @@ foreach(arch ${archs}) CONDITION QT_FEATURE_webengine_system_gbm ) extend_gn_list(gnArgArg + ARGS rtc_system_openh264 + CONDITION QT_FEATURE_webengine_webrtc_system_openh264 + ) + extend_gn_list(gnArgArg ARGS use_vaapi CONDITION QT_FEATURE_webengine_vaapi ) diff --git a/src/core/api/configure.cmake b/src/core/api/configure.cmake index 4a556656e..79f44f9a2 100644 --- a/src/core/api/configure.cmake +++ b/src/core/api/configure.cmake @@ -84,6 +84,12 @@ qt_feature("webengine-system-gbm" PRIVATE AUTODETECT UNIX CONDITION GBM_FOUND ) +qt_feature("webengine-webrtc-system-openh264" PRIVATE + LABEL "Use system openh264 for webrtc" + CONDITION UNIX + AND QT_FEATURE_webengine_system_openh264 + AND QT_FEATURE_webengine_proprietary_codecs +) qt_feature("webengine-printing-and-pdf" PRIVATE LABEL "Printing and PDF" PURPOSE "Provides printing and output to PDF." @@ -224,6 +230,10 @@ qt_configure_add_summary_entry( ARGS "webengine-system-pulseaudio" CONDITION LINUX ) +qt_configure_add_summary_entry( + ARGS "webengine-webrtc-system-openh264" + CONDITION UNIX +) qt_configure_add_summary_entry(ARGS "webengine-v8-context-snapshot") qt_configure_add_summary_entry(ARGS "webenginedriver") qt_configure_end_summary_section() # end of "Qt WebEngineCore" section diff --git a/src/webenginewidgets/api/qtwebenginewidgetsglobal.h b/src/webenginewidgets/api/qtwebenginewidgetsglobal.h index 58b9c7a2b..edf6632ac 100644 --- a/src/webenginewidgets/api/qtwebenginewidgetsglobal.h +++ b/src/webenginewidgets/api/qtwebenginewidgetsglobal.h @@ -1,5 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #ifndef QTWEBENGINEWIDGETSGLOBAL_H #define QTWEBENGINEWIDGETSGLOBAL_H diff --git a/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp b/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp index 83814fe4a..2adcbf912 100644 --- a/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp +++ b/src/webenginewidgets/api/qwebenginenotificationpresenter.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #include "qwebenginenotificationpresenter_p.h" diff --git a/src/webenginewidgets/api/qwebenginenotificationpresenter_p.h b/src/webenginewidgets/api/qwebenginenotificationpresenter_p.h index 61e7f9e45..c42c6cc84 100644 --- a/src/webenginewidgets/api/qwebenginenotificationpresenter_p.h +++ b/src/webenginewidgets/api/qwebenginenotificationpresenter_p.h @@ -1,5 +1,6 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #ifndef QWEBENGINENOTIFICATIONPRESENTER_P_H #define QWEBENGINENOTIFICATIONPRESENTER_P_H diff --git a/src/webenginewidgets/api/qwebengineview.cpp b/src/webenginewidgets/api/qwebengineview.cpp index 53fcc4628..9745654ac 100644 --- a/src/webenginewidgets/api/qwebengineview.cpp +++ b/src/webenginewidgets/api/qwebengineview.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:critical reason:data-parser #include "qapplication.h" #include "qwebenginenotificationpresenter_p.h" diff --git a/src/webenginewidgets/api/qwebengineview.h b/src/webenginewidgets/api/qwebengineview.h index 008aaa032..48d82acb1 100644 --- a/src/webenginewidgets/api/qwebengineview.h +++ b/src/webenginewidgets/api/qwebengineview.h @@ -1,5 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:critical reason:data-parser #ifndef QWEBENGINEVIEW_H #define QWEBENGINEVIEW_H diff --git a/src/webenginewidgets/api/qwebengineview_p.h b/src/webenginewidgets/api/qwebengineview_p.h index 389bc4a66..27ad6db71 100644 --- a/src/webenginewidgets/api/qwebengineview_p.h +++ b/src/webenginewidgets/api/qwebengineview_p.h @@ -1,5 +1,6 @@ // Copyright (C) 2021 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:critical reason:data-parser #ifndef QWEBENGINEVIEW_P_H #define QWEBENGINEVIEW_P_H diff --git a/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.cpp b/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.cpp index 6ba64a178..f018b6d19 100644 --- a/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.cpp +++ b/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #include "qwebengineview_plugin.h" diff --git a/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.h b/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.h index a7150151d..6706ab34e 100644 --- a/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.h +++ b/src/webenginewidgets/plugins/qwebengineview/qwebengineview_plugin.h @@ -1,5 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #ifndef QWEBENGINEVIEW_PLUGIN_H #define QWEBENGINEVIEW_PLUGIN_H diff --git a/src/webenginewidgets/qwebengine_accessible.cpp b/src/webenginewidgets/qwebengine_accessible.cpp index cbdd90104..402a8cf0f 100644 --- a/src/webenginewidgets/qwebengine_accessible.cpp +++ b/src/webenginewidgets/qwebengine_accessible.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #include "qwebengine_accessible_p.h" diff --git a/src/webenginewidgets/qwebengine_accessible_p.h b/src/webenginewidgets/qwebengine_accessible_p.h index 99604d90d..c95514737 100644 --- a/src/webenginewidgets/qwebengine_accessible_p.h +++ b/src/webenginewidgets/qwebengine_accessible_p.h @@ -1,5 +1,6 @@ // Copyright (C) 2016 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #ifndef QWEBENGINE_ACCESSIBLE_H #define QWEBENGINE_ACCESSIBLE_H diff --git a/src/webenginewidgets/ui/autofillpopupwidget.cpp b/src/webenginewidgets/ui/autofillpopupwidget.cpp index a4dc31beb..4e463361a 100644 --- a/src/webenginewidgets/ui/autofillpopupwidget.cpp +++ b/src/webenginewidgets/ui/autofillpopupwidget.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #include "autofillpopupwidget_p.h" #include "qwebengineview.h" diff --git a/src/webenginewidgets/ui/autofillpopupwidget_p.h b/src/webenginewidgets/ui/autofillpopupwidget_p.h index 79decc6ab..d84b34bef 100644 --- a/src/webenginewidgets/ui/autofillpopupwidget_p.h +++ b/src/webenginewidgets/ui/autofillpopupwidget_p.h @@ -1,5 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #ifndef AUTOFILLPOPUPWIDGET_P_H #define AUTOFILLPOPUPWIDGET_P_H diff --git a/src/webenginewidgets/ui/touchhandlewidget.cpp b/src/webenginewidgets/ui/touchhandlewidget.cpp index 88af0ff36..b855e425c 100644 --- a/src/webenginewidgets/ui/touchhandlewidget.cpp +++ b/src/webenginewidgets/ui/touchhandlewidget.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #include "touchhandlewidget_p.h" #include "qwebengineview.h" diff --git a/src/webenginewidgets/ui/touchhandlewidget_p.h b/src/webenginewidgets/ui/touchhandlewidget_p.h index 9f181c935..9ab8fc9d6 100644 --- a/src/webenginewidgets/ui/touchhandlewidget_p.h +++ b/src/webenginewidgets/ui/touchhandlewidget_p.h @@ -1,5 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #ifndef TOUCHHANDLEWIDGET_P_H #define TOUCHHANDLEWIDGET_P_H diff --git a/src/webenginewidgets/ui/touchselectionmenuwidget.cpp b/src/webenginewidgets/ui/touchselectionmenuwidget.cpp index ff69fe84b..dee65ae0e 100644 --- a/src/webenginewidgets/ui/touchselectionmenuwidget.cpp +++ b/src/webenginewidgets/ui/touchselectionmenuwidget.cpp @@ -1,5 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #include "touchselectionmenuwidget_p.h" #include "qwebengineview.h" diff --git a/src/webenginewidgets/ui/touchselectionmenuwidget_p.h b/src/webenginewidgets/ui/touchselectionmenuwidget_p.h index 1f822023b..89216a510 100644 --- a/src/webenginewidgets/ui/touchselectionmenuwidget_p.h +++ b/src/webenginewidgets/ui/touchselectionmenuwidget_p.h @@ -1,5 +1,6 @@ // Copyright (C) 2022 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +// Qt-Security score:significant reason:default #ifndef TOUCHSELECTIONMENUWIDGET_P_H #define TOUCHSELECTIONMENUWIDGET_P_H |