summaryrefslogtreecommitdiffstats
path: root/src/webengine/api/qquickwebengineloadrequest.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Describe WebEngineLoadRequest::errorDomainLeena Miettinen2016-12-221-0/+20
| | | | | | | | | | | Remove the WebEngineLoadRequest property doc from WebEngineView::loadingChanged() method docs and add the type name to create an automatic link to the type docs. Fix a typo in the copied ErrorDomain docs. Change-Id: I9798e066d599c75a062bb7f596e4465f32d613b4 Reviewed-by: Michael Brüning <michael.bruning@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-161-3/+4
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webengine/api/qquickwebenginecertificateerror.cpp src/webengine/doc/src/webengineview.qdoc tools/qmake/config.tests/libcap/libcap.cpp Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
| * Doc: Add type name to enumeration values to follow the doc conventionLeena Miettinen2016-08-091-3/+4
| | | | | | | | | | Change-Id: I86eea3a64a38f6ec9984f663499abffa03cd9eb2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | Unify license header usage.Jani Heikkinen2016-02-011-11/+14
|/ | | | | | | | | Update files using old header.LGPL3 to use header.LGPL Update files using old header.FLD to use new header.FDL Update files using old header.BSD to use new header.BSD Change-Id: I36a67aaa8c3ca6c7946308defc9c03c3571a7d23 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Remove explicit version \inqmlmoduleKai Koehne2015-12-101-1/+1
| | | | | | | Also bump version in \qmlmodule QtWebEngine 1.2 Change-Id: I4d0379a3a46548e626508a8cf1fad51f742c8ddb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: edit WebEngineLoadRequest docsLeena Miettinen2015-08-281-8/+10
| | | | | | | | | | - Add missing documentation - Replace "class" with "type" - Use standard phrasing - Edit for grammar and style Change-Id: I35bcb3c84e87257d56ee5d89847f8ecf302b205b Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Update copyright headersJani Heikkinen2015-02-161-7/+7
| | | | | | | | | 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>
* Doc: Edited docs according to writing guidelines.Jerome Pasion2014-09-291-10/+8
| | | | | | | | | | | | | -added \since and added commands such as \readonly -converted enum values to use \value -edited language and other minor issues. -only the main Qt WebEngine, the widget docs will be edited later. Change-Id: Ifbb76a6472b5efede15daebc78d605b8b449d957 Task-number: QTBUG-40757 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Update License Headers for Qt WebEngine to LGPLv3.Zeno Albisser2014-08-211-15/+10
| | | | | | | Change-Id: Idbe0eafb51d77cc00e3a93179b81770724d5bfaa Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
* Clean up opaque pointer handling for QQuickWebEngineLoadRequestAndras Becsi2014-08-061-1/+28
| | | | | | | | | Hide QObject's d_ptr member and use the macros when accessing the private class. This patch also adds missing qt namespace macros to the implementation. Change-Id: I004e3ea52bf21618835724d218f2a405f77ca4d1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fixing QQuickWebEngineView.loadingChanged public API test caseAdam Kallai2014-02-251-3/+3
| | | | | | | | | Rename QQuickWebEngineView.loadingStateChanged signal name to QQuickWebEngineView.loadingChanged. Change-Id: I0e01034f7b2eea57f5211ff0d8258d9f27d278f0 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Implement QQuickWebEngineLoadRequest classAdam Kallai2014-01-151-0/+113
It contains information about a requested load of a web page. Change-Id: Ie45706adb51ee5bce98e7af01252d9a8389db57d Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>