summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2016-08-03 16:29:17 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2016-08-03 15:32:02 +0000
commit336e706cbc839dd7b7c1d461b6b015600b5f009e (patch)
tree7d3d56c64e765cbb7467722b9e71d7dfcc4cbb28
parent1a49f193afe1ba54339182a49d891917159f6719 (diff)
Doc: Move info about deploying Qt WebEngine apps into a separate topic
Move information from the Qt docs here in a follow-up change. Also add information in more follow-up changes. Change-Id: I420dcb879332b298247867768e59a736ef466081 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
-rw-r--r--src/webengine/doc/src/qtwebengine-deploying.qdoc44
-rw-r--r--src/webengine/doc/src/qtwebengine-index.qdoc1
-rw-r--r--src/webengine/doc/src/qtwebengine-overview.qdoc12
3 files changed, 45 insertions, 12 deletions
diff --git a/src/webengine/doc/src/qtwebengine-deploying.qdoc b/src/webengine/doc/src/qtwebengine-deploying.qdoc
new file mode 100644
index 000000000..4aa57c0df
--- /dev/null
+++ b/src/webengine/doc/src/qtwebengine-deploying.qdoc
@@ -0,0 +1,44 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://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 https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://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: https://www.gnu.org/licenses/fdl-1.3.html.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*!
+ \page qtwebengine-deploying.html
+ \title Deploying Qt WebEngine Applications
+
+ Qt WebEngine takes advantage of the multi process model that the Chromium
+ project offers. The multi process model requires the QtWebEngineProcess
+ executable to be deployed alongside your application. To do this, we
+ recommend the use of Qt's cross-platform deployment tools.
+
+ Alternatively, if you are carrying out manual deployment, you will find the
+ QtWebEngineProcess executable in the libexec directory of your Qt
+ installation. On Windows, QtWebEngineProcess.exe is located in the bin
+ directory of your Qt application.
+
+ For more information on deploying Qt applications, please see
+ \l {Deploying Qt Applications}.
+*/
diff --git a/src/webengine/doc/src/qtwebengine-index.qdoc b/src/webengine/doc/src/qtwebengine-index.qdoc
index fd7fe2351..c4be591ff 100644
--- a/src/webengine/doc/src/qtwebengine-index.qdoc
+++ b/src/webengine/doc/src/qtwebengine-index.qdoc
@@ -46,6 +46,7 @@
\li \l{Qt WebEngine Platform Notes}
\li \l{Qt WebEngine Licensing}
\li \l{Qt WebEngine Debugging and Profiling}
+ \li \l{Deploying Qt WebEngine Applications}
\li \l{Porting from Qt WebKit to Qt WebEngine}
\endlist
diff --git a/src/webengine/doc/src/qtwebengine-overview.qdoc b/src/webengine/doc/src/qtwebengine-overview.qdoc
index f1b1b69c5..f34b4514b 100644
--- a/src/webengine/doc/src/qtwebengine-overview.qdoc
+++ b/src/webengine/doc/src/qtwebengine-overview.qdoc
@@ -220,18 +220,6 @@
The functions can be used to synchronize cookies with QNetworkAccessManager, as well as to set,
delete, and intercept cookies during navigation.
- \section1 Deploying Qt WebEngine Applications
-
- Qt WebEngine takes advantage of the multi process model that the Chromium project offers.
- The multi process model requires the QtWebEngineProcess executable to be deployed alongside your application.
- To do this, we recommend the use of Qt's cross-platform deployment tools.
-
- Alternatively, if you are carrying out manual deployment, you will find the QtWebEngineProcess executable in the
- libexec directory of your Qt installation.
- On Windows, QtWebEngineProcess.exe is located in the bin directory of your Qt application.
-
- For more information on deploying Qt applications, please see \l {Deploying Qt Applications}.
-
\section1 Platform Notes
Qt WebEngine currently supports only Windows, Linux, and OS X. Due to Chromium build