summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets
Commit message (Collapse)AuthorAgeFilesLines
* Add a "save page" dialog to demobrowserJoerg Bornemann2015-12-215-0/+362
| | | | | | | | Add a dialog to let the user choose the format and location when saving web pages. Change-Id: I19640d96add68bf08bdc4e4f9f24845ba1b0d22f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Add support for checking if audio is played in a page.Alexandru Croitor2015-12-152-0/+64
| | | | | | | | | | | | | Add support for checking if audio is played in a page, as well as the ability to (un)mute the audio. Modify demobrowser example to show (muted) in the tab title, if the tab is muted, or (audible) if there is audio playing in the tab. Fix HTML5 audio/video (un)mute to also work. Change-Id: I7213645e67be2f9da1c5f96cdf6c7eef5341ae4b Task-number: QTBUG-48788 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into devLiang Qi2015-12-031-1/+1
|\ | | | | | | Change-Id: I052fdc4245e25e58457d51f6e49703bc7dd8ff00
| * Merge remote-tracking branch 'origin/5.5' into 5.6Liang Qi2015-11-201-1/+1
| |\ | | | | | | | | | Change-Id: I20e36d0e18dd26365557a4093436e9660e30e173
| | * fix "open download" in demo browserJoerg Bornemann2015-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Open the downloaded file, not the directory. Change-Id: I61b3a8e6788bf26b1a446459ce8b38774f8c28a0 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
* | | Merge branch '5.6' into devAllan Sandfeld Jensen2015-11-2027-31/+1811
|\| | | | | | | | | | | Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
| * | Add 'markdowneditor' exampleKai Koehne2015-11-1718-0/+1593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This example shows the use of QWebEngineView in a hybrid application, and how one can leverage JavaScript libraries to provide functionality with minimal effort. QWebEngineView is used to preview a MarkDown document. The text is exposed to the view through QWebChannel. An off-the-self js library converts it to HTML. Change-Id: I24c38106da3ec18975c71c16f7f7a58e93142f9e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Update DemoBrowser example imageKai Koehne2015-11-161-0/+0
| | | | | | | | | | | | | | | Change-Id: I8eaf44ed98bbceac06bae9751cee1490d553db7c Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
| * | use Q_ENUM instead of Q_ENUMSJoerg Bornemann2015-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This makes the enum values available as strings in qDebug, QCOMPARE and such. Change-Id: Id57a2002451337fcc8aedac673f834445913895c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * | Make QWebEngineFullScreenRequest const correctKai Koehne2015-11-122-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let QWebEngineFullScreenRequest be logically const-correct. It feels weird to be allowed to call "accept()" or "reject()" on a constant object. Also allow the user to copy the request, but check whether the page is still valid in the implementations of accept(), reject(). Change-Id: Ibf139a126734fc8e2db68ec26dc8f24cd4438942 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Print JS console messages by defaultKai Koehne2015-11-062-18/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the behavior of QWebEnginePage/WebEngineView to print JavaScript console.warn and console.error messages by default in a 'js' logging category. This matches also the behavior for QtQml, where console messages end up in a 'qml' logging category by default. So far access to the JavaScript console required either use of the remote debugging functionality, subclassing of QWebEnginePage, or implementing a custom handler. Anyhow, even then writing a seamless forwarding of the data and metadata to the Qt message handler is difficult. This patches implements this forwarding by default. The behavior can be changed by either setting up rules for the 'js' category, e.g. setFilterRules("js.*=false"); or by implementing onJavaScriptConsoleMessage(), or overriding QWebEnginePage::javaScriptConsoleMessage. [ChangeLog] Unhandled JS console messages are now forwarded to to the Qt message handler inside a 'js' category. Change-Id: I5480383a80dcf7a122496f9b7915264ef9036db3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Fullscreen notification popup for Widgets demobrowserSzabolcs David2015-10-305-3/+208
| | | | | | | | | | | | | | | Change-Id: I3afc0399e4156cd17917103face68ca1945409f9 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * | Demobrowser: fix compiler warnings due to missing Q_DECL_OVERRIDE.Michael Bruning2015-10-281-2/+2
| | | | | | | | | | | | | | | Change-Id: I7dbfeeb1a5ef91575d650bc10c7faf6ccb6b6c54 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | rename fancybrowser to contentmanipulationJoerg Bornemann2015-11-168-16/+16
|/ / | | | | | | | | | | | | | | | | | | | | | | The name "fancybrowser" tricks people into thinking that this is the reference browser example. But this example is a very simple browser with an additional fancy content manipulation feature. Rename this example to contentmanipulation to reflect reality. Change-Id: I200b701acdc4de1210b550b9f054753e5f1d1ea4 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Fix ABI breakage due to fullscreen featureAllan Sandfeld Jensen2015-10-192-9/+12
| | | | | | | | | | | | | | | | | | | | | | We can not add a new virtual method without breaking ABI on some platforms, instead we need to use a setter. The API now uses a request object, and a separate signal for canceling, since canceling can not be rejected. Change-Id: If8069c343e86926293c30e8de179bf4e3cbd5886 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | add RequestClose web actionJoerg Bornemann2015-10-092-10/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Web pages can set the onbeforeunload handler to let the user confirm whether to leave the page or not. Until now, only when leaving the page via a link, a confirmation was shown. Before actually closing a web page, applications can now trigger the RequestClose web action. This will give the use the chance to confirm or deny the close request. If the request is confirmed, the signal windowCloseRequested is emitted. Task-number: QTBUG-36155 Change-Id: Icc1fabc37a2ac537f674c2f00bc8966e4dc4e610 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | remove unused code from demobrowserJoerg Bornemann2015-10-091-15/+0
| | | | | | | | | | | | | | | | | | | | | | Remove QWEBENGINEPAGE_ISMODIFIED block from demobrowser. This feature is not implemented. It is questionable whether it should be re-introduced in its old form. Checking whether the user should think twice about leaving the current page is usually implemented by the HTML page itself. Change-Id: I51544129b26f3e0c132e2c983c2ce1744cc19123 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Doc: remove doc config file from Qt WebEngineWidgets submoduleLeena Miettinen2015-10-072-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps maintaining the doc dependencies. All Qt WebEngine module docs are now generated in the /qtbase/doc/qtwebengine/ folder. Note that you must run qmake -r for the docs to be generated correctly after applying this patch. Add Qt WebEngine C++ Classes page that lists the C++ classes for the submodules. Modify snippet and example paths accordingly. Change-Id: I59431c5f766f30b59654ca4e2219b76c79137225 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | Correct demobrowser target on OS XAllan Sandfeld Jensen2015-09-281-1/+1
| | | | | | | | | | | | | | We were still using Browser as target on OS X Change-Id: I0b526ad772651a3a54913e0830fc2f92fe2648c4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | DemoBrowser: Do not mention QtWebKit in descriptionKai Koehne2015-09-221-1/+1
| | | | | | | | | | | | | | | | | | WebEngine should stand on it's own by now. It is also arguably misleading to mention the word "WebKit" so prominently. Change-Id: Ibd1c98b12f5832d047e553098d6703699acf27d8 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Emit a signal when the rendering process exits.Jake Petroules2015-09-102-0/+23
| | | | | | | | | | | | | | | | | | This allows users to implement a "sad tab" feature and/or track rendering process crashes using a crash reporting service. Task-number: QTBUG-48227 Change-Id: I97ef934fe5d0912cd0f41967a39052316b3c66b0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix favicon load after authentication in browser examplePeter Varga2015-09-083-1/+95
| | | | | | | | | | | | | | | | | | | | | | | | In the widget browser example QNetworkAccessManager downloads the favicon for a webpage. In case of HTTP or proxy authentication the credentials may not be cached when QNetworkAccessManager tries to load the favicon. Therefore, store last credentials and provide it to QNetworkAccessManager when it emits authenticationRequired signal. Change-Id: I2d057bfa7291a13cec30db9debaf30382415122b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix broken signal/slot connections in browser example on OS X.Jake Petroules2015-09-072-7/+4
| | | | | | | | | | Change-Id: Ic5b7e149e0ff9165a7244aab5d5249c5ca856747 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix demobrowser build on OS X.Jake Petroules2015-09-061-1/+1
| | | | | | | | | | | | | | This is a regression introduced by 1819313. Change-Id: I552668e1812d9aa086b59cab79cb206a6f3742da Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix crash on exiting fullscreenAllan Sandfeld Jensen2015-09-062-2/+6
| | | | | | | | | | | | | | Reuse the fullscreen view and avoid deleting it synchronously. Change-Id: I05642fb29507e6bbc6e6443c94deec35ccb83440 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Full-screen support in the demo browserAllan Sandfeld Jensen2015-09-033-0/+32
| | | | | | | | | | | | | | Move a webpage requesting fullscreen to a fullscreen webview. Change-Id: Id333b0ffa78bebb20f1ea98f8665b819ad2fce0e Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Rename the widget browser example demobrowserAllan Sandfeld Jensen2015-09-0369-12/+11
| | | | | | | | | | | | | | | | | | 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-263-19/+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>