summaryrefslogtreecommitdiffstats
path: root/src/webengine/doc/src/qtwebengine-qmlmodule.qdoc
Commit message (Collapse)AuthorAgeFilesLines
* Change some copyright headers from LGPL to standard oneKai Koehne2017-09-201-24/+26
| | | | | | | | | The files are small enough that they are arguably not 'copyrightable' in the first place. Task-number: QTBUG-60006 Change-Id: Ieee3a88500864b82da843e3872d85969fae637e6 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Docs: Update QtWebEngine to 1.5Kai Koehne2017-04-101-2/+2
| | | | | Change-Id: I0831cbb21c5f67b74a1df2311f055e6218ae3619 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-161-0/+1
|\ | | | | | | Change-Id: Id5f97771be23a4393e8d3be98903c321377ae809
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-161-0/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty src/webengine/api/qquickwebenginecertificateerror.cpp src/webengine/doc/src/webengineview.qdoc tools/qmake/config.tests/libcap/libcap.cpp Change-Id: I2a2cfc904a8d6b561fb71ef7a0cc4bfb860124db
| | * Add Qt WebEngine to list of "All QML Modules"Kai Koehne2016-08-051-0/+1
| | | | | | | | | | | | | | | | | | | | | This list is shown in qtdoc/qmlmodules.html Change-Id: Ib51f0405e7581571f8a124ea6806e7bc4982dba3 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-051-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06-271-1/+1
| |\| | | | | | | | | | Change-Id: Ic6686df8f82f710a3441501b7eeaffe69fbcbdf7
| | * Remove split between 'C++' and 'QML' modules in index pageKai Koehne2016-06-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This is somewhat artificial, since the QtWebEngine module now also has public C++ API. Change-Id: I2067a3eb4e84cfac2b3e6766b272445b9bd31ae7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | | Bump import QtWebEngine 1.4Kai Koehne2016-08-031-2/+2
|/ / | | | | | | | | | | Change-Id: Ic2261be6540b592edf38f721a82b631a5f1ffd95 Reviewed-by: Michal Klocek <michal.klocek@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* / Doc: Bump QtWebEngine import version to 1.3Kai Koehne2016-04-061-2/+2
|/ | | | | Change-Id: Ibea40489390e2e7b89ab4f47edf06856f3d764d5 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@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>
* Update QtWebEngine version in module overviewKai Koehne2015-12-011-2/+1
| | | | | | | | Also remove QtQuick import. This one is not specific for the module. Change-Id: I0cdbb0f36823e109e0b4b93e65ae3de59aebd2b7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Doc: remove include and linking instructions from front pageLeena Miettinen2015-12-011-0/+7
| | | | | | | | Make sure that the instructions are visible on the linked page for each module. Change-Id: I47625bd8eb19ddf1f94e1bafb49f132216a0c069 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Doc: Use \qml for code snippets where possibleTopi Reinio2015-10-081-1/+1
| | | | | | | | | | | | QDoc's QML parser works OK for code snippets that include a full type declaration; use \qml for these snippets to get autolinking to QML types working. Use \badcode for codeblocks that are not code or have nothing to link to. Change-Id: Iffd2f356bf0b3efc854a3755873e66f8c9478cac Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Merge branch '5.5' into 5.6Allan Sandfeld Jensen2015-09-081-2/+2
| | | | Change-Id: Idafba4d47393638cfc72fd02be092b67bb8cbd8c
* Doc: reorganize and rename docsLeena Miettinen2015-08-191-0/+39
- Move general docs to src/webengine/doc/src - Remove a dedicated .qdocconf for Qt WebEngine Core, build its documentation as part of Qt WebEngine - Describe all Qt WebEngine modules on the Qt WebEngine index and overview pages - Add a wireframe drawing on the architecture Change-Id: Ib4261d1a16bbaf313d0f858515184a96dab524a5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 19:12:20 +0000