summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorNico Vertriest <nico.vertriest@digia.com>2015-11-03 12:59:29 +0100
committerNico Vertriest <nico.vertriest@digia.com>2015-11-04 13:38:56 +0000
commit1c01cfa07734a299ed5f4c3489b140009a7cad45 (patch)
tree2f361ddb8c078b0c37249a80f26d919dc847af45 /qmake
parente22e8cee7521cb673124b6d034d150d26b08f2f1 (diff)
Doc: corrected error about path list separator
Task-number: QTBUG-48673 Change-Id: Id5b99c0dd778b55c937d345e49995086c5ef372e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/doc/src/qmake-manual.qdoc22
1 files changed, 12 insertions, 10 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc
index 535b500fd3..6915c2e5c1 100644
--- a/qmake/doc/src/qmake-manual.qdoc
+++ b/qmake/doc/src/qmake-manual.qdoc
@@ -3965,25 +3965,27 @@
\list 1
\li In a directory listed in the \c QMAKEFEATURES environment variable that
- contains a colon-separated list of directories.
+ contains a list of directories delimited by the platform's path list separator
+ (colon for Unix, semicolon for Windows).
\li In a directory listed in the \c QMAKEFEATURES property variable that
- contains a colon-spearated list of directories.
+ contains a list of directories delimited by the platform's path list separator.
\omit
\li In a features directory beneath the project's root directory (where
- the \c{.qmake.cache} file is generated).
+ the \c{.qmake.cache} file is generated).
\endomit
\li In a features directory residing within a \c mkspecs directory.
- \c mkspecs directories can be located beneath any of the directories
- listed in the \c QMAKEPATH environment variable that contains a
- colon-separated list of directories. For example:
+ \c mkspecs directories can be located beneath any of the directories
+ listed in the \c QMAKEPATH environment variable that contains a
+ list of directories delimited by the platform's path list separator.
+ For example:
\c{$QMAKEPATH/mkspecs/<features>}.
\li In a features directory residing beneath the directory provided by the
- \l{QMAKESPEC} environment variable. For example: \c{$QMAKESPEC/<features>}.
+ \l{QMAKESPEC} environment variable. For example: \c{$QMAKESPEC/<features>}.
\li In a features directory residing in the \c data_install/mkspecs directory.
- For example: \c{data_install/mkspecs/<features>}.
+ For example: \c{data_install/mkspecs/<features>}.
\li In a features directory that exists as a sibling of the directory
- specified by the \c QMAKESPEC environment variable.
- For example: \c{$QMAKESPEC/../<features>}.
+ specified by the \c QMAKESPEC environment variable.
+ For example: \c{$QMAKESPEC/../<features>}.
\endlist
The following features directories are searched for features files: