Make qtbase compile with QT_NO_XMLSTREAMREADER

D-Bus depends on QXmlStreamReader instead of QDom

Change-Id: Ic435970af21ac6e45c4100359ff54bd5793ccce2
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
bb10
Tasuku Suzuki 2013-04-14 00:05:34 +09:00 committed by The Qt Project
parent bd4f92969a
commit c492b2bffa
2 changed files with 6 additions and 6 deletions

View File

@ -391,11 +391,6 @@
#define QT_NO_CONTEXTMENU
#endif
// Qt D-Bus module
#if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_DOM))
#define QT_NO_DBUS
#endif
// QPrinter
#if !defined(QT_NO_PRINTER) && (defined(QT_NO_PICTURE) || defined(QT_NO_TEMPORARYFILE))
#define QT_NO_PRINTER
@ -451,6 +446,11 @@
#define QT_NO_BEARERMANAGEMENT
#endif
// Qt D-Bus module
#if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_XMLSTREAMREADER))
#define QT_NO_DBUS
#endif
// QGraphicsView
#if !defined(QT_NO_GRAPHICSVIEW) && (defined(QT_NO_SCROLLAREA))
#define QT_NO_GRAPHICSVIEW

View File

@ -1102,7 +1102,7 @@ SeeAlso: ???
Feature: DBUS
Description: Provides classes for D-Bus.
Section: D-Bus
Requires: PROPERTIES DOM
Requires: PROPERTIES XMLSTREAMREADER
Name: Qt D-Bus module
SeeAlso: ???