aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@qt.io>2018-06-07 15:38:36 +0200
committerLeena Miettinen <riitta-leena.miettinen@qt.io>2018-06-08 07:10:09 +0000
commit3b8f0842a0f395c7c773d7dc65ac503ecfd4f185 (patch)
tree3b9448721fc4b2213020793f3b11272d23d67add /doc
parentaf59639826739a4c6c47e265ea0d41501d10bdc7 (diff)
Doc: Update information about compiling Qt Quick Applications
This is an open source feature since Qt 5.11. Change-Id: I9f1554dc880c0f69c6488e3281f6ae9e7f533c65 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'doc')
-rw-r--r--doc/src/overview/creator-commercial-overview.qdoc4
-rw-r--r--doc/src/projects/creator-projects-settings-build.qdoc21
2 files changed, 14 insertions, 11 deletions
diff --git a/doc/src/overview/creator-commercial-overview.qdoc b/doc/src/overview/creator-commercial-overview.qdoc
index cf195a8b38..589395d770 100644
--- a/doc/src/overview/creator-commercial-overview.qdoc
+++ b/doc/src/overview/creator-commercial-overview.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -43,8 +43,6 @@
\list
\li \l{Analyzing CPU Usage}{CPU Usage Analyzer}
\li \l{Browsing ISO 7000 Icons} in \QMLD
- \li \l{http://doc.qt.io/QtQuickCompiler/}{Qt Quick Compiler}
- integration
\li \l{http://doc.qt.io/QtForDeviceCreation/index.html}{Developing for
embedded devices}
\li \l{http://doc.qt.io/qtcreator/creator-overview-qtasam.html}
diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc
index 4b826de9fb..ad0b2f4ab1 100644
--- a/doc/src/projects/creator-projects-settings-build.qdoc
+++ b/doc/src/projects/creator-projects-settings-build.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2018 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Creator documentation.
@@ -162,14 +162,19 @@
select the \uicontrol {Generate separate debug info} check box. For more
information, see \l{Using the CPU Usage Analyzer}.
- \QC is integrated to \l{http://doc.qt.io/QtQuickCompiler/}
- {Qt Quick Compiler} (commercial only) that enables you to compile QML source
- code into the final binary. This
+ \section3 Compiling QML
+
+ Since Qt 5.11, you can compile QML source code into the final binary. This
improves the startup time of the application and eliminates the need to
- deploy QML files together with the application. \QC new project wizards
- create projects that the Qt Quick Compiler can compile, because they are
- set up to use the Qt Resource System. To compile Qt Quick projects, select
- the \uicontrol {Enable Qt Quick Compiler} check box.
+ deploy QML files together with the application. For more information, see
+ \l{Compiling QML Ahead of Time}.
+
+ \QC new project wizards create Qt Quick projects that can be compiled,
+ because they are set up to use the Qt Resource System. To compile Qt Quick
+ projects, select the \uicontrol {Enable Qt Quick Compiler} check box.
+
+ \note In earlier Qt versions, this was a commercial feature. For more
+ information, see \l{http://doc.qt.io/QtQuickCompiler/}{Qt Quick Compiler}.
\include creator-projects-cmake-building.qdocinc cmake build steps
\include creator-projects-settings-build-qbs.qdocinc qbs build steps