summaryrefslogtreecommitdiffstats
path: root/doc/src/development/qmake-manual.qdoc
diff options
context:
space:
mode:
authorAlan Alpert <alan.alpert@nokia.com>2009-10-29 05:35:30 (GMT)
committerAlan Alpert <alan.alpert@nokia.com>2009-10-29 05:35:30 (GMT)
commitfbf4dc0f22177375d4591e76cf1c243c3cf985e2 (patch)
tree54fa0880f7ccbe6c07ee45c06c92f8f92c2c8b87 /doc/src/development/qmake-manual.qdoc
parent6c3b7fb91fe512479f7321eb4d3f577cb8bbd1a7 (diff)
parente532322a7bb58f6b2527fa42063b5bccde318105 (diff)
downloadQt-fbf4dc0f22177375d4591e76cf1c243c3cf985e2.zip
Qt-fbf4dc0f22177375d4591e76cf1c243c3cf985e2.tar.gz
Qt-fbf4dc0f22177375d4591e76cf1c243c3cf985e2.tar.bz2
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Diffstat (limited to 'doc/src/development/qmake-manual.qdoc')
-rw-r--r--doc/src/development/qmake-manual.qdoc15
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc
index d040d3d..6c53242 100644
--- a/doc/src/development/qmake-manual.qdoc
+++ b/doc/src/development/qmake-manual.qdoc
@@ -2341,6 +2341,11 @@ For example:
of this variable is typically handled by \c qmake or
\l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified.
+ \section1 QMAKE_LFLAGS_RPATH
+
+ Library paths in this definition are added to the executable at link
+ time so that the added paths will be preferentially searched at runtime.
+
\section1 QMAKE_LFLAGS_QT_DLL
This variable contains link flags when building programs that
@@ -2667,6 +2672,16 @@ For example:
\snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 45
+ \section1 QMAKE_RPATH
+
+ Is equivalent to \l QMAKE_LFLAGS_RPATH.
+
+ \section1 QMAKE_RPATHDIR
+
+ A list of library directory paths, these paths are added to the
+ executable at link time so that the paths will be preferentially
+ searched at runtime.
+
\section1 QMAKE_RUN_CC
This variable specifies the individual rule needed to build an object.