summaryrefslogtreecommitdiffstats
path: root/doc/src/configure.qdoc
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-21 03:04:12 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-09-21 03:04:13 +0200
commit20948b62f69338cb5ba6b396ae5cf8c32bf348b6 (patch)
tree1292f72bfeb5fc0bd79d1a4acac2de9f380632df /doc/src/configure.qdoc
parentb490a2028f4c03783e76646bf9ff47e3601bf14d (diff)
parenta7bacc5e4b357ef3b0d8901963c5f7bb1462720b (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
Diffstat (limited to 'doc/src/configure.qdoc')
-rw-r--r--doc/src/configure.qdoc19
1 files changed, 8 insertions, 11 deletions
diff --git a/doc/src/configure.qdoc b/doc/src/configure.qdoc
index 5389fcc13..6767e3e9a 100644
--- a/doc/src/configure.qdoc
+++ b/doc/src/configure.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2019 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the documentation of the Qt Toolkit.
@@ -80,15 +80,6 @@
make install
\endcode
- \note The 'make install' step is required only if Qt is configured with a
- \e -prefix, which is the default on Unix-based platforms unless the
- \e -developer-build configure option is used. On Windows, Qt is configured
- as a non-prefix build by default.
-
- \note The \c -developer-build is meant for developing Qt and not for
- shipping applications. Such a build contains more exported symbols than
- a standard build and compiles with a higher warning level.
-
\section1 Modules and Features
Qt consists of different \l{All Modules}{modules} whose sources can be
@@ -234,7 +225,7 @@
\list
\li \l{Building Qt 5 for Android} Wiki page
\li \l{Qt for iOS - Building from Source}
- \li \l{Qt for WinRT#Building from source}{Qt for WinRT - Building from Source}
+ \li \l{Qt for UWP#Building from source}{Qt for UWP - Building from Source}
\li \l{Configure an Embedded Linux Device}
\li \l{http://wiki.qt.io/Qt_RaspberryPi}{Qt for Raspberry Pi} - a community-driven site for
Raspberry devices
@@ -281,4 +272,10 @@
dynamically switch between the available options at runtime. For more
details about the benefits of using dynamic GL-switching, see
\l{Graphics Drivers}.
+
+ \section1 Developer Builds
+
+ The \c -developer-build option is not meant for shipping applications,
+ but can be used for developing Qt. Such a build contains more exported
+ symbols than a standard build and compiles with a higher warning level.
*/