aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2022-10-21 14:32:19 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2022-10-21 13:24:00 +0000
commit59b92b641740fff5ee3b0a292aaf800be43e2fa2 (patch)
treecd5a6589d3210e008c16522c6a7488f6e61144fd
parentc897eacf4975b846c4a520ea5607b86553bdbdb9 (diff)
Doc: Create separate topics for Qt Design Viewer in QC and QDS manuals
The process in the two apps now differs too much for single-sourcing the docs to be helpful. Change-Id: I3aa60c9f2219d19843f5a4c635fc49c83548f13f Reviewed-by: Mats Honkamaa <mats.honkamaa@qt.io> Reviewed-by: hjk <hjk@qt.io>
-rw-r--r--doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc39
-rw-r--r--doc/qtcreator/src/qtquick/qt-design-viewer.qdoc72
-rw-r--r--doc/qtdesignstudio/src/overviews/qt-design-viewer.qdoc39
3 files changed, 78 insertions, 72 deletions
diff --git a/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc b/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc
new file mode 100644
index 0000000000..a706997ed4
--- /dev/null
+++ b/doc/qtcreator/src/qtquick/creator-only/qt-design-viewer.qdoc
@@ -0,0 +1,39 @@
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+ \page qt-design-viewer.html
+ \previouspage creator-live-preview-devices.html
+ \nextpage creator-building-targets.html
+
+ \title Previewing in Browsers
+
+ \image qt-design-viewer.png
+
+ \QDV is a QML viewer that runs in your web browser. This means that you can
+ run applications in most widely-used web browsers, such as Apple Safari,
+ Google Chrome, Microsoft Edge, and Mozilla Firefox, on the desktop and on
+ mobile devices.
+
+ The startup and compilation time depend on your browser and configuration.
+ However, the actual performance of the application once started is
+ indistinguishable from the same application running on the desktop.
+
+ You can run \l{Creating Qt Quick UI Projects}{Qt Quick UI projects}, which
+ have a .qmlproject file that define the main QML file and the import paths.
+ Compress the project folder into a ZIP file that you upload to \QDV.
+
+ The loaded applications remain locally in your browser. No data is uploaded
+ into the cloud.
+
+ To preview an application in a web browser:
+
+ \list 1
+ \li In the browser, open \l{http://qt-webassembly.io/designviewer/}
+ {\QDV}.
+ \li Drag and drop your application package to \QDV, or click the load
+ icon to browse for your file.
+ \endlist
+
+ Your application is compiled and run on \QDV.
+*/
diff --git a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc b/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
deleted file mode 100644
index 818ad7ed5e..0000000000
--- a/doc/qtcreator/src/qtquick/qt-design-viewer.qdoc
+++ /dev/null
@@ -1,72 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the Qt Design Studio documentation.
-**
-** 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.
-**
-****************************************************************************/
-
-/*!
- \page qt-design-viewer.html
- \if defined(qtdesignstudio)
- \previouspage creator-live-preview-android.html
- \nextpage studio-exporting-and-importing.html
- \else
- \previouspage creator-live-preview-devices.html
- \nextpage creator-building-targets.html
- \endif
-
- \title Previewing in Browsers
-
- \image qt-design-viewer.png
-
- \QDV is a QML viewer that runs in your web browser. This means that you can
- run applications in most widely-used web browsers, such as Apple Safari,
- Google Chrome, Microsoft Edge, and Mozilla Firefox, on the desktop and on
- mobile devices.
-
- The startup and compilation time depend on your browser and configuration.
- However, the actual performance of the application once started is
- indistinguishable from the same application running on the desktop.
-
- \if defined(qtdesignstudio)
- To create a resource file out of your project, select \uicontrol Build >
- \uicontrol {Generate Resource File} in \QC. Then upload the package into
- \QDV.
- \else
- You can run \l{Creating Qt Quick UI Projects}{Qt Quick UI projects}, which
- have a .qmlproject file that define the main QML file and the import paths.
- Compress the project folder into a ZIP file that you upload to \QDV.
- \endif
-
- The loaded applications remain locally in your browser. No data is uploaded
- into the cloud.
-
- To preview an application in a web browser:
-
- \list
- \li In the browser, open \l{http://qt-webassembly.io/designviewer/}
- {\QDV}.
- \li Drag and drop your application package to \QDV, or click the load
- icon to browse for your file.
- \endlist
-
- Your application is compiled and run on \QDV.
-*/
diff --git a/doc/qtdesignstudio/src/overviews/qt-design-viewer.qdoc b/doc/qtdesignstudio/src/overviews/qt-design-viewer.qdoc
new file mode 100644
index 0000000000..5bb4e534f5
--- /dev/null
+++ b/doc/qtdesignstudio/src/overviews/qt-design-viewer.qdoc
@@ -0,0 +1,39 @@
+// Copyright (C) 2019 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only
+
+/*!
+ \page qt-design-viewer.html
+ \previouspage creator-live-preview-android.html
+ \nextpage studio-exporting-and-importing.html
+
+ \title Previewing in Browsers
+
+ \image qt-design-viewer.png
+
+ \QDV is a QML viewer that runs in your web browser. This means that you can
+ run applications in most widely-used web browsers, such as Apple Safari,
+ Google Chrome, Microsoft Edge, and Mozilla Firefox, on the desktop and on
+ mobile devices.
+
+ The startup and compilation time depend on your browser and configuration.
+ However, the actual performance of the application once started is
+ indistinguishable from the same application running on the desktop.
+
+ To create a resource file out of your project, select \uicontrol Build >
+ \uicontrol {Generate Resource File} in \QC. Then upload the package into
+ \QDV.
+
+ The loaded applications remain locally in your browser. No data is uploaded
+ into the cloud.
+
+ To preview an application in a web browser:
+
+ \list 1
+ \li In the browser, open \l{http://qt-webassembly.io/designviewer/}
+ {\QDV}.
+ \li Drag and drop your application package to \QDV, or click the load
+ icon to browse for your file.
+ \endlist
+
+ Your application is compiled and run on \QDV.
+*/