summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/simplebrowser
Commit message (Collapse)AuthorAgeFilesLines
* Minor. Cleanup qt6_add_resources usageMichal Klocek2021-10-281-2/+2
| | | | | | | | | We should not use qt6 prefixed functions in examples. Change-Id: Ibf2618ef4f64b560decb219527d619aad680f216 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> (cherry picked from commit 32924ec6b27d3da0ffbeec93e1b8c19ff9c49387) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix broken attributions to the Public DomainLuca Di Sera2021-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | The attributions generated trough `qtattributionscanner` support generating links to SPDX licenses. Four such attributions used a `LicenseId` of `DocumentRef-PublicDomain`, which is a non-existent license. Indeed, the SPDX project seems to shy away from making a single license representing all Public Domain attributions, preferring to make a database entry for each Public Domain attribution. To avoid the broken link, such attributions were modified to use a dejacode LicenseId, which has a catch-all Public Domain entry, as suggested by Kai Köhne. Task-number: QTBUG-96127 Change-Id: I88e0048c08d6099521e44e74ad7f0e8b3d77b907 Reviewed-by: Kai Koehne <kai.koehne@qt.io> (cherry picked from commit 7ba5a86c6e84b6ecb1ba809050c74d8b0afcb20f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix disconnect on null old page win Simple Browser exampleKirill Burtsev2021-09-111-11/+12
| | | | | | | | | Eliminates constant warnings from QObject on every new tab create Change-Id: I93b3a2561a8a99932ea2a8c77cc12ded4a6906e7 Reviewed-by: Michal Klocek <michal.klocek@qt.io> (cherry picked from commit bfae1b143acb9581ebc9396e0ba7e7e0fe5053d0) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove duplicated 'downloadProgress' in favor of separate signalsKirill Burtsev2021-07-212-3/+3
| | | | | | | Change-Id: Ib825d63c89e591e740b206f43c3eadbf32319daa Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit abd050e9806123cbc6288e7d33ed01ceb2921766) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Adaptations for 90-basedAllan Sandfeld Jensen2021-07-131-1/+5
| | | | | | Change-Id: I8402b044d8e12d75e144a00984b856f3de10bffd Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> (cherry picked from commit 1d988d971bc4270ba3d148e8e2c143bf8f625b6e)
* Doc: Fix documentation issues for Qt WebEngineTopi Reinio2021-07-071-10/+14
| | | | | | | | | | | API and documentation changes since 5.15 caused multiple warnings from QDoc; this change addresses most of them. Some warnings indicate missing documentation, those issues still remain. Change-Id: I96be38b7daac37a7e35c149b4b3ec3f18c4415c9 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> (cherry picked from commit c248844b3b8ee004800606d1a6c6e6d6bee31738) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Remove deprecated useforglobalcertificateverificationPeter Varga2021-07-061-1/+0
| | | | | | | | | | | | | It enabled an unrecommended OCSP path on Linux [ChangeLog] (Q)WebEngineSettings::useForGlobalCertificateVerification has been removed. Task-number: QTBUG-91467 Change-Id: I9f5d1ad5e4fcb59abd31e6a133ded7bf8319c811 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io> (cherry picked from commit 8f7a386a5228428122813ebea1d7489783b00633) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Make default profile off the recordMichal Klocek2021-06-252-7/+7
| | | | | | | | | | | | | | | | Make default profile otr, this prevents accessing data cache which could be created by older other version of Chromium. Allow to register a protocol handler on ort profile. [ChangeLog][QtWebEngineCore] Default profile is off-the-record Off-the-record profile can have registered protocol handlers. Task-number: QTBUG-66068 Change-Id: Ief202de5c6734d293cb64d83ad447b1eba19e9a4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit d0ff107c0096fa0e0347ddadda9a98438d27631e) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix some compiler warningsPeter Varga2021-06-101-2/+0
| | | | | | | | | | | | | | - Remove deprecated Qt::AA_EnableHighDpiScaling and Qt::AA_UseHighDpiPixmaps from examples. High-DPI scaling is always enabled. - Reorder initialization of members of QWebEngineDownloadRequestPrivate. Also remove m_ prefix from public members' name. - Remove unused parameters from methods of DummyDelegate. - Add missing overrides in auto tests. Change-Id: I18d6973b8bee574b37b73fbaaa8d57002ac8ba2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> (cherry picked from commit 740b8c94f27930a33298c81c2284d1f0a9e2f11b) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use fixed qt_add_resource BASE argumentPeter Varga2021-05-281-35/+11
| | | | | | Task-number: QTBUG-86726 Change-Id: I33ec2a73254d9b44de83f4f5491f372b4bb9959b Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Make handling of certificate errors possible from a signalAllan Sandfeld Jensen2021-05-253-5/+4
| | | | | | Task-number: QTBUG-74587 Change-Id: I9955a4c70b339523b5e9e9d6dffe928e61fbab90 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Bump the minimum required cmake version to 3.19Michal Klocek2021-05-221-1/+1
| | | | | | | | | | | QtWebEngine requires support of TARGET_PROPERTY for genex in gn template generation to dump all compilation flags. This is supported since version 3.19, set examples to 3.16 as rest of the qt. Task-number: QTBUG-91760 Change-Id: Ifa5903c8c6efcb160db05baf1e18c865b48bcf39 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Add examples to the cmake buildMichal Klocek2021-05-221-0/+106
| | | | | | | | | | | | | Add only quick and widget examples to the build for now. Update examples qmake files so the ci can also build qmake examples after the cmake bulid. Note this patch breakes qmake builds. Task-number: QTBUG-91760 Change-Id: Ia867a49bc3deab1967bdedcf525ad4afe3967c2a Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.15' into devAllan Sandfeld Jensen2021-02-021-1/+3
|\ | | | | | | | | | | | | Conflicts: tests/auto/widgets/qwebenginedownloadrequest/tst_qwebenginedownloadrequest.cpp Change-Id: Ibf03467e398f8dcdb5f950e1a70f3e4e591003db
| * Support devtools close buttonAllan Sandfeld Jensen2021-01-221-1/+3
| | | | | | | | | | Change-Id: Icad495c3bf144a4da53b2a60585dabb3fc36d3d6 Reviewed-by: Kirill Burtsev <kirill.burtsev@qt.io>
* | Remove qwebengineview setter from qwebenginepageMichal Klocek2020-11-204-117/+168
| | | | | | | | | | Change-Id: Ifaac7287d24e38e04e217cae65f6e5294e8bdd9e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update dependencies on 'dev' in qt/qtwebengineAllan Sandfeld Jensen2020-11-021-0/+1
| | | | | | | | | | Change-Id: I74c7293ebf5ace5bd07e3bf5455dd90bf4ed6380 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Fix compilation after 757a9c21c1 in basePeter Varga2020-09-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Adaptations for the following qtbase changes: - acbf9a858b Cleanup QTypeInfo - 652bd1efca Make QStringList an alias to QList<QString> - 25351dcc54 Long live QKeyCombination! - ed8acbeb7c Automatically register data/debug stream operations in QMetaType - a735038376 Move QStateMachine from QtCore to QtScxml Change-Id: Ieb2677cd0572cc6dfe7be4b8f8dd4189a39bd3fe Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove default qwebenginesettings getterMichal Klocek2020-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | Remove defaultSettings() from qwebenginesettings and drop dependency on qwebenigineprofile in qwebenginesettings, let's see if we can also get rid of default profile later. Remove deprecated method globalSettings(). Change-Id: Ibccca50af237ed6a3dd32137d34f8e7e0e7357f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Improve QWebEngineCertificateError apiMichal Klocek2020-08-282-26/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove const ref from QWebEngineCertificateError Q_GADGET is a value type, QWebEngineCertificateError is pass as const reference from api. This is not so useful since, in qml this will be anyway copied and for c++ this is not useful since reject, ignore, defer methods are all const. Therefore simply pass it by value. * make consistent naming defer(), acceptCertificate(), rejectCertificate() * remove properties 'differed', 'answered' which are use internally, user knows if he calls functions. * error.errorDescription -> error.description() * error.error() -> error.type() [ChangeLog] In QWebEngineCertificateError use acceptCertificate() instead of ignoreCertificiateError() Change-Id: I9ffa500a0a455d98445b066252dd283872740731 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Rename QWebEngineDownloadItem -> QWebEngineDownloadRequestMichal Klocek2020-08-185-26/+26
| | | | | | | | | | | | | | | | | | | | This fits better with other QWebEngine*Requests. [ChangeLog] QWebEngineDownloadItem is now QWebEngineDownloadRequest, also in qml. Change-Id: I506e9fac746b4f23ac0936c2fbe1c7472f4fda36 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Unify certificate error handlingMichal Klocek2020-08-142-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Before we move the certificate error to core, unify error handling between qml and widgets. [ChangeLog] WebPage::certificateError does not return bool it is enough to call defer, ignoreCertificateError() or rejectCertificate(). Change-Id: I14be40f1ab6b4cbded550260d66152f51cf47de2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Remove QT_VERSION from simplebrowserMichal Klocek2020-08-149-51/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 468c2d9a6 it is possible to compile simplebrowser with older versions of webengine. Unfortunately it makes example code harder to read and follow. It affects user experience and does not provide any benefits for the user. Moreover, with Qt6 changes to api this would even look more ugly and complexity will grow over time. Keep example code simple and clean, remove all the QT_VERSION checks. Change-Id: I2b2ea1d11c1e59bdcbbc7351daae5308f23890d3 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Move QMenu handling from page to viewMichal Klocek2020-08-121-1/+1
| | | | | | | | | | | | | | | | [ChangeLog] createStandardContextMenu is moved from QWebEnginePage to QWebEngineView Change-Id: I08a7a1f7e55ca7396547006523cdec250a3ad117 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Use QList instead of QVectorJarek Kobus2020-07-152-5/+5
| | | | | | | | | | | | Task-number: QTBUG-84469 Change-Id: I666a060351f73783e15e3f96884c9393a5cd7e46 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Adapt to newer dependenciesAllan Sandfeld Jensen2020-07-061-1/+0
| | | | | | | | | | | | Change-Id: I495880f56fbc10d8f332f26101f8a25c2a1c5631 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Update 'dev' dependenciesAllan Sandfeld Jensen2020-05-141-1/+1
|/ | | | | | | Including three compile fixes. Change-Id: I497ed359d229e869b67aa10e4114a37ceec4be97 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix build of simplebrowser against 5.12Peter Varga2019-11-288-0/+45
| | | | | Change-Id: Ifbcf7f70ddbed7768e5e7b7231661a69d6d9f1a1 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Improve QWebEngineFindTextResult APIv5.14.0-beta2Peter Varga2019-10-191-1/+1
| | | | | | | | | | | | Implements suggestions from 5.14 API review: - Rename activeMatchOrdinal to activeMatch - Extend documentation - Change QML import version number to 1.10 Task-number: QTBUG-77839 Change-Id: I5eae659cfb5355af8d0c878d3b5f00654c9d6d13 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove usages of deprecated APIsSona Kurazyan2019-09-094-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | - Replaced the following deprecated APIs: QWebEngineProfile::setRequestInterceptor -> QWebEngineProfile::setUrlRequestInterceptor QWebEngineSettings::globalSettings -> WebEngineSettings::defaultSettings QLayout::setMargin -> QLayout::setContentsMargins QWheelEvent::{x, y} -> QWheelEvent::position QWheelEvent::{globalX, globalY} -> QWheelEvent::globalPosition QSysInfo::windowsVersion -> QOperatingSystemVersion::current Qt::InputMethodQuery::ImMicroFocus -> Qt::InputMethodQuery::ImCursorRectangle QDesktopWidget::screenGeometry -> QGuiApplication::primaryScreen::geometry QTime -> QElapsedTimer - Fixed the tests to compile when deprecated APIs are disabled. - Replaced the doc references to deprecated APIs with the new ones. Made the docs for deprecated APIs compile conditionally, based on deprecation version. Task-number: QTBUG-76491 Change-Id: I5c6b7c628957deb9163f0bd2b6bc31bde1c7daec Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Allow deferring QWebEngineCertificateError handlingKirill Burtsev2019-09-051-15/+27
| | | | | | | | | | | | | Introduce defer() method for halting URL load on certificate errors, and methods for rejecting and ignoring these errors subsequently in async manner. [ChangeLog][QtWebEngineWidgets][QWebEngineCertificateError] New methods for asynchronous decision on certificate error during load. Fixes: QTBUG-55110 Change-Id: Ib23eb568862ccc360208922a6a581f8e7edc4a7e Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Introduce findTextFinished signalPeter Varga2019-08-234-4/+20
| | | | | | | | | | | | | | | | | | This is a replacement for the callbacks. Also introduces QWebEngineFindTextResult class what is common for the Quick and Widget APIs. This makes possible to provide extra information about the match, eg. the number of matches and the index of the currently highlighted match. [ChangeLog][QtWebEngine][WebEngineView] Introduces findTextFinished signal and FindTextResult type to provide extra information about the result of a text search. [ChangeLog][QtWebEngineWidgets][QWebEnginePage] Introduces findTextFinished signal and QWebEngineFindTextResult class to provide extra information about the result of a text search. Task-number: QTBUG-50420 Change-Id: Icb9737d2f596e6bc0fc5733144eeeaf2a77aab02 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Add API to change download directory path and file nameTamas Zakor2019-07-052-3/+5
| | | | | | | | | | | | | | | | | | Add functions and property to change the download directory and file name in QWebEngineDownloadItem and QQuickWebEngineDownloadItem and deprecate the path() and setPath(). Regenerating the uniquifying download filename after change the download directory. [ChangeLog][DownloadItem] Add functions and property to change the download directory and file name in QWebEngineDownloadItem and QQuickWebEngineDownloadItem and deprecate the path() and setPath(). Task-number: QTBUG-56978 Change-Id: I6e63da82a187add8bc3206cc80c8bf6865fbdd35 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-04-303-14/+24
|\ | | | | | | Change-Id: I051052a70a6e764202a90d77fc1a0f73688d3704
| * Simple browser example: create off-the-record profile in a lazy mannerKirill Burtsev2019-04-233-14/+24
| | | | | | | | | | | | | | | | Do not create multiple profiles immediately on start. Allows to start and run browser with default profile with 'single-process' flag. Change-Id: Idea7da8167152f718a3c2d4086ad4216d8e1b722 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Merge branch '5.12' into 5.13Allan Sandfeld Jensen2019-04-091-2/+2
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/renderer/user_resource_controller.cpp src/core/web_contents_adapter.cpp src/webengine/doc/src/qtwebengine-overview.qdoc Change-Id: I46be9d33b3b65d61dfa099ee72a3509afb9bd6a4
| * Doc: Avoid auto-linking the string 'WebEngine' to the QML typeLeena Miettinen2019-04-011-2/+2
| | | | | | | | | | | | | | | | | | | | Remove the previous workaround (internal \externalpage command) that was used for this purpose, and replace it with a \QWE macro that expands to the string 'Qt \WebEngine'. The backslash in the expanded string instructs QDoc not to attempt auto-linking the word. Change-Id: If4e1c95423fa07479b1af055e4760a890c0ac667 Reviewed-by: Paul Wicking <paul.wicking@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>
* | Web Notifications APIKirill Burtsev2019-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch '5.12' into devAllan Sandfeld Jensen2018-11-161-0/+1
|\| | | | | | | | | | | | | | | Conflicts: src/core/compositor/compositor.cpp src/core/compositor/compositor.h Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e
| * Set organizationName of all examples to QtExamplesJüri Valdmann2018-11-131-0/+1
| | | | | | | | | | | | | | | | Group directories under ~/.cache and ~/.config. Fixes: QTBUG-71669 Change-Id: Ia55aeab8c0e38f58afcbda128f04fd3d85c3df5e Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devAllan Sandfeld Jensen2018-11-052-3/+3
|\| | | | | | | | | | | | | | | | | Conflicts: src/core/render_widget_host_view_qt.cpp src/core/web_contents_adapter_client.h src/webenginewidgets/api/qwebenginepage_p.h Change-Id: Ibd011c40839c09469218ac4c71a13d0a0b1c9778
| * Allow client certificates without opensslAllan Sandfeld Jensen2018-10-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | We don't use OpenSSL, but only depended on it because QtNetwork didn't define QSslCertificate without an SSL backend. I changed that in QtNetwork 5.12, so we only rely on a QtNetwork SSL backend with older Qt versions. Task-number: QTBUG-54877 Change-Id: I16f3077235f5c48610597868608ef2e5ca2efa99 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Make it possible to enable OCSP on LinuxAllan Sandfeld Jensen2018-10-171-0/+3
|/ | | | | | | | | | | | | The code follows Chromium and also set a CertNetFetcher on both Linux and macOS, but it appears to be currently unused. [ChangeLog][QWebEngineProfile] A profile can now be designated to download OCSP records and thus enable OCSP verification on Linux. Task-number: QTBUG-58059 Task-number: QTBUG-71164 Change-Id: I84fd34d4351cb7aa4417ce4058f97bad4b8d0cd4 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Chromium requires C++14Allan Sandfeld Jensen2018-10-111-1/+0
| | | | | | | | | QtWebEngineCore was only building because Chromium CPPFLAGS was overriding ours. And setting C++11 in our examples and tests now forces a downgrade. Change-Id: I3642394f15bb9974688991800552624d2379faf9 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Merge remote-tracking branch 'origin/5.11' into 5.12Allan Sandfeld Jensen2018-09-1712-12/+43
|\ | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/core_common.pri Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
| * Document Tango icons used in examplesKai Koehne2018-08-2112-12/+43
| | | | | | | | | | | | Task-number: QTBUG-62053 Change-Id: I2df300239f4f02bb74f1ec27a74874b3877aabd0 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* | Correct cert to certificateAllan Sandfeld Jensen2018-09-122-2/+2
| | | | | | | | | | Change-Id: I7534aa6cd0c2a95403ad997095d5de76216f228e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fix simplebrowser build without sslMichal Klocek2018-07-292-0/+6
| | | | | | | | | | Change-Id: I30dd5d438d9c17a1b96e858bf00cafdcf8d26544 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Enable client certificate storeAllan Sandfeld Jensen2018-07-082-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Creates the default client cerficate store for the platform and when given a choice of client certificates forwards to the choice to the application. Only a Widgets API for now. Task-number: QTBUG-54877 Change-Id: Ie15152398d5769579fa0c07e3e3035c2374e9940 Reviewed-by: Michal Klocek <michal.klocek@qt.io>