summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-03-0810-1/+338
|\ | | | | | | Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc
| * Doc: fix links in the minimal example docsLeena Miettinen2016-03-072-4/+4
| | | | | | | | | | | | | | | | ...to use the external link specified in qtbase\doc\global\externalsites\qt-webpages.qdoc Change-Id: Ieeade45440a5454ec7856230510f3914b1a56800 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Add minimal examplesKai Koehne2016-03-0110-1/+338
| | | | | | | | | | | | | | | | Task-number: QTBUG-51383 Change-Id: I872bdae7267e7dbf2a93a831d435517bcd4bad64 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Move printToPDF to pageAllan Sandfeld Jensen2016-02-251-1/+1
| | | | | | | | | | | | | | | | | | The API needs nothing from view and view just forwards it to the page anyway. This is an page level API, this also makes it work without being shown. Change-Id: I3b8555ab472ec2c7632db3655bcc31925fcfa001 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-02-201-6/+5
|\ \ | |/ | | | | Change-Id: If884b8b8bc087a6a726476b49cdb48a0efaa173e
| * Fix removal of left-over local socket in demobrowserJoerg Bornemann2016-02-161-6/+5
| | | | | | | | | | | | | | | | Use QLocalServer::removeServer instead of QFile::remove. The socket is usually not in the current directory. Change-Id: Ie5b20b8b02ec7f3065596ebd945a6639bb65a2c0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Add rudimentary printing API and add it to example.Michael Bruning2016-02-162-1/+21
| | | | | | | | | | Change-Id: I48141d07e9744bb21d64a5c8724579cb469ba35c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Added background tab support to WidgetsAdam Kallai2016-02-101-0/+3
| | | | | | | | | | | | | | | | | | - Added middle click navigation support to DemoBrowser. - Extended WebAction with new case (open a new tab in background). - Updated WebEngineWidgets documentation. Change-Id: I4ff91806c274a74f4d94b3f5d43fdd99ab900d46 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devLiang Qi2016-02-102-2/+2
|\ \ | |/ | | | | | | | | | | | | Conflicts: tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp tests/auto/widgets/widgets.pro Change-Id: Id9444359ed2e35d469331db96a355c9ea2d095d5
| * Prefix Markdown Editor example with "WebEngine"Kai Koehne2016-02-042-2/+2
| | | | | | | | | | | | | | | | | | | | Follow the example of the other examples, and always start with WebEngine. This makes also sure that Qt Creator attaches the 'webengine' tag to the example. Task-number: QTBUG-50582 Change-Id: If99ba9a23560abae61e4e2ef5a5b091b3c5473c2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-0416-90/+978
|\ \ | |/ | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * Doc: update Contentmanipulation example docsLeena Miettinen2016-01-284-90/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update screenshot - Remove second \brief command - Fix grammar issues - Use standard phrasing for examples - Replace \snippet commands with \quotefromfile commands. This enables documenting each line of code separately - Replace occurrences of QWebView with QWebEngineView - Replace reference to the obsolete QWebEnginePage::evaluateJavaScript method with reference to QWebEnginePage::runJavaScript() that is used in the example code - Remove snippet markers from mainwindow.h and mainwindow.cpp - Move code comment from mainwindow.cpp to the documentation to make the code leaner Change-Id: If3346810c8aef67c15c9ec7ad4469a222e636cf2 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Add cookiebrowser exampleMichal Klocek2016-01-2612-0/+887
| | | | | | | | | | | | | | | | | | A cookiebrowser shows collected cookies during browsing, users can view cookie content, delete and add new cookies. Change-Id: Ib9cdc29e7ca34c488dd249b44f9e32491517bd60 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
| * Make all examples BSD licensedKai Koehne2016-01-2253-1529/+1477
| | | | | | | | | | Change-Id: I98924e5f8754b7b2ed095abf00eb73fa26399b2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Unify license header usageJani Heikkinen2016-02-014-20/+20
| | | | | | | | | | | | | | | | Update old header.FDL to new header.FDL Change-Id: Iee63498bee1b150b5d079b9a1e82c40bacd4b494 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-02-0162-1256/+1829
| | | | | | | | | | | | | | | | | | From Qt 5.7 -> examples are lisenced under BSD license, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new BSD header Change-Id: I12d6dd8ebeddf1c39e8aed5095fd224f5e0a455f Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-184-408/+24
|\ \ | |/ | | | | Change-Id: I038f3544785862f3a2e2f35b8fab0b163e75d542
| * Update logo of demobrowserKai Koehne2016-01-143-408/+22
| | | | | | | | | | | | Change-Id: I26b907d943ebd424087c54465608598aaf0d0013 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Fix namespaced build of markdowneditor exampleJoerg Bornemann2016-01-141-0/+2
| | | | | | | | | | Change-Id: Iff50511b06962d02e2a69ee47f1f0df82425dc2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Merge branch '5.6' into devAllan Sandfeld Jensen2016-01-1210-56/+187
|\ \ | |/ | | | | Change-Id: I4272eb59cac08c69eaa58dd4d94debf1b8c5cf78
| * QuickNanoBrowser: Enable pepper plugins by defaultKai Koehne2016-01-071-1/+1
| | | | | | | | | | | | | | | | As a generic browser example it should pick up plugins automatically. This is the same behavior as the DemoBrowser. Change-Id: I45ea8f7cd8e92a291137fd488d7a6f29931a15b0 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Do not use deprecated QStyleOptionFrameV2Joerg Bornemann2016-01-043-9/+9
| | | | | | | | | | | | | | | | | | This fixes some warnings when building demobrowser. Change-Id: If895d794e216d9a5bab8d74b3bee370763ff1294 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Demobrowser: Add handling of middle click and double click on tab bar.Alexandru Croitor2015-12-222-0/+18
| | | | | | | | | | | | | | | | | | Implement chromium-ish handling of tab bar handling. Middle clicking on a tab closes the tab. Double clicking on the tab bar opens a new tab. Change-Id: I75d559f09b94c4af2bc4fc8c32339d5c25b357e9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Doc: Add docs for WebEngine Quick Nano Browser exampleLeena Miettinen2015-12-181-4/+102
| | | | | | | | | | | | Task-number: QTBUG-48640 Change-Id: Ie4fc076fb6e3a63ee1a7722cca5b28f240288bf0 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * rename fancybrowser to contentmanipulationJoerg Bornemann2015-12-179-17/+17
| | | | | | | | | | | | | | | | | | | | | | 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 (cherry-pick from eb8eb72ec7e589eedd79143dc7c3fb241706f405) Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix fullscreen mode in qml apiMichal Klocek2015-12-171-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | Current implementation was not working correctly for quicknanobrowser when entering and leaving fullscreen video, in cases where the browser itself was already fullscreen. Use ExitFullScreen to leave fullscreen in demo code. Use onFullScreenRequested handler to track if fullscreen mode is on. Change-Id: I022d5e830b189897d34a9a8747381d041101c692 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix namespaced build of demobrowserJoerg Bornemann2015-12-142-2/+6
| | | | | | | | | | | | Change-Id: I6f863676dabacbe193e148481178753f05bd2869 Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Fix unclosable tabs in demobrowserMichal Klocek2015-12-072-25/+36
| | | | | | | | | | | | | | | | | | Switching to private profile back and forth brakes interactions with tabs. Connect signals every time new WebPage is created. Change-Id: I1765171116a3b9b9caba6ef2233289f50b315e62 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * Add margin to downloadmanageritem uiMichal Klocek2015-12-071-1/+10
| | | | | | | | | | | | | | | | Improve look of downloadmanager window by adding left, right margins to downloadmanageritem.ui Change-Id: I89dbb4bd4290592dde8f6c85e4865037cd990f91 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | 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-2032-35/+1934
|\ \ \ | |/ / | | | | | | Change-Id: I05fe27b8321944cf68cc96dfa9dfcaeb54c8c8cd
| * | Add 'markdowneditor' exampleKai Koehne2015-11-1719-1/+1595
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Fix a typo in quicknanobrowserSzabolcs David2015-10-281-1/+1
| | | | | | | | | | | | | | | Change-Id: I90082e7b95f1693d107a4655324d5544b2d5d29e Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
| * | 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>
| * | Fullscreen notification popups for the Quick examplesSzabolcs David2015-10-274-2/+112
| | | | | | | | | | | | | | | | | | Change-Id: If1057d74b4fa2cb98565e6a0a6f569e24b520753 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
| * | Add Full Screen setting to quicknanobrowserPeter Varga2015-10-271-1/+9
| | | | | | | | | | | | | | | Change-Id: I264a0317d46b79cce8481b3227307115f64520d8 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | | rename fancybrowser to contentmanipulationJoerg Bornemann2015-11-169-17/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | 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-093-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-073-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>