summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-28 11:07:32 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2013-01-28 11:10:29 +0100
commit02ba93dd3dc640421c79c655064f0b2c4f1465cd (patch)
tree156ccba392968d3d2ba3bcb5bb098a1ff0b7e8ce /src/corelib/global
parentbf5f2a9e3e3bf70c373b65bf95a332f4e1c514f9 (diff)
parent0b68fc019bbeedb8b6b59bbbdf31f66596b6d5ac (diff)
Merge remote-tracking branch 'origin/stable' into dev
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qfeatures.h2
-rw-r--r--src/corelib/global/qfeatures.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h
index 5ff3e2e5b7..a751f9af56 100644
--- a/src/corelib/global/qfeatures.h
+++ b/src/corelib/global/qfeatures.h
@@ -381,7 +381,7 @@
#define QT_NO_CONTEXTMENU
#endif
-// QtDBus module
+// Qt D-Bus module
#if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_DOM))
#define QT_NO_DBUS
#endif
diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt
index 25fd28c4cd..c27463897f 100644
--- a/src/corelib/global/qfeatures.txt
+++ b/src/corelib/global/qfeatures.txt
@@ -1096,6 +1096,6 @@ Feature: DBUS
Description: Provides classes for D-Bus.
Section: D-Bus
Requires: PROPERTIES DOM
-Name: QtDBus module
+Name: Qt D-Bus module
SeeAlso: ???