diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-11-03 16:37:05 +0100 |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-11-03 16:37:05 +0100 |
| commit | c0a58b079d00dad484faa6249b8109a639576399 (patch) | |
| tree | d2828950d8e5664da5606783161f2a48db3ce722 /doc/src/development | |
| parent | 93ec4104781d7f9929b8b8a05dee3d94f8cd4b17 (diff) | |
| parent | c95a0e6e8eb8ba5fd2a4412b318ad998b3ccb4fc (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6
Conflicts:
src/gui/kernel/qevent.cpp
src/network/ssl/qsslerror.cpp
Diffstat (limited to 'doc/src/development')
| -rw-r--r-- | doc/src/development/qmake-manual.qdoc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/src/development/qmake-manual.qdoc b/doc/src/development/qmake-manual.qdoc index 09f1b9b55e..9548848f74 100644 --- a/doc/src/development/qmake-manual.qdoc +++ b/doc/src/development/qmake-manual.qdoc @@ -2354,6 +2354,8 @@ For example: \l{#QMAKESPEC}{qmake.conf} and rarely needs to be modified. \section1 QMAKE_LFLAGS_RPATH + + \e {This is used on Unix platforms only.} Library paths in this definition are added to the executable at link time so that the added paths will be preferentially searched at runtime. @@ -2696,11 +2698,15 @@ For example: \snippet doc/src/snippets/code/doc_src_qmake-manual.qdoc 45 \section1 QMAKE_RPATH + + \e {This is used on Unix platforms only.} Is equivalent to \l QMAKE_LFLAGS_RPATH. \section1 QMAKE_RPATHDIR + \e {This is used on Unix platforms only.} + 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. |