Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: Ieab3c4a6d16b1d7b7c0243ff8898f81807e7b1fc

10 files changed, 338 insertions, 1 deletions

diff --git a/examples/examples.pro b/examples/examples.pro
index 867ce4cc6..342c2c311 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,11 +1,14 @@
 TEMPLATE=subdirs
 
 qtHaveModule(webengine) {
-    SUBDIRS += webengine/quicknanobrowser
+    SUBDIRS += \
+        webengine/minimal \
+        webengine/quicknanobrowser
 }
 
 qtHaveModule(webenginewidgets) {
     SUBDIRS += \
+        webenginewidgets/minimal \
         webenginewidgets/contentmanipulation \
         webenginewidgets/cookiebrowser \
         webenginewidgets/demobrowser \
diff --git a/examples/webengine/minimal/doc/src/minimal.qdoc b/examples/webengine/minimal/doc/src/minimal.qdoc
new file mode 100644
index 000000000..c0b89ba5a
--- /dev/null
+++ b/examples/webengine/minimal/doc/src/minimal.qdoc
@@ -0,0 +1,82 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webengine/minimal
+    \title WebEngine Qt Quick Minimal Example
+    \ingroup webengine-examples
+    \brief Displays a web page using the Qt Quick integration of Qt WebEngine
+
+    \image minimal-example.png
+
+    \e {WebEngine Qt Quick Minimal Example} demonstrates how to use the
+    \l{WebEngineView} item to render a web page. It shows the minimum amount of
+    code needed to load and display an HTML page, and can be used as a basis for
+    further experimentation.
+
+    \include examples-run.qdocinc
+
+    \section1 C++ Code
+
+    In \c main.cpp we use only the QGuiApplication and QQmlApplicationEngine
+    classes. We also include \c qtwebengineglobal.h to be able to use
+    \l{QtWebEngine::initialize}.
+
+    \quotefromfile webengine/minimal/main.cpp
+    \skipto #include
+    \printto main
+
+    In the main function we first instantiate a QGuiApplication object.
+    We then call \l{QtWebEngine::initialize}, which makes sure that OpenGL
+    contexts can be shared between the main process and the dedicated renderer
+    process (\c QtWebEngineProcess). This method needs to be called before
+    any OpenGL context is created.
+
+    Then we create a QQmlApplicationEngine, and tell it to load \c main.qml
+    from the \l{The Qt Resource System}{Qt Resource System}.
+
+    Finally, QGuiApplication::exec() launches the main event loop.
+
+    \printuntil }
+
+    \section1 QML Code
+
+    In \c main.qml we create the top level window, set a sensible default size
+    and make it visible. The window will be filled by a WebEngineView item
+    loading the \l{Qt Homepage}.
+
+    \quotefromfile webengine/minimal/main.qml
+    \skipto import
+    \printuntil }
+    \printline }
+
+    \section1 Requirements
+
+    The example requires a working internet connection to render the
+    \l{Qt Homepage}.
+    An optional system proxy should be picked up automatically.
+*/
diff --git a/examples/webengine/minimal/main.cpp b/examples/webengine/minimal/main.cpp
new file mode 100644
index 000000000..cc5a1f61e
--- /dev/null
+++ b/examples/webengine/minimal/main.cpp
@@ -0,0 +1,55 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QGuiApplication>
+#include <QQmlApplicationEngine>
+#include <qtwebengineglobal.h>
+
+int main(int argc, char *argv[])
+{
+    QGuiApplication app(argc, argv);
+    QtWebEngine::initialize();
+
+    QQmlApplicationEngine engine;
+    engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
+
+    return app.exec();
+}
+
diff --git a/examples/webengine/minimal/main.qml b/examples/webengine/minimal/main.qml
new file mode 100644
index 000000000..f2d9f40b1
--- /dev/null
+++ b/examples/webengine/minimal/main.qml
@@ -0,0 +1,53 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+import QtQuick 2.0
+import QtQuick.Window 2.0
+import QtWebEngine 1.0
+
+Window {
+    width: 1024
+    height: 750
+    visible: true
+    WebEngineView {
+        anchors.fill: parent
+        url: "http://www.qt.io"
+    }
+}
diff --git a/examples/webengine/minimal/minimal.pro b/examples/webengine/minimal/minimal.pro
new file mode 100644
index 000000000..23ce01d5b
--- /dev/null
+++ b/examples/webengine/minimal/minimal.pro
@@ -0,0 +1,10 @@
+TEMPLATE = app
+
+QT += webengine
+
+SOURCES += main.cpp
+
+RESOURCES += qml.qrc
+
+target.path = $$[QT_INSTALL_EXAMPLES]/webengine/minimal
+INSTALLS += target
diff --git a/examples/webengine/minimal/qml.qrc b/examples/webengine/minimal/qml.qrc
new file mode 100644
index 000000000..0ff3892d9
--- /dev/null
+++ b/examples/webengine/minimal/qml.qrc
@@ -0,0 +1,6 @@
+<RCC>
+    <qresource prefix="/">
+        <file>main.qml</file>
+    </qresource>
+</RCC>
+
diff --git a/examples/webenginewidgets/minimal/doc/images/minimal-example.png b/examples/webenginewidgets/minimal/doc/images/minimal-example.png
new file mode 100644
index 000000000..18ac9b177
--- /dev/null
+++ b/examples/webenginewidgets/minimal/doc/images/minimal-example.png
diff --git a/examples/webenginewidgets/minimal/doc/src/minimal.qdoc b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc
new file mode 100644
index 000000000..22f28e604
--- /dev/null
+++ b/examples/webenginewidgets/minimal/doc/src/minimal.qdoc
@@ -0,0 +1,66 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the documentation of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:FDL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Free Documentation License Usage
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of
+** this file. Please review the following information to ensure
+** the GNU Free Documentation License version 1.3 requirements
+** will be met: http://www.gnu.org/copyleft/fdl.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+    \example webenginewidgets/minimal
+    \title WebEngine Widgets Minimal Example
+    \ingroup webengine-widgetexamples
+    \brief Displays a web page using Qt WebEngine Widgets
+
+    \image minimal-example.png
+
+    \e {WebEngine Widgets Minimal Example} demonstrates how to use
+    \l{QWebEngineView} to render a web page. It shows the minimum amount of code
+    needed to load and display an HTML page, and can be used as a basis for
+    further experimentation.
+
+    \include examples-run.qdocinc
+
+    \section1 The Code
+
+    In \c main.cpp we instantiate a QApplication and a QWebEngineView. The URL
+    to load is set by calling \l QWebEngineView::setUrl. The view widget is
+    given a reasonable default size, and shown.
+    Finally, QApplication::exec() launches the main event loop.
+
+    \quotefromfile webenginewidgets/minimal/main.cpp
+    \skipto #include
+
+    \printuntil }
+
+    \section1 Requirements
+
+    The example requires a working internet connection to render
+    the \l{Qt Homepage}.
+    An optional system proxy should be picked up automatically.
+    However, for proxies that require a username or password,
+    you need to connect to
+    QWebEnginePage::proxyAuthenticationRequired.
+
+    \l{Qt WebEngine Widgets} uses the \l{Qt Quick Scene Graph} to compose the
+    page. Therefore, OpenGL support is required.
+*/
diff --git a/examples/webenginewidgets/minimal/main.cpp b/examples/webenginewidgets/minimal/main.cpp
new file mode 100644
index 000000000..d9a137739
--- /dev/null
+++ b/examples/webenginewidgets/minimal/main.cpp
@@ -0,0 +1,54 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** You may use this file under the terms of the BSD license as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include <QApplication>
+#include <QWebEngineView>
+
+int main(int argc, char *argv[])
+{
+    QApplication app(argc, argv);
+
+    QWebEngineView view;
+    view.setUrl(QUrl(QStringLiteral("http://www.qt.io")));
+    view.resize(1024, 750);
+    view.show();
+
+    return app.exec();
+}
diff --git a/examples/webenginewidgets/minimal/minimal.pro b/examples/webenginewidgets/minimal/minimal.pro
new file mode 100644
index 000000000..849f4b9b6
--- /dev/null
+++ b/examples/webenginewidgets/minimal/minimal.pro
@@ -0,0 +1,8 @@
+TEMPLATE = app
+
+QT += webenginewidgets
+
+SOURCES += main.cpp
+
+target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/minimal
+INSTALLS += target