summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revision WebEngineProfile::userNotificationKai Koehne2019-02-212-1/+2
| | | | | Change-Id: I6a5ff72c91cb1b173ca140efe3d4c95036f945eb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Do not pass ar to gn, update ChromiumMichal Klocek2019-02-212-1/+1
| | | | | | | | | | | | | | | | qmake does not have cross specs archiver definition, so do not pass it. Updates Chromium: 29a45e8b7f Fix not working ar on windows c2a58ec0a9 Fix builds with no xrandr 76b0b85ab0 Disable download and print buttons in PDF viewer fa79a21c87 Fix extensions build for Windows on 71-based 6c56c89f1a Bypass CHECK for uninitialized resources when destroying plugin host Change-Id: I45eb7ab7fb3d9e8d9346559fdd7607bbac83675b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add build time override of ninja jobsMichal Klocek2019-02-211-1/+1
| | | | | | | | Add sth like 'NINJAJOBS=-j20 make'. Helps to quickly investigate icecc issue without need to do qmake_all. Change-Id: I7438e9cd1a2b15bcbc1a4790bbc4d6596c5c7abd Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Emit QWebEnginePage::selectionChanged asynchronouslyJüri Valdmann2019-02-212-1/+24
| | | | | | | | | | Currently selectionChanged is emitted from a Chromium task, meaning our MessagePump is blocked and, even with a nested QEventLoop, it's not possible to for Chromium code to make any progress during the handling of this signal. Fixes: QTBUG-73876 Change-Id: I45135238cffa81fb0db74ddfd53037c7f1b94348 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add client certificate store test casesVijith Kini2019-02-208-0/+212
| | | | | Change-Id: Ib8fdfdd21c064f31acfcf8ce2cf840463d10c07e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Add proxy authentication unit testMichal Klocek2019-02-195-1/+229
| | | | | | Task-number: QTBUG-58121 Change-Id: Id2f983903f2e631cc6ec0632a70ac6ec3ef3c1ce Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Try using authentication from QNetworkProxyMichal Klocek2019-02-195-5/+45
| | | | | | | | | Use credentials for QNetworkProxy if set. Done-With: Allan Sandfeld Jensen <allan.jensen@qt.io> Task-number: QTBUG-58121 Change-Id: I9c7328af90f3c60144c5ecf385529f663f0e46b2 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Remove not used define for sanitizerMichal Klocek2019-02-191-1/+0
| | | | | Change-Id: I3f5e55eb7a695c83b683d715640b10713e43aa95 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Minor. Remove unused m_index from pdfium_document_wrapper_qt.cppMichal Klocek2019-02-191-3/+0
| | | | | | | Fixes clang warning. Change-Id: Ib9851cabe7d578d5dd2abc2aa54891821aeeb38d Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Minor. Remove superfluous std::moveMichal Klocek2019-02-191-1/+1
| | | | | | | | Let the compiler decide to do copy elision/NRVO or move. Fixes clang warning. Change-Id: I257492c06593b25cb9325a674c6a8aeed8c67680 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Use qmake toolchain for gnMichal Klocek2019-02-182-1/+4
| | | | | | | | | | | | | | | Pass cc,cxx,ld,ar to gn, so it can be also build with clang for example. Updates Chormium: * bb8520a5 Fix build with sanitizer and icecc * be3cf3ab Add command line parameters for cc,cxx,ld,ar in gn * 7056415f Fixup build with older system ICU * 2b94bfe4 BASELINE: Update Chromium to 71.0.3578.140 Change-Id: I4c1653cc9f21c72571ebe3d60eca4a444cd106d9 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Remove hack with passing WebContentsAdapterClient as NativeViewAllan Sandfeld Jensen2019-02-184-18/+35
| | | | | | | | Instead delay creating our render view just a little bit further in WebContentImpl::OpenWindow until it calls delegate->WebContentsCreated() Change-Id: Idd911d208bbfe419a2567220933eccb2ba726347 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Use QMAKE_GCC_MAJOR_VERSION to check GCC version for extensionsFlorian Bruhin2019-02-151-1/+1
| | | | | | | | | At least on my system (Archlinux with a qt5.git super-build), QT_GCC_MAJOR_VERSION seems to be unset when the test is run, causing it to fail and extensions to be disabled (despite using GCC 8). Change-Id: I384c6ebbbbe7245f41d014cd2f7aeca2fec73073 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix undefined behavior with extensions disabledAllan Sandfeld Jensen2019-02-151-0/+2
| | | | | | | Return null as GuestManager. Change-Id: Idcc0a98cd80a38b27dba3d8c04b96af5e0904cad Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-02-1516-112/+284
|\ | | | | | | Change-Id: I0822fb8a10945a252cfd1aacaf0b6d9902cc8831
| * Update ChromiumAllan Sandfeld Jensen2019-02-141-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: 5c76f0592d0e [Backport] Fix for CVE-2019-5776 8b78be4530ae [Backport] Fix for CVE-2019-5775 and CVE-2019-5777 297b64d3d7d7 [Backport] Fix for CVE-2019-5779 42b4075a690d [Backport] Fix for CVE-2019-5783 5ee5529dea3a [Backport] Fix for CVE-2019-5781 5bebe28ae4d0 [Backport] Fix for security issue 912508 48192fb6548b [Backport] Update sqlite 3709910608cd [Backport] Fix for security issue 908358 Task-number: QTBUG-73417 Change-Id: If451e38f04bc4df90230acd51192a38c184df304 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Update ChromiumAllan Sandfeld Jensen2019-02-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: 509f0033c434 [Backport] Fix for CVE-2019-5762 436537b89cc4 [Backport] Fix for CVE-2019-5763 69210928ceaa [Backport] Fix for CVE-2019-5764 c0f8161a7658 [Backport] Fix for security issue 922677 7f14eb3daf24 [Backport] Fix for security issue 899689 328129c5de09 [Backport] Fix for security issue 912520 a917b0698d8d [Backport] Fix for CVE-2019-5769 6c8f45a91435 [Backport] Fix for CVE-2019-5770 7b5e48775b3a [Backport] Fix for security issue 907047 Task-number: QTBUG-73417 Change-Id: I941f322313f42a6c92712f1d6cb7ae9a915bcf2e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| * Shutdown ProxyResolutionSerivceMichal Klocek2019-02-111-0/+3
| | | | | | | | | | | | | | | | Shut down the ProxyResolutionService before regenerating storage, it may have pending URLRequests. Change-Id: If79efc0bc942762dc48a50a12d74593ff1ee3989 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Better error reporting for QWebEngineUrlSchemeJüri Valdmann2019-02-113-6/+46
| | | | | | | | | | | | | | | | Add warnings for late registration and invalid configuration. Fixes: QTBUG-72842 Change-Id: I2c103c3b3581112cc885c3a1b4f42c011c3510ab Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * Doc: Extend documentation of callbacksTamas Zakor2019-02-083-0/+29
| | | | | | | | | | | | | | | | Warn about callbacks on QWebEnginePage destruction. Task-number: QTBUG-72816 Change-Id: I8dbc297a8f364bc237b0672a63325af8da197e01 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * tst_origins: Don't create SharedWorkers from unregistered schemeJüri Valdmann2019-02-051-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Triggers DCHECK in content::SharedWorkerInstance::Matches on CI. According to the DCHECK, SharedWorkers cannot be constructed from unique origins (worker and constructor page need to be same-origin and unique origins are never same-origin with anything). In release builds the construction will just fail as expected. The DCHECK is only triggered if at least one other active SharedWorker already exists in the same storage partition. The reason it only happens on CI might be that the previous renderer process is not torn down fast enough and the previous SharedWorker remains active. Change-Id: I0906e1b5c85587df67b768ef022386d599ce9541 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Update ChromiumAllan Sandfeld Jensen2019-02-051-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: fe4f93f10929 Disable unsupported JavaScript APIs in PDF extension 99bfdd214657 Fix apps_shim build file to properly flag extension related files fd293fc03974 Minor. Drop dependency for ffmpeg for test_support 50d06b752453 [Backport] Fix for CVE-2019-5754 cf5bd0c9157c [Backport] Fix for CVE-2019-5755 7a5167caf765 [Backport] Fix for CVE-2019-5782 09ae6be5bb83 [Backport] Fix for CVE-2019-5756 6605d8f7b430 [Backport] Fix for CVE-2019-5757 3b390539f429 [Backport] Fix for CVE-2019-5758 c350fc2e3258 [Backport] Fix for CVE-2019-5759 63cf07a2a77c [Backport] Fix for CVE-2019-5760 Task-number: QTBUG-73417 Change-Id: Ia72fd847c8c36959189fe9648c81a3eb6dec6a10 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| * macOS: Look for the widevine plugin in the possible new locationsAndy Shaw2019-02-041-2/+12
| | | | | | | | | | Change-Id: Ibaaa64ace3bff9fe630d9448864587bac8f7b128 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Reinstate CT verification using known logsAllan Sandfeld Jensen2019-02-041-2/+11
| | | | | | | | | | | | | | | | Lost in the transition to Chromium 69 as the function we were using no longer exists. Reimplemented by how it is now done in NetworkContext. Change-Id: I05c986f2941c7d5f2b8641adc8c619ec3f75e0b1 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-019-93/+177
| |\ | | | | | | | | | Change-Id: I4315127d8a329bcb65e6853d4f3625b6dbc55560
| | * Update Chromiumv5.12.1Allan Sandfeld Jensen2019-01-161-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes: 9aa80f767b Fix jumbo build with GCC 35e15c6001 [Backport] Security bug 880207 4848d71bd9 [Backport] Security bug 881252 and 896326 27c402195e [Backport] Security issue 849942 fec48c17fa FIXUP: [Backport] Security bug 881252 and 896326 Fixes: QTBUG-72612 Change-Id: I27c3214b9491112a0ec576ef4f609534e4eb0e94 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
| | * Add changes file for Qt 5.12.1Antti Kokko2019-01-161-0/+78
| | | | | | | | | | | | | | | Change-Id: Ic750e5a1668c533b197ef0224dceb747d5b1fde3 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * Fix incorrect GLX pbuffer attributes terminatorKirill Burtsev2019-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | Reland fix 04337275e4 after adaptations d5bffb5125 Change-Id: Ieca40fd2ac3d245f760c9b24e2d42d21855b836a Reviewed-by: Michal Klocek <michal.klocek@qt.io>
| | * Fix hide/show of delegate widgetMichal Klocek2019-01-092-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QQuickWidget::show does not work correctly if widget was not hidden. Fixes: QTBUG-72299 Change-Id: I12fba8c18cbf3f847d30de8b057a50e6d9917fde Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| | * Fix recreation of cookie store and channel id serviceMichal Klocek2019-01-093-91/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As more things gets mojofy and become services, we can not simply delete parts of storage context. Therefore regenerate whole storage in case of cookie store, cache, agent settings updates. URLRequestContextStorage guards correct order of destruction. This change aims to fix some crashes during cookie store and http cache recreation when ChannelIDService gets deleted. Depending on timing this ends with different stacktraces like in cookie store manager or during ssl handshake. We still keep network delegate outside of storage context to prevent crashes when url requests end their life due to (forced) request cancellation in cancelAllUrlRequests(). Please note this is just band-aid patch, and introduction of 'profile builder' will be a proper fix. Fixes: QTBUG-71895 Change-Id: If33a7af3ebba2632ea33f32d913e1c21a4534817 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0838-87/+593
| | |\ | | | | | | | | | | | | Change-Id: Ia86d2e001e3575bb4995f5f57b88d6c809246941
| | * | Update ChormiumMichal Klocek2018-12-211-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in following patches: * b3a4dd9 Fix heap overflow when allocating PowerSaveBlocker * 5463947 Fix use-after-scope on reference temporary detected by ASan Change-Id: I1777cb6d25d3364257e79054b1db23a4265ae00a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Update ChromiumMichal Klocek2018-12-201-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pulls in following patches: * 4010e56 Minor. Remove old src version of sqlite * f97a65c [Backport] Update SQLite / Security bug 900910 * 35b62be [Backport] Prepare for sqllite update * 63dee74 [Backport] Security bug 877843 * 0ccf56b [Backport] Security bug 892643 * 2efddba [Backport] Security bug 839250 * 4627bab Add extensions to Qt build and fix it up for building * daa969c [Backport] Security bug 880665 * 04610f2 [Backport] Security bug 879965 * e1fe9e1 [Backport] Security bug 882270 * 7181bb5 [Backport] Security bug 895885 * 0dbd045 [Backpack] CVE-2018-18359 * 0473fab [Backport] CVE-2018-18358 * ed2a611 [Backport] CVE-2018-18357 * 5ee3488 [Backport] CVE-2018-18356 * 5e8a4ea [Backport] CVE-2018-18355 * 7d3f4e6 [Backport] CVE-2018-18350 * e0811d9 [Backport] CVE-2018-18349 * 26dba65 [Backport] CVE-2018-18347 * f0135d4 [Backport] CVE-2018-18345 * 586c41a [Backport] CVE-2018-18343 Fixes: QTBUG-72632 Task-number: QTBUG-72612 Change-Id: I32ddc57529b96e531cf14504fa0978cc8d490a26 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Update ChromiumMichael Brüning2018-12-191-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fbc71baba4 - [Backport] CVE-2018-18342 493c18adef - [Backport] CVE-2018-18341 f5ff8d4a62 - [Backport] CVE-2018-18340 f942ac6b4d - [Backport] CVE-2018-18339 58532117f8 - [Backport] CVE-2018-18338 ef4d1e1ef1 - [Backport] CVE-2018-18337 9a197eab29 - [Backport] CVE-2018-18335 c9155825f4 - [Backport] CVE-2018-17481 7f1f62997f - [Backport] CVE-2018-18336 4a26a08520 - [Backport] Security bug 851821 e63b2a8cb8 - [Backport] CVE-2018-17480 Task-number: QTBUG-72612 Change-Id: I6e970d3527249f1a229a7f3f42dea8886eaa1b6e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * | Fix building with -no-opengl on macOSMichael Brüning2018-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on a patch Dmitriy Kuminov. Change-Id: I5365b16e3b25fcfc5e8be33e6cdcfb85e3e118e4 Fixes: QTBUG-72540 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | | Support offscreen plugin with glx backendMichal Klocek2019-02-152-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63346 Change-Id: Id475c6c88f79af8cf82610a40d07eaa3f6588d7d Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | | | Fix crash on removing certificates from local storeAllan Sandfeld Jensen2019-02-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I shouldn't cache end when operating on a changing list. Change-Id: I09a69e238675600fde7a7d9bc75dffe1fb22c4eb Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | | | Fix incrementing download IDTamas Zakor2019-02-142-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adapt DownloadManagerDelegateQt::m_currentId to https://chromium-review.googlesource.com/1144311 Change-Id: I74d0165b096d5d02261290a7f84fda420a2b146c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Simplify visual properties handling in RenderWidgetHostViewQtJüri Valdmann2019-02-1314-228/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace separate notifications from delegate with one combined notification and change detection. Store view rect, window rect and screen info in RWHVQ to ensure the properties are in a consistent state. Change-Id: Icef8a17e72882f56db249f5553b6cf554e1f91dc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Do not create the native client cert store on every requestAllan Sandfeld Jensen2019-02-112-17/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create it once and keep it around. Also contains drive-by coding style fixes. Change-Id: I8b159ae332080b31ed64fab99ad6bb3d8b4d5e3b Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Add link with lld supportMichal Klocek2019-02-111-0/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: If81ac9311c44160aac28929d37da7a9e6d946a73 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Fix use_gold gn argumentMichal Klocek2019-02-112-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We add already use_gold in toolchain setup, however for default toolchain toolchain_args are ignored, Therefore use_gold has to be set explicilty in linux.pri. Task-number: QTBUG-73216 Change-Id: If1c8f9df998719d88184d0e5eee525b871d682df Reviewed-by: Michael Brüning <michael.bruning@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* | | | Cleanup client cert store filesAllan Sandfeld Jensen2019-02-1112-215/+307
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The files were not in the right places and wasn't split correctly in domains. Change-Id: Ia0d3b1c8f9bc6082f338a09cb64c4bb4b1aa16ad Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | | | Fix -Wreorder warning in ProfileAdapterJüri Valdmann2019-02-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .../profile_adapter.h: In constructor 'QtWebEngineCore::ProfileAdapter::ProfileAdapter(const QString&)': .../profile_adapter.h:229:9: warning: 'QtWebEngineCore::ProfileAdapter::m_pageRequestInterceptors' will be initialized after [-Wreorder] .../profile_adapter.h:219:13: warning: 'QString QtWebEngineCore::ProfileAdapter::m_downloadPath' [-Wreorder] .../profile_adapter.cpp:79:1: warning: when initialized here [-Wreorder] Change-Id: I3aff0462769abc484845ac0233ad892a4ec9bb0d Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | | Quiet -Wmismatched-tag warningv5.13.0-alpha1Allan Sandfeld Jensen2019-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change CompositorResource to class to match forward declaration. Change-Id: I603038b99e567a8da2096e48b5b33ec8874594ad Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | | | Only allocate a post data block when postingAllan Sandfeld Jensen2019-02-081-4/+3
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia50b6689bdb182888aba44faf549d17747624833 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | | | Replace deprecated QDesktopWidget::screenGeometry usage in simplebrowserPeter Varga2019-02-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-62094 Change-Id: I6e95c5347df6b9a0d6559830b12da1e30fce23fb Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | | | Fix incorrect include of pref_names.hMichal Klocek2019-02-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kShowInternalAccessibilityTree is not spellchecker related feature. Task-number: QTBUG-73562 Change-Id: Iac2b0d235aae93bcffebe923bfde036d67293074 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | | | Web Notifications APIKirill Burtsev2019-02-0649-23/+1702
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements API for end-user notifications. Co-authored by Allan Sandfeld Jensen [ChangeLog][Profile] Support for Web Notifications API for end-user notifications through QWebEngineNotification Task-number: QTBUG-50995 Fixes: QTBUG-51191 Change-Id: Icebaaa05275a713e801f1f8ecdaaec725fa264c8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | | | Merge remote-tracking branch 'origin/dev' into 5.13Michael Brüning2019-02-0574-106/+4495
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/content_browser_client_qt.cpp src/core/content_browser_client_qt.h Change-Id: I3da791a82dab56fd7535ba1e4c0ab1d9ca74f547
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 00:06:38 +0000