Merge branch 'stable' into dev

Conflicts:
	tests/auto/widgets/graphicsview/qgraphicsscene/tst_qgraphicsscene.cpp

Change-Id: I6b8d505fc22f052c307ca27f58f7d16f98965f47

13 files changed, 0 insertions, 51 deletions

diff --git a/src/platformsupport/linuxaccessibility/application.cpp b/src/platformsupport/linuxaccessibility/application.cpp
index 22059de864..c2049e536a 100644
--- a/src/platformsupport/linuxaccessibility/application.cpp
+++ b/src/platformsupport/linuxaccessibility/application.cpp
@@ -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
diff --git a/src/platformsupport/linuxaccessibility/application_p.h b/src/platformsupport/linuxaccessibility/application_p.h
index 4a60bbfe84..14b8a71b42 100644
--- a/src/platformsupport/linuxaccessibility/application_p.h
+++ b/src/platformsupport/linuxaccessibility/application_p.h
@@ -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
 
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
index 534cf4b73a..342b796fbe 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor.cpp
@@ -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
diff --git a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
index e6f95195fe..5b5eb60228 100644
--- a/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
+++ b/src/platformsupport/linuxaccessibility/atspiadaptor_p.h
@@ -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
 
diff --git a/src/platformsupport/linuxaccessibility/bridge.cpp b/src/platformsupport/linuxaccessibility/bridge.cpp
index bf2486fc57..f22dc4e191 100644
--- a/src/platformsupport/linuxaccessibility/bridge.cpp
+++ b/src/platformsupport/linuxaccessibility/bridge.cpp
@@ -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
diff --git a/src/platformsupport/linuxaccessibility/bridge_p.h b/src/platformsupport/linuxaccessibility/bridge_p.h
index 3865e06489..f7c243cfbb 100644
--- a/src/platformsupport/linuxaccessibility/bridge_p.h
+++ b/src/platformsupport/linuxaccessibility/bridge_p.h
@@ -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
 
diff --git a/src/platformsupport/linuxaccessibility/cache.cpp b/src/platformsupport/linuxaccessibility/cache.cpp
index 9201fc1d8b..81a54a1ce5 100644
--- a/src/platformsupport/linuxaccessibility/cache.cpp
+++ b/src/platformsupport/linuxaccessibility/cache.cpp
@@ -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
diff --git a/src/platformsupport/linuxaccessibility/cache_p.h b/src/platformsupport/linuxaccessibility/cache_p.h
index 4b606eadb1..898f06f0d6 100644
--- a/src/platformsupport/linuxaccessibility/cache_p.h
+++ b/src/platformsupport/linuxaccessibility/cache_p.h
@@ -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
 
diff --git a/src/platformsupport/linuxaccessibility/constant_mappings.cpp b/src/platformsupport/linuxaccessibility/constant_mappings.cpp
index 5138b9a163..1840868aa2 100644
--- a/src/platformsupport/linuxaccessibility/constant_mappings.cpp
+++ b/src/platformsupport/linuxaccessibility/constant_mappings.cpp
@@ -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
diff --git a/src/platformsupport/linuxaccessibility/constant_mappings_p.h b/src/platformsupport/linuxaccessibility/constant_mappings_p.h
index 870a3a4b2a..837a68516d 100644
--- a/src/platformsupport/linuxaccessibility/constant_mappings_p.h
+++ b/src/platformsupport/linuxaccessibility/constant_mappings_p.h
@@ -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 */
diff --git a/src/platformsupport/linuxaccessibility/dbusconnection.cpp b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
index a38570a465..a99e8f0a5e 100644
--- a/src/platformsupport/linuxaccessibility/dbusconnection.cpp
+++ b/src/platformsupport/linuxaccessibility/dbusconnection.cpp
@@ -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
diff --git a/src/platformsupport/linuxaccessibility/dbusconnection_p.h b/src/platformsupport/linuxaccessibility/dbusconnection_p.h
index da090da9cf..674cf28c34 100644
--- a/src/platformsupport/linuxaccessibility/dbusconnection_p.h
+++ b/src/platformsupport/linuxaccessibility/dbusconnection_p.h
@@ -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
 
diff --git a/src/platformsupport/linuxaccessibility/struct_marshallers.cpp b/src/platformsupport/linuxaccessibility/struct_marshallers.cpp
index 027993c4bd..713e26f25a 100644
--- a/src/platformsupport/linuxaccessibility/struct_marshallers.cpp
+++ b/src/platformsupport/linuxaccessibility/struct_marshallers.cpp
@@ -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