A11Y: Wrap generated D-Bus proxies into a custom namespace
Commit 351b7a31aa24a704dba09121d91cb34190892315 added a new feature of wrapping the generated D-Bus proxies into custom namespaces. Use this feature to avoid potential clashes with the proxies generated by other modules (see QTBUG-133553 as an example). Amends 38251c36edf11316a2467169b1d491bf13520fd3, but keeping it only in dev because it depends on the new feature of qdbusxml2cpp. Task-number: QTBUG-134305 Change-Id: I585cdda3f002ef7fa6dd3a76a3b4f2c9c68d2297 Reviewed-by: Matthias Rauter <matthias.rauter@qt.io> Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
parent
aa87214864
commit
c877930dce
@ -573,12 +573,14 @@ qt_internal_extend_target(Gui CONDITION atspi_accessibility
|
|||||||
accessible/linux/dbusxml/DeviceEventController.xml
|
accessible/linux/dbusxml/DeviceEventController.xml
|
||||||
DBUS_ADAPTOR_FLAGS
|
DBUS_ADAPTOR_FLAGS
|
||||||
"-i" "QtGui/private/qspi_struct_marshallers_p.h"
|
"-i" "QtGui/private/qspi_struct_marshallers_p.h"
|
||||||
|
"--namespace" "QtGuiPrivate"
|
||||||
DBUS_INTERFACE_SOURCES
|
DBUS_INTERFACE_SOURCES
|
||||||
accessible/linux/dbusxml/Bus.xml
|
accessible/linux/dbusxml/Bus.xml
|
||||||
accessible/linux/dbusxml/Socket.xml
|
accessible/linux/dbusxml/Socket.xml
|
||||||
accessible/linux/dbusxml/org.freedesktop.DBus.Properties.xml
|
accessible/linux/dbusxml/org.freedesktop.DBus.Properties.xml
|
||||||
DBUS_INTERFACE_FLAGS
|
DBUS_INTERFACE_FLAGS
|
||||||
"-i" "QtGui/private/qspi_struct_marshallers_p.h"
|
"-i" "QtGui/private/qspi_struct_marshallers_p.h"
|
||||||
|
"--namespace" "QtGuiPrivate"
|
||||||
)
|
)
|
||||||
|
|
||||||
if(atspi_accessibility)
|
if(atspi_accessibility)
|
||||||
|
@ -45,6 +45,7 @@
|
|||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
using namespace Qt::StringLiterals;
|
using namespace Qt::StringLiterals;
|
||||||
|
using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
|
||||||
|
|
||||||
Q_STATIC_LOGGING_CATEGORY(lcAccessibilityAtspi, "qt.accessibility.atspi")
|
Q_STATIC_LOGGING_CATEGORY(lcAccessibilityAtspi, "qt.accessibility.atspi")
|
||||||
Q_STATIC_LOGGING_CATEGORY(lcAccessibilityAtspiCreation, "qt.accessibility.atspi.creation")
|
Q_STATIC_LOGGING_CATEGORY(lcAccessibilityAtspiCreation, "qt.accessibility.atspi.creation")
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
using namespace Qt::StringLiterals;
|
using namespace Qt::StringLiterals;
|
||||||
|
using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
|
||||||
|
|
||||||
/* note: do not change these to QStringLiteral;
|
/* note: do not change these to QStringLiteral;
|
||||||
we are unloaded before QtDBus is done using the strings.
|
we are unloaded before QtDBus is done using the strings.
|
||||||
|
@ -55,8 +55,8 @@ private:
|
|||||||
QString getAccessibilityBusAddress() const;
|
QString getAccessibilityBusAddress() const;
|
||||||
|
|
||||||
QDBusServiceWatcher *dbusWatcher;
|
QDBusServiceWatcher *dbusWatcher;
|
||||||
OrgFreedesktopDBusPropertiesInterface *m_dbusProperties;
|
QtGuiPrivate::OrgFreedesktopDBusPropertiesInterface *m_dbusProperties;
|
||||||
OrgA11yStatusInterface *m_a11yStatus;
|
QtGuiPrivate::OrgA11yStatusInterface *m_a11yStatus;
|
||||||
QDBusConnection m_a11yConnection;
|
QDBusConnection m_a11yConnection;
|
||||||
bool m_enabled;
|
bool m_enabled;
|
||||||
};
|
};
|
||||||
|
@ -22,6 +22,7 @@
|
|||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
using namespace Qt::StringLiterals;
|
using namespace Qt::StringLiterals;
|
||||||
|
using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class QSpiAccessibleBridge
|
\class QSpiAccessibleBridge
|
||||||
|
@ -21,7 +21,9 @@
|
|||||||
#include <qpa/qplatformaccessibility.h>
|
#include <qpa/qplatformaccessibility.h>
|
||||||
#include <QtCore/qhash.h>
|
#include <QtCore/qhash.h>
|
||||||
|
|
||||||
|
namespace QtGuiPrivate {
|
||||||
class DeviceEventControllerAdaptor;
|
class DeviceEventControllerAdaptor;
|
||||||
|
} // namespace QtGuiPrivate
|
||||||
|
|
||||||
QT_REQUIRE_CONFIG(accessibility);
|
QT_REQUIRE_CONFIG(accessibility);
|
||||||
|
|
||||||
@ -58,7 +60,7 @@ private:
|
|||||||
void updateStatus();
|
void updateStatus();
|
||||||
|
|
||||||
QSpiDBusCache *cache;
|
QSpiDBusCache *cache;
|
||||||
DeviceEventControllerAdaptor *dec;
|
QtGuiPrivate::DeviceEventControllerAdaptor *dec;
|
||||||
AtSpiAdaptor *dbusAdaptor;
|
AtSpiAdaptor *dbusAdaptor;
|
||||||
QAtSpiDBusConnection* dbusConnection;
|
QAtSpiDBusConnection* dbusConnection;
|
||||||
SpiRoleMapping m_spiRoleMapping;
|
SpiRoleMapping m_spiRoleMapping;
|
||||||
|
@ -13,6 +13,7 @@
|
|||||||
QT_BEGIN_NAMESPACE
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
using namespace Qt::StringLiterals;
|
using namespace Qt::StringLiterals;
|
||||||
|
using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class QSpiDBusCache
|
\class QSpiDBusCache
|
||||||
|
Loading…
x
Reference in New Issue
Block a user