From 4bff5a66084a07c78603c8255126aafcff61177c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Br=C3=BCning?= Date: Mon, 20 Aug 2018 12:10:51 +0200 Subject: Update Chromium MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This pulls in the following changes: * 084a80 [Backport] Security Bug 831117 2/2 * f78390 [Backport] Security Bug 831117 1/2 * d739b9 [Backport] Security Bug 683418 * cf51b5 [Backport] Security Bug 840695 * 009019 [Backport] Security Bug 838886 * 424911 [Backport] CVE-2018-6158 * 6d5f60 Fix compilation issues in introduced previous commits * a6e2ca [Backport] Security fix for Chromium bug 860721 * 3e6d0c [Backport] Security fix for Chromium bug 839197 * f4115a [Backport] additional patch for security fix for Chromium bug 839197 Task-number: QTBUG-69663 Change-Id: I6ad8509efb210972b753d8763e02cc31e90e0f8a Reviewed-by: Jüri Valdmann --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty b/src/3rdparty index 82740520c..084a80f98 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 82740520c942c91f596ee53ff3ca09ac4e494890 +Subproject commit 084a80f98014f18de47056567cb89806a5ad4b30 -- cgit v1.2.3 From dab4814dc4187db345a53b234c4cdd4cbdcf4bce Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Wed, 15 Aug 2018 12:57:50 +0200 Subject: Document Tango icons used in examples MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-62053 Change-Id: I2df300239f4f02bb74f1ec27a74874b3877aabd0 Reviewed-by: Michael Brüning --- .../quicknanobrowser/doc/src/quicknanobrowser.qdoc | 10 +++++++++ .../quicknanobrowser/icons/3rdparty/COPYING | 1 + .../quicknanobrowser/icons/3rdparty/go-next.png | Bin 0 -> 930 bytes .../icons/3rdparty/go-previous.png | Bin 0 -> 955 bytes .../icons/3rdparty/process-stop.png | Bin 0 -> 1272 bytes .../icons/3rdparty/qt_attribution.json | 24 +++++++++++++++++++++ .../icons/3rdparty/view-refresh.png | Bin 0 -> 1364 bytes .../webengine/quicknanobrowser/icons/go-next.png | Bin 930 -> 0 bytes .../quicknanobrowser/icons/go-previous.png | Bin 955 -> 0 bytes .../quicknanobrowser/icons/process-stop.png | Bin 1272 -> 0 bytes .../quicknanobrowser/icons/view-refresh.png | Bin 1364 -> 0 bytes examples/webengine/quicknanobrowser/resources.qrc | 8 +++---- .../cookiebrowser/3rdparty/COPYING | 1 + .../cookiebrowser/3rdparty/qt_attribution.json | 24 +++++++++++++++++++++ .../cookiebrowser/3rdparty/view-refresh.png | Bin 0 -> 1364 bytes .../cookiebrowser/cookiebrowser.qrc | 2 +- .../cookiebrowser/doc/src/cookiebrowser.qdoc | 10 +++++++++ .../cookiebrowser/view-refresh.png | Bin 1364 -> 0 bytes .../simplebrowser/data/3rdparty/COPYING | 1 + .../simplebrowser/data/3rdparty/dialog-error.png | Bin 0 -> 1645 bytes .../simplebrowser/data/3rdparty/edit-clear.png | Bin 0 -> 1682 bytes .../simplebrowser/data/3rdparty/go-bottom.png | Bin 0 -> 1263 bytes .../simplebrowser/data/3rdparty/go-next.png | Bin 0 -> 1219 bytes .../simplebrowser/data/3rdparty/go-previous.png | Bin 0 -> 1200 bytes .../simplebrowser/data/3rdparty/process-stop.png | Bin 0 -> 1927 bytes .../data/3rdparty/qt_attribution.json | 24 +++++++++++++++++++++ .../simplebrowser/data/3rdparty/text-html.png | Bin 0 -> 1759 bytes .../simplebrowser/data/3rdparty/view-refresh.png | Bin 0 -> 2024 bytes .../simplebrowser/data/dialog-error.png | Bin 1645 -> 0 bytes .../simplebrowser/data/edit-clear.png | Bin 1682 -> 0 bytes .../simplebrowser/data/go-bottom.png | Bin 1263 -> 0 bytes .../simplebrowser/data/go-next.png | Bin 1219 -> 0 bytes .../simplebrowser/data/go-previous.png | Bin 1200 -> 0 bytes .../simplebrowser/data/process-stop.png | Bin 1927 -> 0 bytes .../simplebrowser/data/simplebrowser.qrc | 18 +++++++++------- .../simplebrowser/data/text-html.png | Bin 1759 -> 0 bytes .../simplebrowser/data/view-refresh.png | Bin 2024 -> 0 bytes .../simplebrowser/doc/src/simplebrowser.qdoc | 12 +++++++---- .../stylesheetbrowser/3rdparty/COPYING | 1 + .../stylesheetbrowser/3rdparty/qt_attribution.json | 24 +++++++++++++++++++++ .../stylesheetbrowser/3rdparty/view-refresh.png | Bin 0 -> 1364 bytes .../doc/src/stylesheetbrowser.qdoc | 10 +++++++++ .../stylesheetbrowser/stylesheetbrowser.qrc | 2 +- .../stylesheetbrowser/view-refresh.png | Bin 1364 -> 0 bytes tests/quicktestbrowser/resources.qrc | 8 +++---- 45 files changed, 158 insertions(+), 22 deletions(-) create mode 100644 examples/webengine/quicknanobrowser/icons/3rdparty/COPYING create mode 100644 examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png create mode 100644 examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png create mode 100644 examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png create mode 100644 examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json create mode 100644 examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png delete mode 100644 examples/webengine/quicknanobrowser/icons/go-next.png delete mode 100644 examples/webengine/quicknanobrowser/icons/go-previous.png delete mode 100644 examples/webengine/quicknanobrowser/icons/process-stop.png delete mode 100644 examples/webengine/quicknanobrowser/icons/view-refresh.png create mode 100644 examples/webenginewidgets/cookiebrowser/3rdparty/COPYING create mode 100644 examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json create mode 100644 examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png delete mode 100644 examples/webenginewidgets/cookiebrowser/view-refresh.png create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png create mode 100644 examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png delete mode 100644 examples/webenginewidgets/simplebrowser/data/dialog-error.png delete mode 100644 examples/webenginewidgets/simplebrowser/data/edit-clear.png delete mode 100644 examples/webenginewidgets/simplebrowser/data/go-bottom.png delete mode 100644 examples/webenginewidgets/simplebrowser/data/go-next.png delete mode 100644 examples/webenginewidgets/simplebrowser/data/go-previous.png delete mode 100644 examples/webenginewidgets/simplebrowser/data/process-stop.png delete mode 100644 examples/webenginewidgets/simplebrowser/data/text-html.png delete mode 100644 examples/webenginewidgets/simplebrowser/data/view-refresh.png create mode 100644 examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING create mode 100644 examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json create mode 100644 examples/webenginewidgets/stylesheetbrowser/3rdparty/view-refresh.png delete mode 100644 examples/webenginewidgets/stylesheetbrowser/view-refresh.png diff --git a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc index 190604fc4..3188bb299 100644 --- a/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc +++ b/examples/webengine/quicknanobrowser/doc/src/quicknanobrowser.qdoc @@ -136,4 +136,14 @@ \printuntil Action \skipto Escape \printuntil /^\ {4}\}/ + + \section1 Files and Attributions + + The example uses icons from the Tango Icon Library: + + \table + \row + \li \l{quicknanobrowser-tango}{Tango Icon Library} + \li Public Domain + \endtable */ diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/COPYING b/examples/webengine/quicknanobrowser/icons/3rdparty/COPYING new file mode 100644 index 000000000..220881da6 --- /dev/null +++ b/examples/webengine/quicknanobrowser/icons/3rdparty/COPYING @@ -0,0 +1 @@ +The icons in this repository are herefore released into the Public Domain. diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png b/examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png new file mode 100644 index 000000000..6f3f65d33 Binary files /dev/null and b/examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png differ diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png b/examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png new file mode 100644 index 000000000..93be3d1ee Binary files /dev/null and b/examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png differ diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png b/examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png new file mode 100644 index 000000000..b68290bf1 Binary files /dev/null and b/examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png differ diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json b/examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json new file mode 100644 index 000000000..4e5a44448 --- /dev/null +++ b/examples/webengine/quicknanobrowser/icons/3rdparty/qt_attribution.json @@ -0,0 +1,24 @@ +{ + "Id": "quicknanobrowser-tango", + "Name": "Tango Icon Library", + "QDocModule": "qtwebengine", + "QtUsage": "Used in WebEngine Quick Nano Browser example.", + + "QtParts": [ "examples" ], + "Description": "Selected icons from the Tango Icon Library", + "Homepage": "http://tango.freedesktop.org/Tango_Icon_Library", + "Version": "0.8.90", + "DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz", + "LicenseId": "DocumentRef-PublicDomain", + "License": "Public Domain", + "LicenseFile": "COPYING", + "Copyright": "Ulisse Perusin +Steven Garrity +Lapo Calamandrei +Ryan Collier +Rodney Dawes +Andreas Nilsson +Tuomas Kuosmanen +Garrett LeSage +Jakub Steiner " +} diff --git a/examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png b/examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png new file mode 100644 index 000000000..cab4d02c7 Binary files /dev/null and b/examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png differ diff --git a/examples/webengine/quicknanobrowser/icons/go-next.png b/examples/webengine/quicknanobrowser/icons/go-next.png deleted file mode 100644 index 6f3f65d33..000000000 Binary files a/examples/webengine/quicknanobrowser/icons/go-next.png and /dev/null differ diff --git a/examples/webengine/quicknanobrowser/icons/go-previous.png b/examples/webengine/quicknanobrowser/icons/go-previous.png deleted file mode 100644 index 93be3d1ee..000000000 Binary files a/examples/webengine/quicknanobrowser/icons/go-previous.png and /dev/null differ diff --git a/examples/webengine/quicknanobrowser/icons/process-stop.png b/examples/webengine/quicknanobrowser/icons/process-stop.png deleted file mode 100644 index b68290bf1..000000000 Binary files a/examples/webengine/quicknanobrowser/icons/process-stop.png and /dev/null differ diff --git a/examples/webengine/quicknanobrowser/icons/view-refresh.png b/examples/webengine/quicknanobrowser/icons/view-refresh.png deleted file mode 100644 index cab4d02c7..000000000 Binary files a/examples/webengine/quicknanobrowser/icons/view-refresh.png and /dev/null differ diff --git a/examples/webengine/quicknanobrowser/resources.qrc b/examples/webengine/quicknanobrowser/resources.qrc index 694f8d19b..c6270897d 100644 --- a/examples/webengine/quicknanobrowser/resources.qrc +++ b/examples/webengine/quicknanobrowser/resources.qrc @@ -7,9 +7,9 @@ FullScreenNotification.qml - icons/go-next.png - icons/go-previous.png - icons/process-stop.png - icons/view-refresh.png + icons/3rdparty/go-next.png + icons/3rdparty/go-previous.png + icons/3rdparty/process-stop.png + icons/3rdparty/view-refresh.png diff --git a/examples/webenginewidgets/cookiebrowser/3rdparty/COPYING b/examples/webenginewidgets/cookiebrowser/3rdparty/COPYING new file mode 100644 index 000000000..220881da6 --- /dev/null +++ b/examples/webenginewidgets/cookiebrowser/3rdparty/COPYING @@ -0,0 +1 @@ +The icons in this repository are herefore released into the Public Domain. diff --git a/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json b/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json new file mode 100644 index 000000000..91a0899c6 --- /dev/null +++ b/examples/webenginewidgets/cookiebrowser/3rdparty/qt_attribution.json @@ -0,0 +1,24 @@ +{ + "Id": "cookiebrowser-tango", + "Name": "Tango Icon Library", + "QDocModule": "qtwebengine", + "QtUsage": "Used in WebEngine Cookie Browser example.", + + "QtParts": [ "examples" ], + "Description": "Selected icons from the Tango Icon Library", + "Homepage": "http://tango.freedesktop.org/Tango_Icon_Library", + "Version": "0.8.90", + "DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz", + "LicenseId": "DocumentRef-PublicDomain", + "License": "Public Domain", + "LicenseFile": "COPYING", + "Copyright": "Ulisse Perusin +Steven Garrity +Lapo Calamandrei +Ryan Collier +Rodney Dawes +Andreas Nilsson +Tuomas Kuosmanen +Garrett LeSage +Jakub Steiner " +} diff --git a/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png new file mode 100644 index 000000000..cab4d02c7 Binary files /dev/null and b/examples/webenginewidgets/cookiebrowser/3rdparty/view-refresh.png differ diff --git a/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc b/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc index 8805f2c53..a1cebd6a7 100644 --- a/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc +++ b/examples/webenginewidgets/cookiebrowser/cookiebrowser.qrc @@ -1,5 +1,5 @@ - view-refresh.png + 3rdparty/view-refresh.png diff --git a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc index 55ccd33d5..a1b4eeb18 100644 --- a/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc +++ b/examples/webenginewidgets/cookiebrowser/doc/src/cookiebrowser.qdoc @@ -38,4 +38,14 @@ well as delete cookies and add new cookies. \include examples-run.qdocinc + + \section1 Files and Attributions + + The example uses icons from the Tango Icon Library: + + \table + \row + \li \l{cookiebrowser-tango}{Tango Icon Library} + \li Public Domain + \endtable */ diff --git a/examples/webenginewidgets/cookiebrowser/view-refresh.png b/examples/webenginewidgets/cookiebrowser/view-refresh.png deleted file mode 100644 index cab4d02c7..000000000 Binary files a/examples/webenginewidgets/cookiebrowser/view-refresh.png and /dev/null differ diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING b/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING new file mode 100644 index 000000000..220881da6 --- /dev/null +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/COPYING @@ -0,0 +1 @@ +The icons in this repository are herefore released into the Public Domain. diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png new file mode 100644 index 000000000..cdd95bade Binary files /dev/null and b/examples/webenginewidgets/simplebrowser/data/3rdparty/dialog-error.png differ diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png new file mode 100644 index 000000000..5542948bc Binary files /dev/null and b/examples/webenginewidgets/simplebrowser/data/3rdparty/edit-clear.png differ diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png new file mode 100644 index 000000000..bf973fedc Binary files /dev/null and b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-bottom.png differ diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png new file mode 100644 index 000000000..a68e2db77 Binary files /dev/null and b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-next.png differ diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png new file mode 100644 index 000000000..c37bc0414 Binary files /dev/null and b/examples/webenginewidgets/simplebrowser/data/3rdparty/go-previous.png differ diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png new file mode 100644 index 000000000..e7a8d1722 Binary files /dev/null and b/examples/webenginewidgets/simplebrowser/data/3rdparty/process-stop.png differ diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json b/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json new file mode 100644 index 000000000..853adeb20 --- /dev/null +++ b/examples/webenginewidgets/simplebrowser/data/3rdparty/qt_attribution.json @@ -0,0 +1,24 @@ +{ + "Id": "simplebrowser-tango", + "Name": "Tango Icon Library", + "QDocModule": "qtwebengine", + "QtUsage": "Used in WebEngine SimpleBrowser example.", + + "QtParts": [ "examples" ], + "Description": "Selected icons from the Tango Icon Library", + "Homepage": "http://tango.freedesktop.org/Tango_Icon_Library", + "Version": "0.8.90", + "DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz", + "LicenseId": "DocumentRef-PublicDomain", + "License": "Public Domain", + "LicenseFile": "COPYING", + "Copyright": "Ulisse Perusin +Steven Garrity +Lapo Calamandrei +Ryan Collier +Rodney Dawes +Andreas Nilsson +Tuomas Kuosmanen +Garrett LeSage +Jakub Steiner " +} diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png new file mode 100644 index 000000000..a896697d7 Binary files /dev/null and b/examples/webenginewidgets/simplebrowser/data/3rdparty/text-html.png differ diff --git a/examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png b/examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png new file mode 100644 index 000000000..606ea9eba Binary files /dev/null and b/examples/webenginewidgets/simplebrowser/data/3rdparty/view-refresh.png differ diff --git a/examples/webenginewidgets/simplebrowser/data/dialog-error.png b/examples/webenginewidgets/simplebrowser/data/dialog-error.png deleted file mode 100644 index cdd95bade..000000000 Binary files a/examples/webenginewidgets/simplebrowser/data/dialog-error.png and /dev/null differ diff --git a/examples/webenginewidgets/simplebrowser/data/edit-clear.png b/examples/webenginewidgets/simplebrowser/data/edit-clear.png deleted file mode 100644 index 5542948bc..000000000 Binary files a/examples/webenginewidgets/simplebrowser/data/edit-clear.png and /dev/null differ diff --git a/examples/webenginewidgets/simplebrowser/data/go-bottom.png b/examples/webenginewidgets/simplebrowser/data/go-bottom.png deleted file mode 100644 index bf973fedc..000000000 Binary files a/examples/webenginewidgets/simplebrowser/data/go-bottom.png and /dev/null differ diff --git a/examples/webenginewidgets/simplebrowser/data/go-next.png b/examples/webenginewidgets/simplebrowser/data/go-next.png deleted file mode 100644 index a68e2db77..000000000 Binary files a/examples/webenginewidgets/simplebrowser/data/go-next.png and /dev/null differ diff --git a/examples/webenginewidgets/simplebrowser/data/go-previous.png b/examples/webenginewidgets/simplebrowser/data/go-previous.png deleted file mode 100644 index c37bc0414..000000000 Binary files a/examples/webenginewidgets/simplebrowser/data/go-previous.png and /dev/null differ diff --git a/examples/webenginewidgets/simplebrowser/data/process-stop.png b/examples/webenginewidgets/simplebrowser/data/process-stop.png deleted file mode 100644 index e7a8d1722..000000000 Binary files a/examples/webenginewidgets/simplebrowser/data/process-stop.png and /dev/null differ diff --git a/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc index d81b08a64..eda8e3f3d 100644 --- a/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc +++ b/examples/webenginewidgets/simplebrowser/data/simplebrowser.qrc @@ -1,14 +1,16 @@ AppLogoColor.png - dialog-error.png - edit-clear.png - go-bottom.png - go-next.png - go-previous.png - process-stop.png - text-html.png - view-refresh.png ninja.png + + 3rdparty/dialog-error.png + 3rdparty/edit-clear.png + 3rdparty/go-bottom.png + 3rdparty/go-next.png + 3rdparty/go-previous.png + 3rdparty/process-stop.png + 3rdparty/text-html.png + 3rdparty/view-refresh.png + diff --git a/examples/webenginewidgets/simplebrowser/data/text-html.png b/examples/webenginewidgets/simplebrowser/data/text-html.png deleted file mode 100644 index a896697d7..000000000 Binary files a/examples/webenginewidgets/simplebrowser/data/text-html.png and /dev/null differ diff --git a/examples/webenginewidgets/simplebrowser/data/view-refresh.png b/examples/webenginewidgets/simplebrowser/data/view-refresh.png deleted file mode 100644 index 606ea9eba..000000000 Binary files a/examples/webenginewidgets/simplebrowser/data/view-refresh.png and /dev/null differ diff --git a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc index 2231d9667..b0c426232 100644 --- a/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc +++ b/examples/webenginewidgets/simplebrowser/doc/src/simplebrowser.qdoc @@ -327,9 +327,13 @@ finished or when an error occurs. See \c downloadmanagerwidget.cpp for an example of how these signals can be handled. - \section1 Licensing + \section1 Files and Attributions - All icons used in the example, with the exception of \c{AppLogoColor.png}, - originate from the public domain - \l{http://tango.freedesktop.org/Tango_Icon_Library}{Tango Icon Library}. + The example uses icons from the Tango Icon Library: + + \table + \row + \li \l{simplebrowser-tango}{Tango Icon Library} + \li Public Domain + \endtable */ diff --git a/examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING b/examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING new file mode 100644 index 000000000..220881da6 --- /dev/null +++ b/examples/webenginewidgets/stylesheetbrowser/3rdparty/COPYING @@ -0,0 +1 @@ +The icons in this repository are herefore released into the Public Domain. diff --git a/examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json b/examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json new file mode 100644 index 000000000..ffca1812b --- /dev/null +++ b/examples/webenginewidgets/stylesheetbrowser/3rdparty/qt_attribution.json @@ -0,0 +1,24 @@ +{ + "Id": "stylesheetbrowser-tango", + "Name": "Tango Icon Library", + "QDocModule": "qtwebengine", + "QtUsage": "Used in WebEngine StyleSheet Browser example.", + + "QtParts": [ "examples" ], + "Description": "Selected icons from the Tango Icon Library", + "Homepage": "http://tango.freedesktop.org/Tango_Icon_Library", + "Version": "0.8.90", + "DownloadLocation": "http://tango.freedesktop.org/releases/tango-icon-theme-0.8.90.tar.gz", + "LicenseId": "DocumentRef-PublicDomain", + "License": "Public Domain", + "LicenseFile": "COPYING", + "Copyright": "Ulisse Perusin +Steven Garrity +Lapo Calamandrei +Ryan Collier +Rodney Dawes +Andreas Nilsson +Tuomas Kuosmanen +Garrett LeSage +Jakub Steiner " +} diff --git a/examples/webenginewidgets/stylesheetbrowser/3rdparty/view-refresh.png b/examples/webenginewidgets/stylesheetbrowser/3rdparty/view-refresh.png new file mode 100644 index 000000000..cab4d02c7 Binary files /dev/null and b/examples/webenginewidgets/stylesheetbrowser/3rdparty/view-refresh.png differ diff --git a/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc b/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc index b4db10836..5b271bafb 100644 --- a/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc +++ b/examples/webenginewidgets/stylesheetbrowser/doc/src/stylesheetbrowser.qdoc @@ -55,4 +55,14 @@ \quotefromfile webenginewidgets/stylesheetbrowser/mainwindow.cpp \skipto MainWindow::removeStyleSheet \printuntil /^\}/ + + \section1 Files and Attributions + + The example uses icons from the Tango Icon Library: + + \table + \row + \li \l{stylesheetbrowser-tango}{Tango Icon Library} + \li Public Domain + \endtable */ diff --git a/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc b/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc index 8805f2c53..a1cebd6a7 100644 --- a/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc +++ b/examples/webenginewidgets/stylesheetbrowser/stylesheetbrowser.qrc @@ -1,5 +1,5 @@ - view-refresh.png + 3rdparty/view-refresh.png diff --git a/examples/webenginewidgets/stylesheetbrowser/view-refresh.png b/examples/webenginewidgets/stylesheetbrowser/view-refresh.png deleted file mode 100644 index cab4d02c7..000000000 Binary files a/examples/webenginewidgets/stylesheetbrowser/view-refresh.png and /dev/null differ diff --git a/tests/quicktestbrowser/resources.qrc b/tests/quicktestbrowser/resources.qrc index b1652852b..63ff051de 100644 --- a/tests/quicktestbrowser/resources.qrc +++ b/tests/quicktestbrowser/resources.qrc @@ -11,9 +11,9 @@ - ../../examples/webengine/quicknanobrowser/icons/go-next.png - ../../examples/webengine/quicknanobrowser/icons/go-previous.png - ../../examples/webengine/quicknanobrowser/icons/process-stop.png - ../../examples/webengine/quicknanobrowser/icons/view-refresh.png + ../../examples/webengine/quicknanobrowser/icons/3rdparty/go-next.png + ../../examples/webengine/quicknanobrowser/icons/3rdparty/go-previous.png + ../../examples/webengine/quicknanobrowser/icons/3rdparty/process-stop.png + ../../examples/webengine/quicknanobrowser/icons/3rdparty/view-refresh.png -- cgit v1.2.3 From 04ccb412fcbde165fc84f698fb806df69f3ede5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Tue, 21 Aug 2018 13:50:05 +0200 Subject: Fix build against Qt 5.9 Somehow it's the case that QtTest 5.9 doesn't know how to QCOMPARE a QString with a normal string literal: ld: error: undefined symbol: bool QTest::qCompare(QString const&, char const (&) [31], char const*, char const*, char const*, int) Change-Id: I13ce50689d9f1c157378b862fb1ed4a572ac7f79 Reviewed-by: Allan Sandfeld Jensen --- .../widgets/qwebengineview/tst_qwebengineview.cpp | 42 +++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp index fad71a517..b9a8b6a09 100644 --- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp +++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp @@ -2338,9 +2338,9 @@ void tst_QWebEngineView::imeJSInputEvents() // Simply committing text should not trigger any JS composition event. QTRY_COMPARE(logLines().count(), 3); - QCOMPARE(logLines()[0], "[object InputEvent] beforeinput commit"); - QCOMPARE(logLines()[1], "[object TextEvent] textInput commit"); - QCOMPARE(logLines()[2], "[object InputEvent] input commit"); + QCOMPARE(logLines()[0], QStringLiteral("[object InputEvent] beforeinput commit")); + QCOMPARE(logLines()[1], QStringLiteral("[object TextEvent] textInput commit")); + QCOMPARE(logLines()[2], QStringLiteral("[object InputEvent] input commit")); evaluateJavaScriptSync(view.page(), "clear()"); QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty()); @@ -2354,10 +2354,10 @@ void tst_QWebEngineView::imeJSInputEvents() } QTRY_COMPARE(logLines().count(), 4); - QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart "); - QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit"); - QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit"); - QCOMPARE(logLines()[3], "[object InputEvent] input preedit"); + QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart ")); + QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit")); + QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit")); + QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit")); { QList attributes; @@ -2368,11 +2368,11 @@ void tst_QWebEngineView::imeJSInputEvents() } QTRY_COMPARE(logLines().count(), 9); - QCOMPARE(logLines()[4], "[object InputEvent] beforeinput commit"); - QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate commit"); - QCOMPARE(logLines()[6], "[object TextEvent] textInput commit"); - QCOMPARE(logLines()[7], "[object InputEvent] input commit"); - QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend commit"); + QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput commit")); + QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate commit")); + QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput commit")); + QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input commit")); + QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend commit")); evaluateJavaScriptSync(view.page(), "clear()"); QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty()); @@ -2386,10 +2386,10 @@ void tst_QWebEngineView::imeJSInputEvents() } QTRY_COMPARE(logLines().count(), 4); - QCOMPARE(logLines()[0], "[object CompositionEvent] compositionstart "); - QCOMPARE(logLines()[1], "[object InputEvent] beforeinput preedit"); - QCOMPARE(logLines()[2], "[object CompositionEvent] compositionupdate preedit"); - QCOMPARE(logLines()[3], "[object InputEvent] input preedit"); + QCOMPARE(logLines()[0], QStringLiteral("[object CompositionEvent] compositionstart ")); + QCOMPARE(logLines()[1], QStringLiteral("[object InputEvent] beforeinput preedit")); + QCOMPARE(logLines()[2], QStringLiteral("[object CompositionEvent] compositionupdate preedit")); + QCOMPARE(logLines()[3], QStringLiteral("[object InputEvent] input preedit")); { QList attributes; @@ -2399,11 +2399,11 @@ void tst_QWebEngineView::imeJSInputEvents() } QTRY_COMPARE(logLines().count(), 9); - QCOMPARE(logLines()[4], "[object InputEvent] beforeinput "); - QCOMPARE(logLines()[5], "[object CompositionEvent] compositionupdate "); - QCOMPARE(logLines()[6], "[object TextEvent] textInput "); - QCOMPARE(logLines()[7], "[object InputEvent] input null"); - QCOMPARE(logLines()[8], "[object CompositionEvent] compositionend "); + QCOMPARE(logLines()[4], QStringLiteral("[object InputEvent] beforeinput ")); + QCOMPARE(logLines()[5], QStringLiteral("[object CompositionEvent] compositionupdate ")); + QCOMPARE(logLines()[6], QStringLiteral("[object TextEvent] textInput ")); + QCOMPARE(logLines()[7], QStringLiteral("[object InputEvent] input null")); + QCOMPARE(logLines()[8], QStringLiteral("[object CompositionEvent] compositionend ")); evaluateJavaScriptSync(view.page(), "clear()"); QTRY_VERIFY(evaluateJavaScriptSync(view.page(), "log.textContent + input.textContent").toString().isEmpty()); -- cgit v1.2.3 From 580c02b541dc03f84c3ff8639fb784b1ba715045 Mon Sep 17 00:00:00 2001 From: Jimi Huotari Date: Fri, 17 Aug 2018 16:49:34 +0300 Subject: Remove check for catalog support in libxml2 Changes have been made upstream, backported in http://code.qt.io/cgit/qt/qtwebengine-chromium.git/commit/?h=65-based&id=eb5360b2 that make it possible to link against system libxml2 again, even if it has been compiled with catalog support. Thanks to Arfrever Frehtes Taifersar Arahesis for their help on this. Change-Id: I61a49ab806f6dbbd96a2df09946c1a14062e6df5 Reviewed-by: Michal Klocek --- config.tests/xml2/xml2.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/config.tests/xml2/xml2.cpp b/config.tests/xml2/xml2.cpp index 93bc80c97..497653d9c 100644 --- a/config.tests/xml2/xml2.cpp +++ b/config.tests/xml2/xml2.cpp @@ -27,9 +27,6 @@ ****************************************************************************/ #include -#if defined(LIBXML_CATALOG_ENABLED) -#error "libxml catalog enabled" -#endif #if !defined(LIBXML_ICU_ENABLED) #error "libxml icu not enabled" #endif -- cgit v1.2.3 From e7d460a9a1893c38937d159662b5935bb45d6708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=BCri=20Valdmann?= Date: Mon, 27 Aug 2018 10:28:19 +0200 Subject: Update Chromium This pulls in the following changes: * 708511 Fix hunspell::NodeReader::affix_id_for_leaf bounds check Change-Id: I54a3775c171361f227a27bfd3846ab4f5a78e76c Reviewed-by: Allan Sandfeld Jensen --- src/3rdparty | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/3rdparty b/src/3rdparty index 084a80f98..7085115f5 160000 --- a/src/3rdparty +++ b/src/3rdparty @@ -1 +1 @@ -Subproject commit 084a80f98014f18de47056567cb89806a5ad4b30 +Subproject commit 7085115f51ce9d02cfff216a3f74b1fb6715f38d -- cgit v1.2.3 From a3c7fab7e2a10f529600e1fdbeacc4b8275ffe85 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Tue, 21 Aug 2018 10:58:50 +0200 Subject: Document world ID limit The max was bumbed from 11 to 256, now document it. Task-number: QTBUG-69904 Change-Id: I6cbf64afe3409c4722d7a903d833124880b32bc0 Reviewed-by: Leena Miettinen Reviewed-by: Kai Koehne --- src/webengine/api/qquickwebenginescript.cpp | 3 ++- src/webengine/doc/src/webengineview_lgpl.qdoc | 2 +- src/webenginewidgets/api/qwebenginescript.cpp | 2 ++ src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc | 6 +++--- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/webengine/api/qquickwebenginescript.cpp b/src/webengine/api/qquickwebenginescript.cpp index acc5cedb7..ab7aee4cb 100644 --- a/src/webengine/api/qquickwebenginescript.cpp +++ b/src/webengine/api/qquickwebenginescript.cpp @@ -86,7 +86,8 @@ QT_BEGIN_NAMESPACE /*! \enum QQuickWebEngineScript::ScriptWorldId - The world ID defining which isolated world the script is executed in. + The world ID defining which isolated world the script is executed in. Besides these predefined + IDs custom IDs can be used, but must be integers between \c 0 and \c 256. \value MainWorld The world used by the page's web contents. It can be useful in order to expose custom diff --git a/src/webengine/doc/src/webengineview_lgpl.qdoc b/src/webengine/doc/src/webengineview_lgpl.qdoc index a6a7c088b..c089538b1 100644 --- a/src/webengine/doc/src/webengineview_lgpl.qdoc +++ b/src/webengine/doc/src/webengineview_lgpl.qdoc @@ -365,7 +365,7 @@ \since QtWebEngine 1.3 JavaScript world that the web channel instance used by this view is - installed in. + installed in. The world must be a number between \c 0 and \c 256. */ /*! diff --git a/src/webenginewidgets/api/qwebenginescript.cpp b/src/webenginewidgets/api/qwebenginescript.cpp index d5247cde1..d1e996b3a 100644 --- a/src/webenginewidgets/api/qwebenginescript.cpp +++ b/src/webenginewidgets/api/qwebenginescript.cpp @@ -224,6 +224,8 @@ quint32 QWebEngineScript::worldId() const /*! Sets the world ID of the isolated world to \a id when running this script. + + Must be between \c 0 and \c 256. */ void QWebEngineScript::setWorldId(quint32 id) { diff --git a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc index 3013903c8..f91b71ea1 100644 --- a/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc +++ b/src/webenginewidgets/doc/src/qwebenginepage_lgpl.qdoc @@ -718,9 +718,9 @@ \since 5.7 Runs the JavaScript code contained in \a scriptSource in the world specified by \a worldId. - The world ID values are the same as provided by QWebEngineScript::ScriptWorldId. Using the - \e runJavaScript() versions without the world ID is the same as running the script in the - \c MainWorld. + The world ID values are the same as provided by QWebEngineScript::ScriptWorldId, and between \c 0 + and \c 256. Using the \e runJavaScript() versions without the world ID is the same as running the + script in the \c MainWorld. When the script has been executed, \a resultCallback is called with the result of the last executed statement. \c resultCallback can be any of a function pointer, a functor or a lambda, -- cgit v1.2.3 From 6615f6617922fb67daac1738a6d0a7237382060f Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Tue, 28 Aug 2018 11:37:32 +0300 Subject: Add changes file for Qt 5.11.2 Change-Id: Ia3fe234353e489732ee5f914204ee3f46c894a52 Reviewed-by: Leena Miettinen Reviewed-by: Michal Klocek --- dist/changes-5.11.2 | 72 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 dist/changes-5.11.2 diff --git a/dist/changes-5.11.2 b/dist/changes-5.11.2 new file mode 100644 index 000000000..cc8d2520e --- /dev/null +++ b/dist/changes-5.11.2 @@ -0,0 +1,72 @@ +Qt 5.11.2 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.11.0 through 5.11.1. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.11.2 Changes * +**************************************************************************** + +Chromium +-------- + + - Security fixes from Chromium up to version 68.0.3440.75, including: + * CVE-2018-4117 + * CVE-2018-6150 + * CVE-2018-6152 + * CVE-2018-6155 + * CVE-2018-6158 + * CVE-2018-6159 + * CVE-2018-6161 + * CVE-2018-6162 + * CVE-2018-6163 + * CVE-2018-6164 + * CVE-2018-6165 + * CVE-2018-6167 + * CVE-2018-6168 + * CVE-2018-6172 + * CVE-2018-6175 + * CVE-2018-6177 + * Security Bug 683418 + * Security Bug 831117 + * Security Bug 838886 + * Security Bug 839197 + * Security Bug 840695 + * Security Bug 854887 + * Security Bug 860721 + * Security Bug 861571 + + +General +------- + + * [QTBUG-59891] Popups are now closed when parent window is moved. + * [QTBUG-68699] Fixed another crash with non-integer Qt scaling. + * [QTBUG-69231] Fixed keyboard modifiers on drop events. + * [QTBUG-69236] Fixed --enable-webgl-software-rendering to ignore blacklist + of software OpenGL. + * [QTBUG-69359] Fixed crash in DevTools openInNewTab handling + * [QTBUG-69372] QWebEngineUrlRequestJob::initiator() now differs + between unique origins and unknown origins. + * [QTBUG-69605] HSTS state is now persistent with appropriate profiles. + * [QTBUG-69904] JavaScript worldID can now be up to 256 (up from 11), + and the limit is now documented. + +Build +----- + + * [QTBUG-50554] Update libvpx check to match standard versions. -- cgit v1.2.3 From 4c4698fd2ecb5d1eb86b6cd9429f20af093a481a Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Sun, 2 Sep 2018 11:32:27 +0200 Subject: Update changes-5.11.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add a few missed changes from 3rdparty Change-Id: Ie503da76d20440729516224c48bf0c95aade66d7 Reviewed-by: Jüri Valdmann --- dist/changes-5.11.2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dist/changes-5.11.2 b/dist/changes-5.11.2 index cc8d2520e..753e83fa7 100644 --- a/dist/changes-5.11.2 +++ b/dist/changes-5.11.2 @@ -55,6 +55,7 @@ General ------- * [QTBUG-59891] Popups are now closed when parent window is moved. + * [QTBUG-67801] Fixed assert with some AMD CPUs on Windows. * [QTBUG-68699] Fixed another crash with non-integer Qt scaling. * [QTBUG-69231] Fixed keyboard modifiers on drop events. * [QTBUG-69236] Fixed --enable-webgl-software-rendering to ignore blacklist @@ -63,10 +64,15 @@ General * [QTBUG-69372] QWebEngineUrlRequestJob::initiator() now differs between unique origins and unknown origins. * [QTBUG-69605] HSTS state is now persistent with appropriate profiles. + * [QTBUG-69639] Work around MSVC compiler error affecting printing on + 32-bit Windows. * [QTBUG-69904] JavaScript worldID can now be up to 256 (up from 11), and the limit is now documented. + * [QTBUG-70034] Fixed qtwebengine_convert_dict failing on certain + dictionaries. Build ----- * [QTBUG-50554] Update libvpx check to match standard versions. + * [QTBUG-69121] Fixed shadow builds on read-only sources. -- cgit v1.2.3 From 6426f1e93622cb08a2286705398e7762cbcd0a45 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 31 Aug 2018 17:31:03 +0200 Subject: Fix no-opengl builds on windows Change-Id: I134876aa68bd42356c0b897a5d7d5881f27724a4 Reviewed-by: Michal Klocek --- src/core/web_engine_context.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp index 62d62119a..48e5bc438 100644 --- a/src/core/web_engine_context.cpp +++ b/src/core/web_engine_context.cpp @@ -186,7 +186,7 @@ bool usingSoftwareDynamicGL() { if (QCoreApplication::testAttribute(Qt::AA_UseSoftwareOpenGL)) return true; -#if defined(Q_OS_WIN) +#if defined(Q_OS_WIN) && !defined(QT_NO_OPENGL) HMODULE handle = static_cast(QOpenGLContext::openGLModuleHandle()); wchar_t path[MAX_PATH]; DWORD size = GetModuleFileName(handle, path, MAX_PATH); -- cgit v1.2.3 From d4ef262a9e84f73c7bd211c843b8094eb4863a17 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 5 Sep 2018 16:57:43 +0200 Subject: Disable LTCG for Qt WebEngineCore We do not have it working together with the building of Chromium. Task-number: QTBUG-66571 Change-Id: Ib000a4102b02902f2ac257347e406297fe1608cf Reviewed-by: Samuli Piippo --- src/core/core_common.pri | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/core/core_common.pri b/src/core/core_common.pri index 370fe4d2a..a2f7c9eb4 100644 --- a/src/core/core_common.pri +++ b/src/core/core_common.pri @@ -6,3 +6,6 @@ QT += qml quick webchannel QT_PRIVATE += quick-private gui-private core-private webenginecoreheaders-private qtHaveModule(positioning):QT += positioning + +# LTO does not work for Chromium at the moment, so disable it completely for core. +CONFIG -= ltcg -- cgit v1.2.3 From 89afebb830f616a6e8c43dd37bf34551f243b264 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Wed, 12 Sep 2018 16:25:24 +0200 Subject: Set arm_arch as well Either overlooked or added after we make the GN switch. Change-Id: I93bfc27c2e71165901c2046ab2ea902d9dad39d3 Reviewed-by: Michal Klocek --- src/core/config/linux.pri | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri index b56134ad9..4ade28271 100644 --- a/src/core/config/linux.pri +++ b/src/core/config/linux.pri @@ -44,6 +44,7 @@ contains(QT_ARCH, "arm") { !isEmpty(MFLOAT): gn_args += arm_float_abi=\"$$MFLOAT\" MARCH = $$extractCFlag("-march=.*") + !isEmpty(MARCH): gn_args += arm_arch=\"$$MARCH\" MARMV = $$replace(MARCH, "armv",) !isEmpty(MARMV) { -- cgit v1.2.3