5 files changed, 27 insertions, 5 deletions
diff --git a/src/gui/configure.json b/src/gui/configure.json
index 7c4ea48f2e..39216ae2b9 100644
--- a/src/gui/configure.json
+++ b/src/gui/configure.json
@@ -53,6 +53,12 @@
     },
 
     "libraries": {
+        "atspi": {
+            "label": "atspi",
+            "sources": [
+                { "type": "pkgConfig", "args": "atspi-2" }
+            ]
+        },
         "bcm_host": {
             "export": "",
             "sources": [
@@ -445,7 +451,7 @@
     "features": {
         "accessibility-atspi-bridge": {
             "label": "ATSPI Bridge",
-            "condition": "features.accessibility && features.xcb && features.dbus",
+            "condition": "features.accessibility && features.xcb && features.dbus && config.atspi",
             "output": [ "privateFeature", "feature" ]
         },
         "angle": {
@@ -1181,7 +1187,6 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla
                 "linuxfb", "vnc", "mirclient",
                 {
                     "type": "feature",
-                    "message": "INTEGRITY framebuffer",
                     "condition": "config.integrity",
                     "args": "integrityfb"
                 },
diff --git a/src/gui/image/qimagereader.cpp b/src/gui/image/qimagereader.cpp
index cd7c95b166..7a5a630495 100644
--- a/src/gui/image/qimagereader.cpp
+++ b/src/gui/image/qimagereader.cpp
@@ -1119,7 +1119,7 @@ QList<QByteArray> QImageReader::supportedSubTypes() const
     if (!d->initHandler())
         return QList<QByteArray>();
 
-    if (!d->handler->supportsOption(QImageIOHandler::SupportedSubTypes))
+    if (d->handler->supportsOption(QImageIOHandler::SupportedSubTypes))
         return d->handler->option(QImageIOHandler::SupportedSubTypes).value< QList<QByteArray> >();
     return QList<QByteArray>();
 }
diff --git a/src/gui/kernel/qclipboard.cpp b/src/gui/kernel/qclipboard.cpp
index 399216d27c..771f0fe93d 100644
--- a/src/gui/kernel/qclipboard.cpp
+++ b/src/gui/kernel/qclipboard.cpp
@@ -137,6 +137,17 @@ QT_BEGIN_NAMESPACE
 
     \endlist
 
+    \section1 Notes for Universal Windows Platform Users
+
+    \list
+
+    \li The Universal Windows Platform only allows to query the
+    clipboard in case the application is active and an application
+    window has focus. Accessing the clipboard data when in background
+    will fail due to access denial.
+
+    \endlist
+
     \sa QGuiApplication
 */
 
diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp
index b15ea78f7a..6d9f0b0417 100644
--- a/src/gui/kernel/qkeysequence.cpp
+++ b/src/gui/kernel/qkeysequence.cpp
@@ -1158,7 +1158,7 @@ int QKeySequencePrivate::decodeString(const QString &str, QKeySequence::Sequence
         lastI = i + 1;
     }
 
-    int p = accel.lastIndexOf(QLatin1Char('+'), str.length() - 2); // -2 so that Ctrl++ works
+    int p = accel.lastIndexOf(QLatin1Char('+'), accel.length() - 2); // -2 so that Ctrl++ works
     QStringRef accelRef(&accel);
     if(p > 0)
         accelRef = accelRef.mid(p + 1);
diff --git a/src/gui/painting/qplatformbackingstore.cpp b/src/gui/painting/qplatformbackingstore.cpp
index e006fad437..336cb88444 100644
--- a/src/gui/painting/qplatformbackingstore.cpp
+++ b/src/gui/painting/qplatformbackingstore.cpp
@@ -254,6 +254,11 @@ static inline QRect deviceRect(const QRect &rect, QWindow *window)
     return deviceRect;
 }
 
+static inline QPoint deviceOffset(const QPoint &pt, QWindow *window)
+{
+    return pt * window->devicePixelRatio();
+}
+
 static QRegion deviceRegion(const QRegion &region, QWindow *window, const QPoint &offset)
 {
     if (offset.isNull() && window->devicePixelRatio() <= 1)
@@ -348,6 +353,7 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &regi
     d_ptr->blitter->bind();
 
     const QRect deviceWindowRect = deviceRect(QRect(QPoint(), window->size()), window);
+    const QPoint deviceWindowOffset = deviceOffset(offset, window);
 
     bool canUseSrgb = false;
     // If there are any sRGB textures in the list, check if the destination
@@ -422,7 +428,7 @@ void QPlatformBackingStore::composeAndFlush(QWindow *window, const QRegion &regi
             d_ptr->blitter->setRedBlueSwizzle(true);
         // The backingstore is for the entire tlw.
         // In case of native children offset tells the position relative to the tlw.
-        const QRect srcRect = toBottomLeftRect(deviceWindowRect.translated(offset), d_ptr->textureSize.height());
+        const QRect srcRect = toBottomLeftRect(deviceWindowRect.translated(deviceWindowOffset), d_ptr->textureSize.height());
         const QMatrix3x3 source = QOpenGLTextureBlitter::sourceTransform(srcRect,
                                                                          d_ptr->textureSize,
                                                                          origin);