AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Enable module build with QT_NO_ACCESSIBILITY"

Browse Source 
This reverts commit b7f63c6bf7.
It made compilation fail in qstylehelper_p.h if QT_NO_ACCESSIBILITY
was defined - which it is by default on linux without dbus.

Change-Id: I313f5138460d28c44dad128d175df0e53a99287d
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
This commit is contained in:
aavit 2013-01-02 14:21:36 +01:00 committed by The Qt Project
parent 9cfce43f19
commit 4250fa2cf6
15 changed files with 10 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/gui/accessible/qaccessible.cpp
View File

@ -55,8 +55,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
/*!
\class QAccessible
\brief The QAccessible class provides enums and static functions
@ -439,19 +437,23 @@ QAccessible::RootObjectHandler QAccessible::rootObjectHandler = 0;
static bool accessibility_active = false;
static bool cleanupAdded = false;
#ifndef QT_NO_ACCESSIBILITY
static QPlatformAccessibility *platformAccessibility()
{
QPlatformIntegration *pfIntegration = QGuiApplicationPrivate::platformIntegration();
return pfIntegration ? pfIntegration->accessibility() : 0;
}
#endif
/*!
\internal
*/
void QAccessible::cleanup()
{
#ifndef QT_NO_ACCESSIBILITY
if (QPlatformAccessibility *pfAccessibility = platformAccessibility())
pfAccessibility->cleanup();
#endif
}
static void qAccessibleCleanup()
@ -595,8 +597,10 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object)
mo = mo->superClass();
}
#ifndef QT_NO_ACCESSIBILITY
if (object == qApp)
return new QAccessibleApplication;
#endif
return 0;
}
@ -636,8 +640,10 @@ void QAccessible::setRootObject(QObject *object)
return;
}
#ifndef QT_NO_ACCESSIBILITY
if (QPlatformAccessibility *pfAccessibility = platformAccessibility())
pfAccessibility->setRootObject(object);
#endif
}
/*!
@ -669,8 +675,10 @@ void QAccessible::updateAccessibility(QAccessibleEvent *event)
if (!isActive())
return;
#ifndef QT_NO_ACCESSIBILITY
if (QPlatformAccessibility *pfAccessibility = platformAccessibility())
pfAccessibility->notifyAccessibilityUpdate(event);
#endif
}
#if QT_DEPRECATED_SINCE(5, 0)
@ -1524,7 +1532,5 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev)
#endif
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE

3
src/gui/accessible/qaccessible.h
View File

@ -57,7 +57,6 @@ QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
class QAccessibleInterface;
class QAccessibleEvent;
@ -677,8 +676,6 @@ inline void QAccessible::updateAccessibility(QObject *object, int child, Event r
}
#endif
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE
QT_END_HEADER

4
src/platformsupport/linuxaccessibility/application.cpp
View File

@ -52,8 +52,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
/*!
\class QSpiApplicationAdaptor
\internal
@ -219,6 +217,4 @@ void QSpiApplicationAdaptor::notifyKeyboardListenerError(const QDBusError& error
}
}
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE

4
src/platformsupport/linuxaccessibility/application_p.h
View File

@ -49,8 +49,6 @@
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
/*
* Used for the root object.
*
@ -82,8 +80,6 @@ private:
QDBusConnection dbusConnection;
};
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE
QT_END_HEADER

4
src/platformsupport/linuxaccessibility/atspiadaptor.cpp
View File

@ -65,8 +65,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
static bool isDebugging = false;
#define qAtspiDebug if (!::isDebugging); else qDebug
@ -2359,6 +2357,4 @@ bool AtSpiAdaptor::tableInterface(const QAIPointer &interface, const QString &fu
return true;
}
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE

4
src/platformsupport/linuxaccessibility/atspiadaptor_p.h
View File

@ -56,8 +56,6 @@
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
class QAccessibleInterface;
class QSpiAccessibleInterface;
class QSpiApplicationAdaptor;
@ -218,8 +216,6 @@ private:
uint sendWindow_unshade : 1;
};
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE
QT_END_HEADER

4
src/platformsupport/linuxaccessibility/bridge.cpp
View File

@ -56,8 +56,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
/*!
\class QSpiAccessibleBridge
\internal
@ -184,6 +182,4 @@ void QSpiAccessibleBridge::initializeConstantMappings()
qSpiRoleMapping.insert(map[i].role, RoleNames(map[i].spiRole, QLatin1String(map[i].name), tr(map[i].name)));
}
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE

4
src/platformsupport/linuxaccessibility/bridge_p.h
View File

@ -51,8 +51,6 @@ class DeviceEventControllerAdaptor;
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
class DBusConnection;
class QSpiDBusCache;
class AtSpiAdaptor;
@ -81,8 +79,6 @@ private:
bool initialized;
};
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE
QT_END_HEADER

4
src/platformsupport/linuxaccessibility/cache.cpp
View File

@ -49,8 +49,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
/*!
\class QSpiDBusCache
\internal
@ -91,6 +89,4 @@ QSpiAccessibleCacheArray QSpiDBusCache::GetItems()
return cacheArray;
}
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE

4
src/platformsupport/linuxaccessibility/cache_p.h
View File

@ -49,8 +49,6 @@
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
class QSpiDBusCache : public QObject
{
Q_OBJECT
@ -68,8 +66,6 @@ public Q_SLOTS:
QSpiAccessibleCacheArray GetItems();
};
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE
QT_END_HEADER

4
src/platformsupport/linuxaccessibility/constant_mappings.cpp
View File

@ -55,8 +55,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
QHash <QAccessible::Role, RoleNames> qSpiRoleMapping;
quint64 spiStatesFromQState(QAccessible::State state)
@ -156,6 +154,4 @@ AtspiRelationType qAccessibleRelationToAtSpiRelation(QAccessible::Relation relat
return ATSPI_RELATION_NULL;
}
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE

3
src/platformsupport/linuxaccessibility/constant_mappings_p.h
View File

@ -53,7 +53,6 @@
#include <QtGui/QAccessible>
#include <atspi/atspi-constants.h>
#ifndef QT_NO_ACCESSIBILITY
// interface names from at-spi2-core/atspi/atspi-misc-private.h
#define ATSPI_DBUS_NAME_REGISTRY "org.a11y.atspi.Registry"
@ -136,6 +135,4 @@ AtspiRelationType qAccessibleRelationToAtSpiRelation(QAccessible::Relation relat
QT_END_NAMESPACE
QT_END_HEADER
#endif // QT_NO_ACCESSIBILITY
#endif /* Q_SPI_CONSTANT_MAPPINGS_H */

4
src/platformsupport/linuxaccessibility/dbusconnection.cpp
View File

@ -48,8 +48,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
/*!
\class DBusConnection
\internal
@ -106,6 +104,4 @@ QDBusConnection DBusConnection::connection() const
return dbusConnection;
}
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE

4
src/platformsupport/linuxaccessibility/dbusconnection_p.h
View File

@ -49,8 +49,6 @@
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
class DBusConnection
{
public:
@ -64,8 +62,6 @@ private:
QDBusConnection dbusConnection;
};
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE
QT_END_HEADER

4
src/platformsupport/linuxaccessibility/struct_marshallers.cpp
View File

@ -50,8 +50,6 @@
QT_BEGIN_NAMESPACE
#ifndef QT_NO_ACCESSIBILITY
QSpiObjectReference::QSpiObjectReference()
: path(QDBusObjectPath(ATSPI_DBUS_PATH_NULL))
{}
@ -236,6 +234,4 @@ void qSpiInitializeStructTypes()
qDBusRegisterMetaType<QSpiRelationArray>();
}
#endif // QT_NO_ACCESSIBILITY
QT_END_NAMESPACE