summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2014-02-06 18:29:44 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-04-03 08:06:41 +0200
commit41d637d2ca22524b8d839e16e7e91c89b72c91e5 (patch)
treef48bd1d0eb90c11fba05c34d444839a147bdf000
parent4c987bf3c20209c69a34798f9a73b68f41b5e718 (diff)
downloadqtdoc-41d637d2ca22524b8d839e16e7e91c89b72c91e5.tar.gz
Doc: update the section about D-Bus on Mac
Task-number: QTBUG-6429 Change-Id: I195364abc56c82c65656b4ac5c809100f853b907 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
-rw-r--r--doc/src/platforms/macosx.qdoc21
1 files changed, 14 insertions, 7 deletions
diff --git a/doc/src/platforms/macosx.qdoc b/doc/src/platforms/macosx.qdoc
index fcd3f63a..ce9f478e 100644
--- a/doc/src/platforms/macosx.qdoc
+++ b/doc/src/platforms/macosx.qdoc
@@ -625,13 +625,20 @@
re-link Qt using -single_module. This is only a problem when building the
MySQL driver into Qt. It does not affect plugins or static builds.
- \section2 D-Bus
-
- Mac OS X does not ship with a D-Bus daemon, because the operating system has
- its own IPC mechanisms; therefore. Qt binary packages don't usually include
- the \l{Qt D-Bus} module. However, you can install D-Bus via Homebrew, Fink,
- or MacPorts. These will be detected when you configure Qt again and the Qt
- D-Bus module will be built.
+ \section2 D-Bus and Mac OS X
+
+ The QtDBus module defaults to dynamically loading the libdbus-1 library on
+ Mac OS X. That means applications linking against the QtDBus module will
+ load even on Mac OS X systems that do not have the libraries, but they
+ will fail to connect to any D-Bus server and they will fail to open a
+ server using QDBusServer.
+
+ To use D-Bus functionality, you need to install the libdbus-1 library, for
+ example through Homebrew, Fink or MacPorts. You may want to include those
+ libraries in your application's bundle if you're deploying to other
+ systems. Additionally, note that there is no system bus on Mac OS X and
+ that the session bus will only be started after launchd is configured to
+ manage it.
\section2 Menu Actions