Merge branch 'stable' into dev

Conflicts:
	examples/widgets/painting/shared/shared.pri
	src/corelib/tools/qharfbuzz_p.h
	src/corelib/tools/qunicodetools.cpp
	src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
	src/plugins/platforms/windows/qwindowsfontdatabase.cpp

Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3

5 files changed, 23 insertions, 10 deletions

diff --git a/src/gui/accessible/qaccessible.cpp b/src/gui/accessible/qaccessible.cpp
index 28a3afbbf0..a32f771bd0 100644
--- a/src/gui/accessible/qaccessible.cpp
+++ b/src/gui/accessible/qaccessible.cpp
@@ -56,6 +56,8 @@
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_ACCESSIBILITY
+
 /*!
     \class QAccessible
     \brief The QAccessible class provides enums and static functions
@@ -440,23 +442,19 @@ 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()
@@ -617,10 +615,8 @@ QAccessibleInterface *QAccessible::queryAccessibleInterface(QObject *object)
         mo = mo->superClass();
     }
 
-#ifndef QT_NO_ACCESSIBILITY
     if (object == qApp)
         return new QAccessibleApplication;
-#endif
 
     return 0;
 }
@@ -660,10 +656,8 @@ void QAccessible::setRootObject(QObject *object)
         return;
     }
 
-#ifndef QT_NO_ACCESSIBILITY
     if (QPlatformAccessibility *pfAccessibility = platformAccessibility())
         pfAccessibility->setRootObject(object);
-#endif
 }
 
 /*!
@@ -695,10 +689,8 @@ 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)
@@ -1552,5 +1544,7 @@ QDebug operator<<(QDebug d, const QAccessibleEvent &ev)
 
 #endif
 
+#endif // QT_NO_ACCESSIBILITY
+
 QT_END_NAMESPACE
 
diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h
index 5f61634ba2..5bcf9e7d0d 100644
--- a/src/gui/accessible/qaccessible.h
+++ b/src/gui/accessible/qaccessible.h
@@ -57,6 +57,7 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
+#ifndef QT_NO_ACCESSIBILITY
 
 class QAccessibleInterface;
 class QAccessibleEvent;
@@ -676,6 +677,8 @@ inline void QAccessible::updateAccessibility(QObject *object, int child, Event r
 }
 #endif
 
+#endif // QT_NO_ACCESSIBILITY
+
 QT_END_NAMESPACE
 
 QT_END_HEADER
diff --git a/src/gui/accessible/qaccessible2.cpp b/src/gui/accessible/qaccessible2.cpp
index 7f871f9c5a..f21c74e74f 100644
--- a/src/gui/accessible/qaccessible2.cpp
+++ b/src/gui/accessible/qaccessible2.cpp
@@ -439,6 +439,19 @@ QString QAccessibleTextInterface::textAtOffset(int offset, QAccessible2::Boundar
 */
 
 /*!
+    \fn QVariant QAccessibleValueInterface::minimumStepSize() const
+
+    Returns the minimum step size for the accessible.
+    This is the smalles increment that makes sense when changing the value.
+    When programatically changing the value it should always be a multiple
+    of the minimum step size.
+
+    Some tools use this value even when the setCurrentValue does not
+    perform any action. Progress bars for example are read-only but
+    should return their range divided by 100.
+*/
+
+/*!
     \class QAccessibleImageInterface
     \inmodule QtGui
     \ingroup accessibility
diff --git a/src/gui/accessible/qaccessible2.h b/src/gui/accessible/qaccessible2.h
index 6006e7846c..04c9091a79 100644
--- a/src/gui/accessible/qaccessible2.h
+++ b/src/gui/accessible/qaccessible2.h
@@ -117,6 +117,7 @@ public:
     virtual void setCurrentValue(const QVariant &value) = 0;
     virtual QVariant maximumValue() const = 0;
     virtual QVariant minimumValue() const = 0;
+    virtual QVariant minimumStepSize() const = 0;
 };
 
 class Q_GUI_EXPORT QAccessibleTableCellInterface
diff --git a/src/gui/accessible/qaccessibleobject.cpp b/src/gui/accessible/qaccessibleobject.cpp
index bc108980cf..2bd5a00afb 100644
--- a/src/gui/accessible/qaccessibleobject.cpp
+++ b/src/gui/accessible/qaccessibleobject.cpp
@@ -165,6 +165,8 @@ QAccessibleInterface *QAccessibleObject::childAt(int x, int y) const
         Q_ASSERT(childIface);
         if (childIface->rect().contains(x,y)) {
             return childIface;
+        } else {
+            delete childIface;
         }
     }
     return 0;