summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorLeena Miettinen <riitta-leena.miettinen@digia.com>2013-08-21 13:02:06 (GMT)
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-21 14:31:02 (GMT)
commitfdfe3b6d5ff8f177d0902b6ec2ede46fcce8d731 (patch)
tree05ef24ed63635bbd0c6cb4556e39120e833f0a95 /doc/src
parentd86e651a6eb2382365295ec1b2b022b9f0a08f92 (diff)
downloadQt-fdfe3b6d5ff8f177d0902b6ec2ede46fcce8d731.zip
Qt-fdfe3b6d5ff8f177d0902b6ec2ede46fcce8d731.tar.gz
Qt-fdfe3b6d5ff8f177d0902b6ec2ede46fcce8d731.tar.bz2
Doc: Update description of qmake LIBS variable
Rewrite the note about specifying libraries on Windows to make it clearer and change the library name to match the one in the snippet. Task-number: QTBUG-30229 Change-Id: I55c5579f5ead2fadc5d75baa2172b03f20c9f689 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/development/qmake-manual.qdoc14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index ce33158..70548aa 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -1826,19 +1826,19 @@
\snippet doc/src/snippets/code/doc_src_qmake-manual.pro 38
+ \bold{Note:} On Windows, specifying libraries with the \c{-l} option
+ will cause the library with the highest version
+ number to be used. For example, \c{math2.lib} could potentially be used
+ instead of \c{math.lib}. To avoid this ambiguity, we recommend that you
+ explicitly specify the library to be used by including the \c{.lib}
+ file name suffix, as in the example above.
+
To specify a path containing spaces, quote the path using the technique
mentioned in the \l{qmake Project Files#Whitespace}{qmake Project Files}
document.
\snippet doc/src/snippets/qmake/spaces.pro quoting library paths with spaces
- \bold{Note:} On Windows, specifying libraries with the \c{-l} option,
- as in the above example, will cause the library with the highest version
- number to be used; for example, \c{libmath2.lib} could potentially be used
- instead of \c{libmathlib}. To avoid this ambiguity, we recommend that you
- explicitly specify the library to be used by including the \c{.lib}
- file name suffix.
-
\bold{Note:} On the Symbian platform, the build system makes a
distinction between shared and
static libraries. In most cases, qmake will figure out which library you