summaryrefslogtreecommitdiff
path: root/doc/src/projects/creator-projects-settings-build.qdoc
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@qt.io>2018-07-05 11:14:33 +0200
committerEike Ziller <eike.ziller@qt.io>2018-07-05 11:14:33 +0200
commit5c81a65422427289f0671b2f2b4d7e809105cbd7 (patch)
tree1ec9cd86aaa14511db73bb60bc7e48312854c31f /doc/src/projects/creator-projects-settings-build.qdoc
parentaa4407e332f62f2cb24dd8e8fb41d2469efba1fb (diff)
parent9bbb085718ca1af4f816331d450b2129e30ff281 (diff)
downloadqt-creator-5c81a65422427289f0671b2f2b4d7e809105cbd7.tar.gz
Merge remote-tracking branch 'origin/4.7'
Conflicts: qbs/modules/qtc/qtc.qbs qtcreator.pri Change-Id: I29916313f12e25f3942ac926f8e4d4490074978e
Diffstat (limited to 'doc/src/projects/creator-projects-settings-build.qdoc')
-rw-r--r--doc/src/projects/creator-projects-settings-build.qdoc5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/src/projects/creator-projects-settings-build.qdoc b/doc/src/projects/creator-projects-settings-build.qdoc
index 8eaf3dbb82..81471b2cc7 100644
--- a/doc/src/projects/creator-projects-settings-build.qdoc
+++ b/doc/src/projects/creator-projects-settings-build.qdoc
@@ -75,6 +75,11 @@
\uicontrol General, and enter a period (.) in the
\uicontrol {Default build directory} field.
+ You can create separate versions of project files to keep platform-dependent
+ code separate. You can use qmake \l{Adding Platform Specific Source Files}
+ {scopes} to select the file to process depending on which platform qmake is
+ run on.
+
\include creator-projects-cmake-building.qdocinc cmake build configuration
\section1 Starting External Processes