summaryrefslogtreecommitdiff
path: root/examples/webenginewidgets/demobrowser/browsermainwindow.cpp
Commit message (Collapse)AuthorAgeFilesLines
* demobrowser: Fix compilation warningPeter Varga2016-10-071-0/+2
| | | | | Change-Id: I283365c72d351e62bc749cbc60e06472e52255ec Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Fix memory leak on printAllan Sandfeld Jensen2016-09-231-1/+1
| | | | | | | We need to delete the QPrintDialog. Change-Id: I959f963ba2e44091acb0c762ac680037bccc5b43 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Add printing on a QPrinter to the demobrowserMichael Bruning2016-08-281-8/+24
| | | | | Change-Id: I307103956bf50469a5c4cbe3656f655925f55653 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-051-2/+20
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also blacklist tst_QWebEnginePage::comboBoxPopupPositionAfterChildMove() and comboBoxPopupPositionAfterMove(). Conflicts: .qmake.conf src/3rdparty src/core/render_widget_host_view_qt.cpp src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-platform-notes.qdoc src/webenginewidgets/render_widget_host_view_qt_delegate_widget.cpp src/webenginewidgets/render_widget_host_view_qt_delegate_widget.h tests/auto/widgets/qwebenginepage/BLACKLIST tests/auto/widgets/qwebenginepage/tst_qwebenginepage.cpp tools/qmake/mkspecs/features/functions.prf Task-number: QTBUG-55158 Change-Id: I1d73ac9b3ca5293ad3c7e3a56f4c395da930e6f4
| * Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-08-021-2/+20
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/core/resources/resources.gyp src/webengine/doc/src/qtwebengine-overview.qdoc src/webenginewidgets/api/qwebenginepage.cpp src/webenginewidgets/api/qwebenginescriptcollection.cpp src/webenginewidgets/api/qwebenginescriptcollection_p.h tests/auto/widgets/qwebenginepage/BLACKLIST And readded newly in 5.6 enabled tests to the BLACKLIST. Change-Id: I4ab1fc54ebfaaf940df81b0d8d6bdd15cae8b7c4
| | * Fixup Back/Forward short-cutsAllan Sandfeld Jensen2016-07-221-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove backspace short-cut, Chromium will already handle that if it is standard on the platform. Also we were not triggering on Back/Forward buttons due to those being mapped to prev/next tab item in Qt. Task-number: QTBUG-54546 Change-Id: I9a4f48c718c5685ca9ca1b032d8b04409ac622ca Reviewed-by: Jesus Fernandez <jesus.fernandez@theqtcompany.com> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | | Add View Source API and make the feature available from context menuPeter Varga2016-08-021-15/+4
|/ / | | | | | | | | | | | | | | | | | | [ChangeLog][QtWebEngineQML][QQuickWebEngineView] View Source feature is now supported [ChangeLog][QtWebEngineWidgets][QWebEnginePage] View Source feature is now supported Change-Id: Icc16da71fc6ec95880897fc9744dd8be8c004e00 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Allan Sandfeld Jensen2016-06-111-1/+0
|\ \ | |/ | | | | Change-Id: Ib010ede9756fb02992a3276ae7ec90ef1ab56a00
| * Do not trigger find on slash keyAllan Sandfeld Jensen2016-06-031-1/+0
| | | | | | | | | | | | | | | | Application short-cuts override the passing the keys to WebCore, and makes it impossible to type '/' in form elements. Change-Id: I7df99547f99a3a0703d98d19d3ccdb23de0641ce Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| * Make all examples BSD licensedKai Koehne2016-01-221-28/+27
| | | | | | | | | | Change-Id: I98924e5f8754b7b2ed095abf00eb73fa26399b2d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Replace print dialog with a custom one for printing to pdf.Michael Bruning2016-05-021-13/+9
| | | | | | | | | | | | | | | | The standard pdf print dialog does not work on OS X and Windows. Task-number: QTBUG-53016 Change-Id: Ic9dd1a1603e1cdbd82fef095cc660814bcd8c98e Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Remove default values for printToPdf callbacks and unify API.Michael Bruning2016-04-131-1/+1
| | | | | | | | | | | | | | Adds default QPageLayout values. Change-Id: Ibf2964ecd86350a51d682e385973f830ac4347a7 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | Add callback to printing APIMichael Bruning2016-03-161-2/+20
| | | | | | | | | | | | | | Also corrects and updates the printToPDF docs to reflect recent changes. Change-Id: Iffe276a1046d6d55923939f9d72b97cd533017ff 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>
* | Add rudimentary printing API and add it to example.Michael Bruning2016-02-161-1/+20
| | | | | | | | | | Change-Id: I48141d07e9744bb21d64a5c8724579cb469ba35c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Updated license headersJani Heikkinen2016-02-011-22/+31
|/ | | | | | | | | 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>
* Rename the widget browser example demobrowserAllan Sandfeld Jensen2015-09-031-0/+982
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>
View Lorry Controller Status