diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2010-05-31 13:44:57 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2010-05-31 13:44:57 (GMT) |
| commit | 54f0a5691899c4b74c71c7718e8e451bdcdbda54 (patch) | |
| tree | ef964ec39035504ebe5ee42342a7f3c5104a0e76 /src/corelib/global | |
| parent | b4710dd7ddb2a78754cbe58e55070f71456fb09c (diff) | |
| download | Qt-54f0a5691899c4b74c71c7718e8e451bdcdbda54.zip Qt-54f0a5691899c4b74c71c7718e8e451bdcdbda54.tar.gz Qt-54f0a5691899c4b74c71c7718e8e451bdcdbda54.tar.bz2 | |
Fix QT_NO_DOM
Merge-request: 2395
Reviewed-by: Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com>
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 10 | ||||
| -rw-r--r-- | src/corelib/global/qfeatures.txt | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index c66047a..a333153 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -335,11 +335,6 @@ #define QT_NO_DATESTRING #endif -// QtDBus module -#if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES)) -#define QT_NO_DBUS -#endif - // QDial #if !defined(QT_NO_DIAL) && (defined(QT_NO_SLIDER)) #define QT_NO_DIAL @@ -515,6 +510,11 @@ #define QT_NO_CONTEXTMENU #endif +// QtDBus module +#if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_DOM)) +#define QT_NO_DBUS +#endif + // File Transfer Protocol #if !defined(QT_NO_FTP) && (defined(QT_NO_URLINFO) || defined(QT_NO_TEXTDATE)) #define QT_NO_FTP diff --git a/src/corelib/global/qfeatures.txt b/src/corelib/global/qfeatures.txt index ed173b1..3e6af24 100644 --- a/src/corelib/global/qfeatures.txt +++ b/src/corelib/global/qfeatures.txt @@ -1373,7 +1373,7 @@ SeeAlso: ??? Feature: DBUS Description: Provides classes for D-Bus. Section: D-Bus -Requires: PROPERTIES +Requires: PROPERTIES DOM Name: QtDBus module SeeAlso: ??? |