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>

src/gui/CMakeLists.txt

@@ -573,12 +573,14 @@ qt_internal_extend_target(Gui CONDITION atspi_accessibility
         accessible/linux/dbusxml/DeviceEventController.xml
     DBUS_ADAPTOR_FLAGS
         "-i" "QtGui/private/qspi_struct_marshallers_p.h"
+        "--namespace" "QtGuiPrivate"
     DBUS_INTERFACE_SOURCES
         accessible/linux/dbusxml/Bus.xml
         accessible/linux/dbusxml/Socket.xml
         accessible/linux/dbusxml/org.freedesktop.DBus.Properties.xml
     DBUS_INTERFACE_FLAGS
         "-i" "QtGui/private/qspi_struct_marshallers_p.h"
+        "--namespace" "QtGuiPrivate"
 )
 
 if(atspi_accessibility)

src/gui/accessible/linux/atspiadaptor.cpp

@@ -45,6 +45,7 @@
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
+using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
 
 Q_STATIC_LOGGING_CATEGORY(lcAccessibilityAtspi, "qt.accessibility.atspi")
 Q_STATIC_LOGGING_CATEGORY(lcAccessibilityAtspiCreation, "qt.accessibility.atspi.creation")

src/gui/accessible/linux/dbusconnection.cpp

@@ -17,6 +17,7 @@
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
+using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
 
 /* note: do not change these to QStringLiteral;
    we are unloaded before QtDBus is done using the strings.

src/gui/accessible/linux/dbusconnection_p.h

@@ -55,8 +55,8 @@ private:
     QString getAccessibilityBusAddress() const;
 
     QDBusServiceWatcher *dbusWatcher;
-    OrgFreedesktopDBusPropertiesInterface *m_dbusProperties;
-    OrgA11yStatusInterface *m_a11yStatus;
+    QtGuiPrivate::OrgFreedesktopDBusPropertiesInterface *m_dbusProperties;
+    QtGuiPrivate::OrgA11yStatusInterface *m_a11yStatus;
     QDBusConnection m_a11yConnection;
     bool m_enabled;
 };

src/gui/accessible/linux/qspiaccessiblebridge.cpp

@@ -22,6 +22,7 @@
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
+using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
 
 /*!
     \class QSpiAccessibleBridge

src/gui/accessible/linux/qspiaccessiblebridge_p.h

@@ -21,7 +21,9 @@
 #include <qpa/qplatformaccessibility.h>
 #include <QtCore/qhash.h>
 
+namespace QtGuiPrivate {
 class DeviceEventControllerAdaptor;
+} // namespace QtGuiPrivate
 
 QT_REQUIRE_CONFIG(accessibility);
 
@@ -58,7 +60,7 @@ private:
     void updateStatus();
 
     QSpiDBusCache *cache;
-    DeviceEventControllerAdaptor *dec;
+    QtGuiPrivate::DeviceEventControllerAdaptor *dec;
     AtSpiAdaptor *dbusAdaptor;
     QAtSpiDBusConnection* dbusConnection;
     SpiRoleMapping m_spiRoleMapping;

src/gui/accessible/linux/qspidbuscache.cpp

@@ -13,6 +13,7 @@
 QT_BEGIN_NAMESPACE
 
 using namespace Qt::StringLiterals;
+using namespace QtGuiPrivate; // for D-Bus accessibility wrappers
 
 /*!
     \class QSpiDBusCache