diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-29 10:17:53 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-29 11:33:35 +0100 |
| commit | 3eb588078e7f4d62053584a70f7600b19ec99a0f (patch) | |
| tree | 432c6bfcabf44b8fdbc4a8e1ab58054e548a77bf /src/corelib/global | |
| parent | 7b8ab4204417844e72bb66696227a422f4ef3e2d (diff) | |
| parent | 02ba93dd3dc640421c79c655064f0b2c4f1465cd (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 2 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 2 |
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: ??? |