summaryrefslogtreecommitdiffstats
path: root/doc/src
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2010-03-03 14:58:02 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2010-03-03 15:12:05 (GMT)
commit5b97c515ea574c1ac23c8595af34de406db2536d (patch)
tree56597f7bdcd280b2c8b73f6c8e09e9900d2b0f1f /doc/src
parent515f6a8c3dbe382bbb4f84f758a61c719143d8a6 (diff)
downloadQt-5b97c515ea574c1ac23c8595af34de406db2536d.zip
Qt-5b97c515ea574c1ac23c8595af34de406db2536d.tar.gz
Qt-5b97c515ea574c1ac23c8595af34de406db2536d.tar.bz2
Updating documentation for how to build QWS with tslib
Reviewed-by: David Boddie <dboddie@trolltech.com>
Diffstat (limited to 'doc/src')
-rw-r--r--doc/src/platforms/emb-pointer.qdoc6
-rw-r--r--doc/src/snippets/code/doc_src_emb-pointer.qdoc5
2 files changed, 7 insertions, 4 deletions
diff --git a/doc/src/platforms/emb-pointer.qdoc b/doc/src/platforms/emb-pointer.qdoc
index 34510da..3c37b63 100644
--- a/doc/src/platforms/emb-pointer.qdoc
+++ b/doc/src/platforms/emb-pointer.qdoc
@@ -154,9 +154,9 @@
in the build environment.
The tslib sources can be downloaded from \l
- http://tslib.berlios.de. Use the \c configure script's -L and
- -I options to explicitly specify the location of the library and
- its headers:
+ http://tslib.berlios.de. Specify the location of the library and
+ its headers using -L and -I options in the \c qmake.conf file in
+ your \c mkspec. Also it can be helpful to add a -rpath-link:
\snippet doc/src/snippets/code/doc_src_emb-pointer.qdoc 7
diff --git a/doc/src/snippets/code/doc_src_emb-pointer.qdoc b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
index 9661ae5..0d66e18 100644
--- a/doc/src/snippets/code/doc_src_emb-pointer.qdoc
+++ b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
@@ -77,7 +77,10 @@ export QWS_MOUSE_PROTO="Vr41xx:press=500:/dev/misc/ts"
//! [7]
-./configure -L <path to tslib library> -I <path to tslib headers>
+....
+QMAKE_CFLAGS += -I<path to tslib headers>
+QMAKE_LFLAGS += -L<path to tslib library> -Wl,-rpath-link=<path to tslib library>
+....
//! [7]