summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '5.12' into 5.13Allan Sandfeld Jensen2019-04-0910-20/+20
|\ | | | | | | | | | | | | | | | | | | 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-0110-20/+20
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-03-289-5/+10
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/web_contents_view_qt.h src/core/web_engine_context.cpp Change-Id: I17f3a4814e88a5680dc61a6d734c171ccba00e8c
| * Fix markdown rendering of titles in recipebrowserAlexandru Croitor2019-03-217-0/+7
| | | | | | | | | | | | | | | | | | | | | | Apparently not having a newline before each recipe title, prevented the markdown JS renderer from rendering the titles properly, instead the titles wee unformatted and also displayed the = signs. Add the new lines. Change-Id: I8176e8f3029ca2e80114d6555bbb73696ba51509 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * Fix tabbing in recipebrowserAllan Sandfeld Jensen2019-03-212-5/+3
| | | | | | | | | | | | Fixes: QTBUG-55146 Change-Id: I034ebb3e65341b5424a24d5a143013d726d55e10 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Allan Sandfeld Jensen2019-03-041-5/+10
|\| | | | | | | Change-Id: I1dd136df7004b11e2f38a2ec4e82a6fa81627479
| * Quicknanobrowser: Hide status bubble properlySzabolcs David2019-02-251-5/+10
| | | | | | | | | | | | | | Status bubble is always visible in the lower left corner. Change-Id: I334246d65261b8c762aafb7d276122f63fe3a8ba Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add a setting to control if the PDF viewer is enabledMichael Brüning2019-02-221-0/+8
| | | | | | | | | | | | | | | | | | | | [ChangeLog] Introduces a setting to control if the internal PDF viewer is enabled. By default, PDF documents will now be opened in the viewer instead of being downloaded. Change-Id: I78b3b3702ae3be3da58c9635720ba861db3de661 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> 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>
* | 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>
* | Add a minimal example for the WebEngineAction APISzabolcs David2019-01-297-1/+318
| | | | | | | | | | | | | | | | | | | | It shows how to bind actions to tool buttons and how to create a custom context menu. Task-number: QTBUG-70253 Change-Id: Ie70e88e454a6707f430f230aff1b49b0b2303799 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Add support for client-certificate selection to QMLAllan Sandfeld Jensen2019-01-241-1/+5
| | | | | | | | | | | | Task-number: QTBUG-69363 Change-Id: I54d1df17d82bf2297f43762b0ba86a080bafee23 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into devMichael Brüning2019-01-181-4/+10
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/core/net/network_delegate_qt.cpp src/core/profile_io_data_qt.cpp src/core/web_engine_context.h tests/auto/core/qwebengineurlrequestinterceptor/tst_qwebengineurlrequestinterceptor.cpp Change-Id: Id98e3f52f548ceb5b68abd80aedd6ae59db72cc0
| * Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-12-131-4/+10
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/webenginewidgets/minimal/doc/src/minimal.qdoc Change-Id: I7475770b8a18a69a33601cf88842a7873ba6003c
| | * Fix documentation of WebEngine Widgets Minimal ExampleKai Koehne2018-11-091-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The printing of the source code was broken in commit 0fe0b133b7410. Make sure that the whole source code is printed. Also document the commandLineUrlArgument() function. Task-number: QTBUG-71691 Change-Id: I0044fb6508c712eab91e8d342624df5ea23e2fdc Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge branch '5.12' into devAllan Sandfeld Jensen2018-11-1617-9/+32
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/core/compositor/compositor.cpp src/core/compositor/compositor.h Change-Id: I8a4d73d728d93d95e499849f8778cc88dda2105e
| * | Set organizationName of all examples to QtExamplesJüri Valdmann2018-11-1317-9/+32
| | | | | | | | | | | | | | | | | | | | | | | | 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-054-6/+9
|\| | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Fix typo in error message of maps examplePeter Varga2018-10-311-1/+1
| | | | | | | | | | | | | | | Change-Id: Icd89aea969921ee2a5e6949a4f045ae7439dd618 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * | Fix size of tab view when devtools are openAllan Sandfeld Jensen2018-10-231-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | The tabs view still trying to fill the entire view even when the bottom was taken by the devtools view. Change-Id: Ia1c4fc7aa9648bf19d5f79dd7ac95ec611318105 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
| * | 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-172-1/+5
|/ / | | | | | | | | | | | | | | | | | | | | | | | | 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-115-5/+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-1730-18/+154
|\| | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/core_common.pri Change-Id: I36dc3a70aa653e6c8a610c787b615034180a6127
| * Document Tango icons used in examplesKai Koehne2018-08-2130-18/+154
| | | | | | | | | | | | 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>
* | Improve QWebEngineUrlScheme APIJüri Valdmann2018-09-122-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following feedback from 5.12 API review: - Use enum class for Syntax - Add Q_FLAG for Flags - Mark constructor from name as explicit - Rename Secure to SecureScheme - Rename Local to LocalScheme - Rename addScheme to registerScheme - Rename findScheme to schemeByName Task-number: QTBUG-70247 Change-Id: Iae332c8d9843349506e8a4b07d70f0d234597375 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | WebUI example: Reduce duplicationsKai Koehne2018-09-063-7/+15
| | | | | | | | | | | | | | Declare scheme name and about URL in one place. Change-Id: Id8eb69f2a8516dd21e6abedc2adda828a5a9e18c Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Fix initial url in quicknanobrowser and minimal examplesMichal Klocek2018-08-282-2/+2
| | | | | | | | | | | | | | | | There is no qt.io. Use www.qt.io. Use https. Change-Id: I1bf44a3c99cbb50b93875d88881cbdfb083f27c5 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Add webui exampleJüri Valdmann2018-08-239-1/+558
| | | | | | | | | | | | | | | | | | Example of using QWebEngineUrlScheme and QWebEngineUrlSchemeHandler. Change-Id: I1316831600e7c9b8f7ca7b205ecb3c29bfcdcd84 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into ↵Allan Sandfeld Jensen2018-08-2216-146/+1785
|\ \ | | | | | | | | | refs/staging/5.12
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Michael Brüning2018-08-2116-146/+1785
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf configure.json examples/webenginewidgets/markdowneditor/resources/3rdparty/marked.js examples/webenginewidgets/markdowneditor/resources/3rdparty/qt_attribution.json examples/webenginewidgets/markdowneditor/resources/markdowneditor.qrc mkspecs/features/platform.prf src/3rdparty src/core/media_capture_devices_dispatcher.cpp src/core/net/url_request_context_getter_qt.cpp src/core/net/url_request_context_getter_qt.h src/core/web_contents_adapter.cpp Change-Id: I467133ba455b1f85f6bb61793794c31cb1094541
| | * Fix segfault in devtools openInNewTab handlingJüri Valdmann2018-07-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use OpenURL on the devtools WebContents. - Guard against self-destruction (otherwise quicknanobrowser crashes). - Change quicknanobrowser to open links in new tabs. Task-number: QTBUG-69359 Change-Id: I4db379731c6fa855124d38c5066b0aad622861d2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| | * Update marked.js in examplesKai Koehne2018-07-1219-33/+3049
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update marked.js in examples to version 0.4.0. Also use the non-minified version; this is required by some downstream users like Debian. Task-number: QTBUG-69273 Change-Id: Ic4fffc2db0a457e54595cd846efee305b97b2238 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Fix typo in examples/webenginewidgets/webenginewidgets.proJüri Valdmann2018-08-211-1/+1
|/ / | | | | | | | | Change-Id: I86dc2f050644a354553aab82a221d986e95c81aa Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | Make WebChannel an optional featureMichal Klocek2018-08-091-1/+1
| | | | | | | | | | | | | | Add webengine-webchannel feature. Change-Id: I600572180f8169aafe79cf0408527cc087d9a007 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Fix simplebrowser build without sslMichal Klocek2018-07-292-0/+6
| | | | | | | | | | Change-Id: I30dd5d438d9c17a1b96e858bf00cafdcf8d26544 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Update user dir associated to BrowserContext when chaging profile's pathPeter Varga2018-07-201-0/+1
| | | | | | | | | | | | | | | | | | | | Otherwise, setting a WebEngineProfile to non-off-the-record would assert. Therefore, now it is safe to set the quicknanobrowser's defaultProfile to non-off-the-record. Task-number: QTBUG-69416 Change-Id: I5ca2230e12e457dd9963e386708f2394ae4c8cea Reviewed-by: Michal Klocek <michal.klocek@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>
* | Merge remote-tracking branch 'origin/5.11' into devAllan Sandfeld Jensen2018-06-2610-10/+10
|\| | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf configure.json src/3rdparty tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp Change-Id: Id79ff6cf01c2db3a2044881ddcbf044abdf84936
| * Doc: Add missing dots (qtwebengine)Paul Wicking2018-06-229-9/+9
| | | | | | | | | | | | Task-number: QTBUG-68933 Change-Id: I395157a9931a0e0789b3791cc9b4d55dbcf8a4c2 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| * Doc: Fix quoting code from Recipe Browser exampleLeena Miettinen2018-06-221-1/+1
| | | | | | | | | | Change-Id: I4012d91241ea04a786792de1916997c09d9298b4 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix webengine geolocation featureMichal Klocek2018-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | Use feature check in the configuration and in the implementation files. Make feature public, so developers can check if webengine was complied with or without geolocation. Change-Id: If679b5c366074c2f48fad5ba189870571567fe81 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Add sanity config check to examplesMichal Klocek2018-06-182-0/+9
| | | | | | | | | | | | | | | | Report error if example is used, but no support in webengine. Change-Id: Ic1c8f6c875c0197abdc9ffe92eea05af236c3318 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Fine tune configure and clean up header includesMichal Klocek2018-06-122-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously configure was generating two config headers qtwebengine-config.h and qtwebengine-config_p.h, however those headers were never installed or included as dependency in Makefiles. Moreover, due to the name clash all features were included into qt_lib_webengine_*.pri which is QtWebEngine QML module. Move configure to core so all features belong now to qt_lib_webenginecore*.pri. Fix global includes to include qtwebenginecore-config*.h. Drop all DEFINES and use QT_CONFIG instead. Cleanup all evil looking includes in headers for webengine and webenginewidgets. Change-Id: Iddbc8bf4487d9a5f0c19a71a9569535083507756 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Use range-based for instead of Q_FOREACHJüri Valdmann2018-06-062-2/+3
| | | | | | | | | | Change-Id: Ibf016b795ff98fddfa29fb5dc63924a2d2159d71 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* | simplebrowser: Handle featurePermissionRequested signalJüri Valdmann2018-06-012-0/+35
| | | | | | | | | | Change-Id: I012461722c006cbd6a4871279e94a442681d4fe5 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devAllan Sandfeld Jensen2018-05-291-1/+1
|\| | | | | | | Change-Id: I9b1f2a0317290f0855da03eca9d26878b7faeb0a
| * CookieBrowser: Support also incomplete URL'sKai Koehne2018-05-251-1/+1
| | | | | | | | | | | | | | Use QUrl::fromUserInput to also handle URL's without protocol prefix. Change-Id: I8e9d4650ffe86886920b48170a6b188d2c0478c8 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* | Update 3rd party code in markdown exampleKai Koehne2018-05-236-14/+1396
| | | | | | | | | | | | | | | | | | | | | | Update to marked 0.3.19. Also include the un-minified version, so that the code can be read. [ChangeLog][Third-Party Code] Updated "Marked (WebEngine Markdown Editor example)" to version 0.3.19. Change-Id: Ie068d003ec6cfab27803332b4aa12095c6c8a457 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 17:15:55 +0000