diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-29 16:37:38 +0100 |
| commit | aaff94c2df665035addb90714bab4722003894da (patch) | |
| tree | 3af76e8aa4dbf86a86b1e4d2ad2f6dda06374ee0 /src/dbus/doc/src/qtdbus-module.qdoc | |
| parent | 2302d386c7a1aa1a96658f79c236d6b8a59db7ac (diff) | |
| parent | 1196f691120d77ab3be55f21824aba645210fb8c (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
src/corelib/tools/qbytearray.cpp
src/gui/kernel/qplatformsystemtrayicon.cpp
src/gui/kernel/qplatformsystemtrayicon.h
src/plugins/platforms/xcb/xcb-plugin.pro
Change-Id: I00355d3908b678af8a61c38f9e814a63df808c79
Diffstat (limited to 'src/dbus/doc/src/qtdbus-module.qdoc')
| -rw-r--r-- | src/dbus/doc/src/qtdbus-module.qdoc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/dbus/doc/src/qtdbus-module.qdoc b/src/dbus/doc/src/qtdbus-module.qdoc index ac9cac428b..cd9365aac8 100644 --- a/src/dbus/doc/src/qtdbus-module.qdoc +++ b/src/dbus/doc/src/qtdbus-module.qdoc @@ -29,7 +29,7 @@ \module QtDBus \title Qt D-Bus C++ Classes \brief The Qt D-Bus module is a Unix-only library that you can use - to perform Inter-Process Communication using the \l{D-Bus} protocol. + to perform Inter-Process Communication using the \l{Qt D-Bus}{D-Bus} protocol. \ingroup modules \qtvariable dbus @@ -61,6 +61,6 @@ directory. When installing Qt from source, this module is built when Qt's tools are built. - See the \l {D-Bus} page for detailed information on + See the \l {Qt D-Bus}{D-Bus} page for detailed information on how to use this module. */ |