From 1c01cfa07734a299ed5f4c3489b140009a7cad45 Mon Sep 17 00:00:00 2001 From: Nico Vertriest Date: Tue, 3 Nov 2015 12:59:29 +0100 Subject: Doc: corrected error about path list separator MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-48673 Change-Id: Id5b99c0dd778b55c937d345e49995086c5ef372e Reviewed-by: Oswald Buddenhagen Reviewed-by: Martin Smith Reviewed-by: Topi Reiniö --- qmake/doc/src/qmake-manual.qdoc | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'qmake/doc/src/qmake-manual.qdoc') 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/}. \li In a features directory residing beneath the directory provided by the - \l{QMAKESPEC} environment variable. For example: \c{$QMAKESPEC/}. + \l{QMAKESPEC} environment variable. For example: \c{$QMAKESPEC/}. \li In a features directory residing in the \c data_install/mkspecs directory. - For example: \c{data_install/mkspecs/}. + For example: \c{data_install/mkspecs/}. \li In a features directory that exists as a sibling of the directory - specified by the \c QMAKESPEC environment variable. - For example: \c{$QMAKESPEC/../}. + specified by the \c QMAKESPEC environment variable. + For example: \c{$QMAKESPEC/../}. \endlist The following features directories are searched for features files: -- cgit v1.2.3