diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-05-31 15:04:02 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-05-31 15:04:02 (GMT) |
| commit | 1537036175c0cfedf013e5b47a801a4dc6983a00 (patch) | |
| tree | f1c47e6d48240caf379db3d3ac07430662f24574 /src/corelib/global/qfeatures.h | |
| parent | bd786961b0d65bdd1adb31eca0a050a4b9a1f39a (diff) | |
| parent | 55d344acb767226bdf5e1629a44fd7d9a22e4906 (diff) | |
| download | Qt-1537036175c0cfedf013e5b47a801a4dc6983a00.zip Qt-1537036175c0cfedf013e5b47a801a4dc6983a00.tar.gz Qt-1537036175c0cfedf013e5b47a801a4dc6983a00.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/corelib/global/qfeatures.h')
| -rw-r--r-- | src/corelib/global/qfeatures.h | 10 |
1 files changed, 5 insertions, 5 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 |