summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/code/doc_src_emb-pointer.qdoc
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-21 11:33:06 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-21 11:33:06 (GMT)
commite2173fcede540c2042e240942b8ba8221ff613e3 (patch)
tree0f985f91c4a4f48002ec38f1761ce67ba47e9681 /doc/src/snippets/code/doc_src_emb-pointer.qdoc
parent3fdfbe1731c4e6a072a905bf341b7fab17cc27d3 (diff)
parent1e4d824462b44315944a27ec328f7e400a67c96c (diff)
downloadQt-e2173fcede540c2042e240942b8ba8221ff613e3.zip
Qt-e2173fcede540c2042e240942b8ba8221ff613e3.tar.gz
Qt-e2173fcede540c2042e240942b8ba8221ff613e3.tar.bz2
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (819 commits) Fix tst_QTableWidget::task219380_removeLastRow Make sure #ifdef'd tests still have main() function Long live QRawFont! QtDBus: Add unit tests for QDBusAbstractAdaptor QtDBus: Add unit tests for QDBusInterface QtDBus: Add unit tests for QDBusAbstractInterface QtDBus: Register QDBusServer connection name in QDBusConnectionManager QtDBus: Skip bus name check for peer-to-peer connection QtDBus: Fix minor coding style issues QtDBus: Add default constructor to QDBusServer QtDBus: Add unit tests for peer-to-peer connection QtDBus: Add method QDBusConnection::disconnectFromPeer() QtDBus: Add method QDBusConnection::connectToPeer() QtDBus: Fix QDBusConnection::disconnectFromBus() for peer-to-peer connections QtDBus: Fix bus in peer-to-peer connections should not be used QtDBus: Fix empty service name in peer-to-peer connections QtDBus: Fix registering objects using path '/' in peer-to-peer connections QtDBus: Fix QDBusServer to handle correctly new dbus connections QtDBus: Cleaning comments, spacing, etc. Use s/static/Q_GLOBAL_STATIC/g in QScroller ...
Diffstat (limited to 'doc/src/snippets/code/doc_src_emb-pointer.qdoc')
-rw-r--r--doc/src/snippets/code/doc_src_emb-pointer.qdoc10
1 files changed, 0 insertions, 10 deletions
diff --git a/doc/src/snippets/code/doc_src_emb-pointer.qdoc b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
index 4ec1335..1fb6d8f 100644
--- a/doc/src/snippets/code/doc_src_emb-pointer.qdoc
+++ b/doc/src/snippets/code/doc_src_emb-pointer.qdoc
@@ -75,14 +75,6 @@ export QWS_MOUSE_PROTO="Vr41xx:press=500:/dev/misc/ts"
//! [6]
-//! [7]
-....
-QMAKE_CFLAGS += -I<path to tslib headers>
-QMAKE_LFLAGS += -L<path to tslib library> -Wl,-rpath-link=<path to tslib library>
-....
-//! [7]
-
-
//! [8]
module_raw input
module linear
@@ -111,5 +103,3 @@ ls -l /dev/input/mouse0
//! [12]
chmod a+rw /dev/input/mouse0
//! [12]
-
-