summaryrefslogtreecommitdiff
path: root/examples/webenginewidgets/browser
Commit message (Collapse)AuthorAgeFilesLines
* Rename the widget browser example demobrowserAllan Sandfeld Jensen2015-09-0368-13574/+0
| | | | | | | | | The browser example already uses the name demobrowser internally, this changes the external name to make it easier to refer to explicitly, and avoid users thinking fancybrowser is the better example. Change-Id: Ic093eb4881352b5f796bf565df01edb929aba39c Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix use of empty credentials for HTTP and proxy authenticationPeter Varga2015-09-011-0/+6
| | | | | | | | | | Empty user and password fields are valid for HTTP and proxy authentication. Thus it does not mean that the authentication is cancelled. For informing the engine about the cancellation of the authentication dialog make QAuthenticator instance null. Change-Id: Iba1ce9d375b9b37c23f7a91fb583606d75d04af5 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Merge remote-tracking branch 'origin/dev' into 5.6Allan Sandfeld Jensen2015-08-257-253/+15
|\ | | | | | | Change-Id: Iee44f6f41c00838c9efe30f600200307bdef770a
| * Demo browser: add proxy supportPierre Rossi2015-08-197-253/+15
| | | | | | | | | | | | | | And remove NetworkAccessManager-related dead code. Change-Id: I6246aaaa1bbdda43ed0453e7acd0f2df33f58edd Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-08-183-32/+5
|\ \ | |/ |/| | | Change-Id: I9977663123560a22f493b8c02d02de8897b38666
| * fix ambiguous key sequence in browser exampleJoerg Bornemann2015-07-141-7/+2
| | | | | | | | | | | | | | | | Ctrl-0 is used for "Reset Zoom". Only use Ctrl-1 to Ctrl-9 for switching between tabs. Change-Id: I6e8816622e200030252dad53389a874642ba9e50 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * remove QWebEngineHistoryInterface usage from browser exampleJoerg Bornemann2015-07-082-25/+3
| | | | | | | | | | | | | | | | | | QWebHistoryInterface is used to implement support for keeping track of visited links. QWebEngine is already doing this internally, removing the need for a QWebEngineHistoryInterface. Change-Id: I908a81368b57a86845bc75ff75bf8eb7949ab0cc Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | make httpUserAgent setting usable after editJoerg Bornemann2015-08-112-0/+6
| | | | | | | | | | | | | | | | Do not require a re-start of the browser example to use the new setting. Change-Id: I733f6492ddc038412c99dbe9d1b3e685250ef2b6 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | add a way to set Accept-Language in browser exampleJoerg Bornemann2015-08-114-7/+47
| | | | | | | | | | Change-Id: I3d67b8ce9a51f82fe1de6fe92edd8f69fcda1a2f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix widgets plugin settingsAllan Sandfeld Jensen2015-07-202-4/+0
| | | | | | | | | | | | | | | | Connect the user setting to the webengine settings, and make it available in the demo browser Change-Id: Id4da8a4125a9f982cb687d433b6fce123e72c4c7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Log javascript console log to qInfo channelAllan Sandfeld Jensen2015-07-072-0/+18
| | | | | | | | | | | | | | | | This is a pretty useful default for an example and test browser, we only log warnings and errors though. Change-Id: Ic92175cb8c231e7ec33c4899f9fc457923f65970 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devLiang Qi2015-06-291-11/+5
|\ \ | |/ | | | | | | | | | | | | Conflicts: .qmake.conf src/webenginewidgets/api/qwebenginepage.cpp Change-Id: Idb33c92bd53fab76eee8fedb542dbf5e4a10f9e6
| * Last minute API review cleanupPierre Rossi2015-06-121-3/+3
| | | | | | | | | | | | | | | | | | The getters in QWebEngineDownloadItem were not const. The script collection in QWebEngineProfile was passed by reference, which is not idiomatic of Qt. Change-Id: I9b4218b407288b91a726a711bd2a7e1c1167d99a Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
| * Disambiguate name of QLocalServer used in Browser example.Friedemann Kleint2015-05-201-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | Append Qt version and engine name so that it does not lock out the QtWebKit based browser and allows for comparing different versions of Qt. Remove outdated section within Q_WS_QWS. Change-Id: I754db3ce78eefea88b97960af24ae628093e3c2a Task-number: QTBUG-46233 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Make QQuick contextmenu actions behave like widget counterpartsAllan Sandfeld Jensen2015-05-271-0/+1
| | | | | | | | | | | | | | | | | | Updates a two of the context menu actions so they behave like the updated actions in qtwebenginewidgets. Also improves the default label of OpenInThisWindow, since by default there are no other windows. Change-Id: Iac0dc23e8f31598296cba87f93503cefd926983f Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.5' into devPierre Rossi2015-05-1512-53/+90
|\ \ | |/ | | | | Change-Id: I1fbcd05760cb287d1d8a0fba344ec7cfe8348c7d
| * Reintroduce private browsing mode for example browserAllan Sandfeld Jensen2015-05-1112-53/+90
| | | | | | | | | | | | | | Uses QWebEngineProfile to support private browsing mode. Change-Id: I78fa712d2425eb2df519594ee3fa5639bbcbebf6 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Extend context menu actionsAllan Sandfeld Jensen2015-05-112-25/+11
|/ | | | | | | | Implements the several missing context menu actions for navigation and image and media handling. Change-Id: Ib8ea8311ea291fe2f98e509bc6f4034a5e0389c9 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4' into 5.5Andras Becsi2015-04-151-3/+3
|\ | | | | | | Change-Id: I1e414bb2252ee4b2204ef50a9d122d1d1504115d
| * Update links from qt-project.org to qt.ioSergio Ahumada2015-03-061-3/+3
| | | | | | | | | | Change-Id: I0882a82457eaef37e84f81ad3bc44e1d65cec4ef Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Demo browser: re-add user stylesheetsPierre Rossi2015-03-205-24/+63
| | | | | | | | | | | | | | | | | | | | | | Implemented in terms of user scripts. Considering loading from a file URL would probably require setting a different cross origin policy for the isolated world we run this in, something we don't quite have yet, it seems easier to just use an inline <style> block. Change-Id: Ia6f7fbb96b925bcc3202b510689524abd93643fc Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into 5.5Frederik Gladhorn2015-03-031-1/+1
|\ \ | |/ | | | | Change-Id: Iffde26e99e32b2043fe54b0afc01f14c508df145
| * Replace old qt-project.org wiki with wiki.qt.ioSergio Ahumada2015-03-021-1/+1
| | | | | | | | | | Change-Id: If9f4b7bcfa4bfffffd5180600981ca0f16f6da8f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Create application bundles for widget examples on OS XAndras Becsi2015-02-262-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not remove app_bundle from CONFIG and update the Info.plist file for the Browser example to have the correct resolution on retina displays. This patch also updates the snapshot sha1 to include localization patch and one that removes a additional duplicate lower-case header file that was causing problems during source packaging. [ChangeLog][QtWebEngineWidgets][OS X] Fix example on retina display Change-Id: I682d41ca13d33ec06837ad862924382f4236d76c Task-number: QTBUG-44633 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Update copyright headersJani Heikkinen2015-02-1646-395/+395
| | | | | | | | | | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: Ieb6bac7a1be5c25eb7cb917495b58b6a870ca6d4 Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* | Fix multi-tab browser quit action on OS XAndras Becsi2015-02-061-1/+1
| | | | | | | | | | | | | | | | Fix typo '=+' -> '+=', that prevented us from properly counting the open tabs on OS X. Change-Id: If6bbe8cbcf83d7ee8a4e11361a2199b51430700b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Revive the widget Browser's DownloadManagerAndras Becsi2015-02-058-240/+151
| | | | | | | | | | | | | | | | | | This reenables the widget example Browser's download code by porting it from the QNAM-based QtWebKit API to the new download API of QtWebEngine. Change-Id: I0630c76902fb30c355c774664f0a2005fe29023c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Widgets: Implement mouse lock permission APISzabolcs David2015-01-161-6/+8
| | | | | | | | | | | | | | | | | | If the user grants the permission with mouse click on the feature permission bar, the RenderWidgetHostView loses the focus but the focus is necessary for the pointer lock. Change-Id: Ifafd86b472e400c5690194dce2ea8a829a51c313 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* | Introduce QWebEngineProfile APIAllan Sandfeld Jensen2014-12-123-333/+242
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduces initial widgets API for the Chromium BrowserContext. Adds API for controlling cookie jar policy, user-agent string and cache and persistent data paths. Similar QML API will follow in another patch. [ChangeLog][QtWebEngineWidgets][QWebEngineProfile] New API for profiles applying to groups of QWebEnginePages. Change-Id: I3c4ef4053fde7564af29178c91a0aca8a2b61a5f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devAndras Becsi2014-12-011-1/+4
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/core/access_token_store_qt.cpp src/core/access_token_store_qt.h src/core/content_browser_client_qt.cpp Change-Id: Id319ad0d87ce071e63d9c6c22b4fc35523ddfa74
| * Doc: Fix issues related to example docsTopi Reinio2014-11-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | - Add documentation for Quick Nano Browser - Add all examples to the correct group - Add instructions to run the examples - Qt WebEngine Widgets index page: Add examples section Task-number: QTBUG-42668 Change-Id: Ie60f8708336b9c147d0c22afb555fe87287deddc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | <widgets/browser> Connect PermissionUnknown to the discard buttonSzabolcs David2014-11-202-2/+9
| | | | | | | | | | Change-Id: Ie5c216e9a07eae403082ab265ad5300d554037ec Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* | Merge remote-tracking branch 'origin/5.4' into devAllan Sandfeld Jensen2014-11-116-13/+17
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/core/browser_context_qt.cpp src/webengine/api/qquickwebengineview_p.h Change-Id: I73bdec03b627b282851d7dda12006d4ab631072c
| * Fix enum names of audio/video featuresAllan Sandfeld Jensen2014-11-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The feature enum names and documentation gave the impression it could control audio and video output, while they only control input. Also removed documentation of non connected feature permissions for Notifications and GeoLocation. Change-Id: Ia35142ca691ebd6059b7472e9803fda8cbd84813 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
| * Fix URLs in examples.Friedemann Kleint2014-11-044-9/+10
| | | | | | | | | | Change-Id: I528b7c4c22a1c47f54fe1b78a9d781a6af9cfc6b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix spelling in browser example.Friedemann Kleint2014-11-041-1/+4
| | | | | | | | | | Change-Id: Id54fd7ca704bd9456c98765afdbaf04e3d46b33c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Implement acceptNavigationRequest for the widgets API.Andras Becsi2014-10-202-31/+7
|/ | | | | | | | | This is the equivalent API for navigationRequested in QtQuick. This patch also enables and updates tests that depended on this API, and removes the ones that we will not support. Change-Id: I28970c11225420a9680fbd767880130492664179 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Examples: Fix warnings in webenginewidgets/browser example.Michael Brüning2014-10-064-0/+7
| | | | | | Fixing unused parameter warnings. Change-Id: Ic4b60b85f2434aa745e1aeb412984dc3f8a62820 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Examples: Replace deprecated Q_WS_MAC defines with Q_OS_OSX.Michael Brüning2014-10-063-11/+11
| | | | | Change-Id: I2d9f23a9aa8871df7b3054628a2db49ea858c522 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Various doc tweaksJocelyn Turcotte2014-09-291-3/+0
| | | | | | | | | | | | - Fix the example pages titles to match the qdocconf files - Remove information not as relevant for QtWebEngine as it was for QtWebKit - Fix the QtWebEngineWidgets snippet not to refer to webengine - Remove the dead link and the reference to Arora from QtWebEngine Change-Id: Ib3c57c8dd534330b3323c94fb2217374b3e52cf9 Reviewed-by: Andras Becsi <andras.becsi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Disable the unified toolbar on OS X in QtWebEngineWidgets examplesJocelyn Turcotte2014-09-121-1/+0
| | | | | | | | | The unified toolbar doesn't work yet with QOpenGLWidget, which we use to render RenderWidgetHostViewQtDelegateWidget. Task-number: QTBUG-41179 Change-Id: I5b33d8c06600162974a05bff5fec6e1c7b59e939 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Fix tst_QWebEngineFrame::progressSignal API test caseSzabolcs David2014-09-092-4/+4
| | | | | | | | This test fails, because we get two loadProgress signals with the 100 value if the page load is successful. Change-Id: Idbd68c28ba81f8ff0a5b1d98aece82e7a940f1b9 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add Qt WebEngine Widgets API for allowing certificate errorsAllan Sandfeld Jensen2014-08-292-0/+16
| | | | | | | | | | | This adds API for overriding some certificate errors. Once overridden any identical error for the same hostname and certificate will use the same override. Similar API for QtWebEngine QML should be added in a later patch. Change-Id: I144147b86d9b592e3f87346a1e48890acee0c670 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add scrollanimator settings to example browserAllan Sandfeld Jensen2014-08-193-1/+16
| | | | | Change-Id: I7dc7261aadbbf08dbbeb1323cf46d24dc8e58e16 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Re-enable some qwebenginesetting features in browser exampleAllan Sandfeld Jensen2014-08-198-43/+24
| | | | | | | | We now have the QWebEngineSettings class and can re-enable the features that were previously disabled in the browser that depended on it. Change-Id: I525dd1a4b5c380ad4c6060f276440e069f633897 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Handle new window/tab modifiers also on normal navigationsJocelyn Turcotte2014-08-151-2/+0
| | | | | | | | | | | | | | | | | AddNewContents is only called when window.open is called from JavaScript. We also want the shift/ctrl modifiers to trigger normal links to open in the requested disposition. In this case OpenURLFromTab will pass the detected disposition and we must create a new WebContents ourselves. Use the same code path going through WebContentsAdapterClient::adoptNewWindow except that we pass a null WebContents pointer to the WebContentsAdapter constructor and let it create its own when initialized. Change-Id: I817b0e72aec12723bf92d9b7ad85c1cecbf5e408 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Do away without QWebEngineWidgets::initializePierre Rossi2014-08-041-2/+0
| | | | | | | | | If we consider the plugin scenario is unlikely and decide it's unsupported for widgets, we can simplify our tests and examples a bit on this front. Change-Id: Idc96032c127b4ee74fb5c7b3d2cdfdf99c3a722e Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* Add api to get the favicon URLAllan Sandfeld Jensen2014-07-306-21/+60
| | | | | | | | | | | Adds one of the missing pieces of the QWebFrame and QWebView APIs. Unlike the QtWebKit version this only fetches the favicon URL, and not the icon. This is because we do not want to implement an icon database, and that the icon would be loaded asynchronous anyway, bringing no guarantee to be a valid icon/image yet. Change-Id: I227311ae3676044da850e687b82bee752b5079c8 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix up tabbed browser code.Michael Brüning2014-05-192-7/+8
| | | | | Change-Id: Ia1a92a7eb9b3568e8cb7ccf6c7056abba647fd8d Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Add linkHovered support for Widgets APISzabolcs David2014-05-151-6/+2
| | | | | | | | Drop hovered title and link text parameters, as we did in the Quick API. Change-Id: Ia1a38e0d728afbcbb6858a890486772da74aa813 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
View Lorry Controller Status