diff options
author | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 13:24:25 +0100 |
---|---|---|
committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2014-12-01 14:28:00 +0100 |
commit | 9316b8c27c4d63ee755517fb4670268424200b3c (patch) | |
tree | a9818fd5a8798ec56add7cd622fb13cee525557a /examples/webenginewidgets | |
parent | ad46ffd2e74b17cd7e7b8a7d73590696cc8febce (diff) | |
parent | 03a52863226aeb774721db610ba831808b30836a (diff) |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/core/access_token_store_qt.cpp
src/core/access_token_store_qt.h
src/core/content_browser_client_qt.cpp
Change-Id: Id319ad0d87ce071e63d9c6c22b4fc35523ddfa74
Diffstat (limited to 'examples/webenginewidgets')
-rw-r--r-- | examples/webenginewidgets/browser/doc/src/browser.qdoc | 5 | ||||
-rw-r--r-- | examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/examples/webenginewidgets/browser/doc/src/browser.qdoc b/examples/webenginewidgets/browser/doc/src/browser.qdoc index a8208184d..f4a51518b 100644 --- a/examples/webenginewidgets/browser/doc/src/browser.qdoc +++ b/examples/webenginewidgets/browser/doc/src/browser.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -28,10 +28,13 @@ /*! \example browser \title WebEngine Tab Browser Example + \ingroup webengine-widgetexamples \brief The QtWebKit browser example ported to use QtWebEngine The Tab Browser example shows the \l{Qt WebEngine Widgets} module in action, providing a little Web browser application with support for tabs. \image browser-demo.png + + \include examples-run.qdocinc */ diff --git a/examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc b/examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc index 60652c69a..f4b5321a1 100644 --- a/examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc +++ b/examples/webenginewidgets/fancybrowser/doc/src/fancybrowser.qdoc @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the documentation of the Qt Toolkit. @@ -28,6 +28,7 @@ /*! \example fancybrowser \title WebEngine Fancy Browser Example + \ingroup webengine-widgetexamples \brief Demonstrates how to use browse web and manipulate content \brief The Fancy Browser example shows how to use JQuery with QtWebEngine to @@ -40,6 +41,8 @@ evaluate the jQuery JavaScript code. A QMainWindow with a QWebEngineView as central widget builds up the browser itself. + \include examples-run.qdocinc + \section1 MainWindow Class Definition The \c MainWindow class inherits QMainWindow. It implements a number of |