summaryrefslogtreecommitdiffstats
path: root/doc/src/frameworks-technologies/ipc.qdoc
diff options
context:
space:
mode:
authorPaul Olav Tvete <paul.tvete@nokia.com>2010-08-19 10:04:39 (GMT)
committerPaul Olav Tvete <paul.tvete@nokia.com>2010-08-19 10:04:39 (GMT)
commita226143eeda6771efc4f0df6955351336735cb60 (patch)
treea279f87d74f5929e36fe6a3aa5e4f4d843b32458 /doc/src/frameworks-technologies/ipc.qdoc
parentc02ad51733d0a2885ddb39cb7e3b09355ab97213 (diff)
parentffbce9839f8be5c2f21cc66b617dbeb0a47af269 (diff)
downloadQt-a226143eeda6771efc4f0df6955351336735cb60.zip
Qt-a226143eeda6771efc4f0df6955351336735cb60.tar.gz
Qt-a226143eeda6771efc4f0df6955351336735cb60.tar.bz2
Merge remote branch 'qt/master' into lighthouse-master
Diffstat (limited to 'doc/src/frameworks-technologies/ipc.qdoc')
-rw-r--r--doc/src/frameworks-technologies/ipc.qdoc13
1 files changed, 6 insertions, 7 deletions
diff --git a/doc/src/frameworks-technologies/ipc.qdoc b/doc/src/frameworks-technologies/ipc.qdoc
index 23234ae..26a8cec 100644
--- a/doc/src/frameworks-technologies/ipc.qdoc
+++ b/doc/src/frameworks-technologies/ipc.qdoc
@@ -56,13 +56,12 @@
\section1 D-Bus
- The \l{QtDBus} module is a Unix-only library
- you can use to implement IPC using the D-Bus protocol. It extends
- Qt's \l{signalsandslots.html} {Signals and Slots} mechanism to the
- IPC level, allowing a signal emitted by one process to be
- connected to a slot in another process. This \l {Introduction to
- D-Bus} page has detailed information on how to use the \l{QtDBus}
- module.
+ The \l{QtDBus} module is a Unix-only library you can use to
+ implement IPC using the D-Bus protocol. It extends Qt's
+ \l{signalsandslots.html} {Signals and Slots} mechanism to the IPC
+ level, allowing a signal emitted by one process to be connected to
+ a slot in another process. This \l {D-Bus} page has detailed
+ information on how to use the \l{QtDBus} module.
\section1 Qt COmmunications Protocol (QCOP)