summaryrefslogtreecommitdiffstats
path: root/src/dbus
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-07 01:00:20 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2018-09-07 01:00:21 +0200
commit295cd87c6d4cb6c9c1222fc565031377e5f33704 (patch)
tree31296727d5fed266d5d894d57827c139cb555108 /src/dbus
parent35ebdeb83eb4057f5e50042747b13d0772051459 (diff)
parent3bac18da8ef9f5750207ddf47192b5db3137c4ac (diff)
Merge remote-tracking branch 'origin/5.11' into 5.12
Diffstat (limited to 'src/dbus')
-rw-r--r--src/dbus/doc/src/qtdbus-module.qdoc2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/dbus/doc/src/qtdbus-module.qdoc b/src/dbus/doc/src/qtdbus-module.qdoc
index 965475ab8d..0ef5999b11 100644
--- a/src/dbus/doc/src/qtdbus-module.qdoc
+++ b/src/dbus/doc/src/qtdbus-module.qdoc
@@ -51,6 +51,7 @@
\snippet code/doc_src_qtdbus.cpp 0
+ \if !defined(qtforpython)
If you're using qmake to build your application, you can add this
line to your .pro file to make it link against the Qt D-Bus
libraries:
@@ -60,6 +61,7 @@
\note The source code for this module is located in the \c{src/qdbus}
directory. When installing Qt from source, this module is built when Qt's
tools are built.
+ \endif
See the \l {Qt D-Bus}{D-Bus} page for detailed information on
how to use this module.