summaryrefslogtreecommitdiffstats
path: root/examples/webenginewidgets/contentmanipulation/mainwindow.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '5.6' into devAllan Sandfeld Jensen2016-02-041-2/+0
|\ | | | | | | Change-Id: I0bb971f01ee1e02da768f336680c8ec0254ab2b0
| * Doc: update Contentmanipulation example docsLeena Miettinen2016-01-281-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| * rename fancybrowser to contentmanipulationJoerg Bornemann2015-12-171-0/+80
| | | | | | | | | | | 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>
* Updated license headersJani Heikkinen2016-02-011-3/+13
| | | | | | | | | 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 fancybrowser to contentmanipulationJoerg Bornemann2015-11-161-0/+80
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>