Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/sql/drivers/sqlite/qsql_sqlite.cpp

Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd

34 files changed, 254 insertions, 71 deletions

diff --git a/src/plugins/platforms/android/src/androidplatformplugin.cpp b/src/plugins/platforms/android/src/androidplatformplugin.cpp
index 79e23c2d32..2cf5aa1e01 100644
--- a/src/plugins/platforms/android/src/androidplatformplugin.cpp
+++ b/src/plugins/platforms/android/src/androidplatformplugin.cpp
@@ -56,7 +56,7 @@ public:
 QPlatformIntegration *QAndroidPlatformIntegrationPlugin::create(const QString &key, const QStringList &paramList)
 {
     Q_UNUSED(paramList);
-    if (key.toLower() == "android")
+    if (!key.compare(QLatin1String("android"), Qt::CaseInsensitive))
         return new QAndroidPlatformIntegration(paramList);
     return 0;
 }
diff --git a/src/plugins/platforms/android/src/qandroidinputcontext.cpp b/src/plugins/platforms/android/src/qandroidinputcontext.cpp
index 8556e8ebf1..326972e71e 100644
--- a/src/plugins/platforms/android/src/qandroidinputcontext.cpp
+++ b/src/plugins/platforms/android/src/qandroidinputcontext.cpp
@@ -59,8 +59,8 @@
 QT_BEGIN_NAMESPACE
 
 static QAndroidInputContext *m_androidInputContext = 0;
-static char const *const QtNativeInputConnectionClassName = "org/qtproject/qt5/android/QtNativeInputConnection";
-static char const *const QtExtractedTextClassName = "org/qtproject/qt5/android/QtExtractedText";
+static char const *const QtNativeInputConnectionClassName = "org.qtproject.qt5.android.QtNativeInputConnection";
+static char const *const QtExtractedTextClassName = "org.qtproject.qt5.android.QtExtractedText";
 static jclass m_extractedTextClass = 0;
 static jmethodID m_classConstructorMethodID = 0;
 static jfieldID m_partialEndOffsetFieldID = 0;
diff --git a/src/plugins/platforms/android/src/qandroidplatformdialoghelpers.cpp b/src/plugins/platforms/android/src/qandroidplatformdialoghelpers.cpp
index f379402e18..4c91e76e0f 100644
--- a/src/plugins/platforms/android/src/qandroidplatformdialoghelpers.cpp
+++ b/src/plugins/platforms/android/src/qandroidplatformdialoghelpers.cpp
@@ -184,7 +184,7 @@ static JNINativeMethod methods[] = {
 
 bool registerNatives(JNIEnv *env)
 {
-    jclass clazz = QtAndroid::findClass("org/qtproject/qt5/android/QtMessageDialogHelper", env);
+    jclass clazz = QtAndroid::findClass("org.qtproject.qt5.android.QtMessageDialogHelper", env);
     if (!clazz) {
         __android_log_print(ANDROID_LOG_FATAL, QtAndroid::qtTagText(), QtAndroid::classErrorMsgFmt()
                             , "org/qtproject/qt5/android/QtMessageDialogHelper");
diff --git a/src/plugins/platforms/cocoa/main.mm b/src/plugins/platforms/cocoa/main.mm
index b730514b12..dd063b5da0 100644
--- a/src/plugins/platforms/cocoa/main.mm
+++ b/src/plugins/platforms/cocoa/main.mm
@@ -61,8 +61,7 @@ QPlatformIntegration * QCocoaIntegrationPlugin::create(const QString& system, co
     Q_UNUSED(paramList);
 
     QCocoaAutoReleasePool pool;
-
-    if (system.toLower() == "cocoa")
+    if (!system.compare(QLatin1String("cocoa"), Qt::CaseInsensitive))
         return new QCocoaIntegration;
 
     return 0;
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h
index e1d4b602c9..30f1cdc278 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.h
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h
@@ -75,6 +75,8 @@ public:
     bool isSharing() const;
     bool isValid() const;
 
+    void windowWasHidden();
+
 private:
     void setActiveWindow(QWindow *window);
     void updateSurfaceFormat();
diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.mm b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
index ba204236ee..8af90b13bf 100644
--- a/src/plugins/platforms/cocoa/qcocoaglcontext.mm
+++ b/src/plugins/platforms/cocoa/qcocoaglcontext.mm
@@ -165,6 +165,16 @@ QSurfaceFormat QCocoaGLContext::format() const
     return m_format;
 }
 
+void QCocoaGLContext::windowWasHidden()
+{
+    // If the window is hidden, we need to unset the m_currentWindow
+    // variable so that succeeding makeCurrent's will not abort prematurely
+    // because of the optimization in setActiveWindow.
+    // Doing a full doneCurrent here is not preferable, because the GL context
+    // might be rendering in a different thread at this time.
+    m_currentWindow.clear();
+}
+
 void QCocoaGLContext::swapBuffers(QPlatformSurface *surface)
 {
     QWindow *window = static_cast<QCocoaWindow *>(surface)->window();
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index b5b9cec2be..1aace958ed 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -388,6 +388,8 @@ void QCocoaWindow::setVisible(bool visible)
             [m_contentView setHidden:NO];
     } else {
         // qDebug() << "close" << this;
+        if (m_glContext)
+            m_glContext->windowWasHidden();
         if (m_nsWindow) {
             if (m_hasModalSession) {
                 QCocoaEventDispatcher *cocoaEventDispatcher = qobject_cast<QCocoaEventDispatcher *>(QGuiApplication::instance()->eventDispatcher());
diff --git a/src/plugins/platforms/cocoa/qprintengine_mac.mm b/src/plugins/platforms/cocoa/qprintengine_mac.mm
index ee8d7ea157..f363b1772f 100644
--- a/src/plugins/platforms/cocoa/qprintengine_mac.mm
+++ b/src/plugins/platforms/cocoa/qprintengine_mac.mm
@@ -40,8 +40,7 @@
 ****************************************************************************/
 
 #include "qprintengine_mac_p.h"
-#include <qdebug.h>
-#include <qthread.h>
+#include <quuid.h>
 #include <QtCore/qcoreapplication.h>
 #include <qpa/qplatformprintersupport.h>
 
@@ -141,30 +140,51 @@ QMacPrintEnginePrivate::~QMacPrintEnginePrivate()
 void QMacPrintEnginePrivate::setPaperSize(QPrinter::PaperSize ps)
 {
     Q_Q(QMacPrintEngine);
-    QSizeF newSize = QPlatformPrinterSupport::convertPaperSizeToQSizeF(ps);
-    QCFType<CFArrayRef> formats;
+    if (hasCustomPaperSize) {
+        PMRelease(customPaper);
+        customPaper = 0;
+    }
+    hasCustomPaperSize = (ps == QPrinter::Custom);
     PMPrinter printer;
-
-    if (PMSessionGetCurrentPrinter(session(), &printer) == noErr
-        && PMSessionCreatePageFormatList(session(), printer, &formats) == noErr) {
-        CFIndex total = CFArrayGetCount(formats);
-        PMPageFormat tmp;
-        PMRect paper;
-        for (CFIndex idx = 0; idx < total; ++idx) {
-            tmp = static_cast<PMPageFormat>(
-                                        const_cast<void *>(CFArrayGetValueAtIndex(formats, idx)));
-            PMGetUnadjustedPaperRect(tmp, &paper);
-            int wMM = int((paper.right - paper.left) / 72 * 25.4 + 0.5);
-            int hMM = int((paper.bottom - paper.top) / 72 * 25.4 + 0.5);
-            if (newSize.width() == wMM && newSize.height() == hMM) {
-                PMCopyPageFormat(tmp, format());
-                // reset the orientation and resolution as they are lost in the copy.
-                q->setProperty(QPrintEngine::PPK_Orientation, orient);
-                if (PMSessionValidatePageFormat(session(), format(), kPMDontWantBoolean) != noErr) {
-                    // Don't know, warn for the moment.
-                    qWarning("QMacPrintEngine, problem setting format and resolution for this page size");
+    if (PMSessionGetCurrentPrinter(session(), &printer) == noErr) {
+        if (ps != QPrinter::Custom) {
+            QSizeF newSize = QPlatformPrinterSupport::convertPaperSizeToQSizeF(ps);
+            QCFType<CFArrayRef> formats;
+            if (PMSessionCreatePageFormatList(session(), printer, &formats) == noErr) {
+                CFIndex total = CFArrayGetCount(formats);
+                PMPageFormat tmp;
+                PMRect paper;
+                for (CFIndex idx = 0; idx < total; ++idx) {
+                    tmp = static_cast<PMPageFormat>(const_cast<void *>(CFArrayGetValueAtIndex(formats, idx)));
+                    PMGetUnadjustedPaperRect(tmp, &paper);
+                    int wMM = int((paper.right - paper.left) / 72 * 25.4 + 0.5);
+                    int hMM = int((paper.bottom - paper.top) / 72 * 25.4 + 0.5);
+                    if (newSize.width() == wMM && newSize.height() == hMM) {
+                        PMCopyPageFormat(tmp, format());
+                        // reset the orientation and resolution as they are lost in the copy.
+                        q->setProperty(QPrintEngine::PPK_Orientation, orient);
+                        if (PMSessionValidatePageFormat(session(), format(), kPMDontWantBoolean) != noErr) {
+                            // Don't know, warn for the moment.
+                            qWarning("QMacPrintEngine, problem setting format and resolution for this page size");
+                        }
+                        break;
+                    }
                 }
-                break;
+            }
+        } else {
+            QCFString paperId = QCFString::toCFStringRef(QUuid::createUuid().toString());
+            PMPaperMargins paperMargins;
+            paperMargins.left = leftMargin;
+            paperMargins.top = topMargin;
+            paperMargins.right = rightMargin;
+            paperMargins.bottom = bottomMargin;
+            PMPaperCreateCustom(printer, paperId, QCFString("Custom size"), customSize.width(), customSize.height(), &paperMargins, &customPaper);
+            PMPageFormat tmp;
+            PMCreatePageFormatWithPMPaper(&tmp, customPaper);
+            PMCopyPageFormat(tmp, format());
+            if (PMSessionValidatePageFormat(session(), format(), kPMDontWantBoolean) != noErr) {
+                // Don't know, warn for the moment.
+                qWarning("QMacPrintEngine, problem setting paper name");
             }
         }
     }
@@ -183,6 +203,11 @@ QPrinter::PaperSize QMacPrintEnginePrivate::paperSize() const
 void QMacPrintEnginePrivate::setPaperName(const QString &name)
 {
     Q_Q(QMacPrintEngine);
+    if (hasCustomPaperSize) {
+        PMRelease(customPaper);
+        customPaper = 0;
+        hasCustomPaperSize = false;
+    }
     PMPrinter printer;
 
     if (PMSessionGetCurrentPrinter(session(), &printer) == noErr) {
@@ -419,6 +444,8 @@ void QMacPrintEnginePrivate::releaseSession()
 {
     PMSessionEndPageNoDialog(session());
     PMSessionEndDocumentNoDialog(session());
+    if (hasCustomPaperSize)
+        PMRelease(customPaper);
     [printInfo release];
     printInfo = 0;
 }
@@ -665,10 +692,10 @@ void QMacPrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant &va
     {
         PMOrientation orientation;
         PMGetOrientation(d->format(), &orientation);
-        d->hasCustomPaperSize = true;
         d->customSize = value.toSizeF();
         if (orientation != kPMPortrait)
             d->customSize = QSizeF(d->customSize.height(), d->customSize.width());
+        d->setPaperSize(QPrinter::Custom);
         break;
     }
     case PPK_PageMargins:
diff --git a/src/plugins/platforms/cocoa/qprintengine_mac_p.h b/src/plugins/platforms/cocoa/qprintengine_mac_p.h
index 28183118d8..644a07184f 100644
--- a/src/plugins/platforms/cocoa/qprintengine_mac_p.h
+++ b/src/plugins/platforms/cocoa/qprintengine_mac_p.h
@@ -135,6 +135,7 @@ public:
     qreal rightMargin;
     qreal bottomMargin;
     QHash<QMacPrintEngine::PrintEnginePropertyKey, QVariant> valueCache;
+    PMPaper customPaper;
     QMacPrintEnginePrivate() : mode(QPrinter::ScreenResolution), state(QPrinter::Idle),
                                orient(QPrinter::Portrait), printInfo(0), paintEngine(0),
                                hasCustomPaperSize(false), hasCustomPageMargins(false) {}
diff --git a/src/plugins/platforms/directfb/main.cpp b/src/plugins/platforms/directfb/main.cpp
index 5ba1b0996b..423e33efd5 100644
--- a/src/plugins/platforms/directfb/main.cpp
+++ b/src/plugins/platforms/directfb/main.cpp
@@ -68,7 +68,7 @@ QPlatformIntegration * QDirectFbIntegrationPlugin::create(const QString& system,
     Q_UNUSED(paramList);
     QDirectFbIntegration *integration = 0;
 
-    if (system.toLower() == "directfb")
+    if (!system.compare(QLatin1String("directfb"), Qt::CaseInsensitive))
         integration = new QDirectFbIntegration;
     QT_EGL_BACKEND_CREATE(system, integration)
 
diff --git a/src/plugins/platforms/eglfs/main.cpp b/src/plugins/platforms/eglfs/main.cpp
index d8e7a3792e..245f2a6236 100644
--- a/src/plugins/platforms/eglfs/main.cpp
+++ b/src/plugins/platforms/eglfs/main.cpp
@@ -55,7 +55,7 @@ public:
 QPlatformIntegration* QEglFSIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
-    if (system.toLower() == "eglfs")
+    if (!system.compare(QLatin1String("eglfs"), Qt::CaseInsensitive))
         return new QEglFSIntegration;
 
     return 0;
diff --git a/src/plugins/platforms/ios/plugin.mm b/src/plugins/platforms/ios/plugin.mm
index efb1ad8d74..3505e39a0b 100644
--- a/src/plugins/platforms/ios/plugin.mm
+++ b/src/plugins/platforms/ios/plugin.mm
@@ -56,7 +56,7 @@ class QIOSIntegrationPlugin : public QPlatformIntegrationPlugin
 QPlatformIntegration * QIOSIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
-    if (system.toLower() == "ios")
+    if (!system.compare(QLatin1String("ios"), Qt::CaseInsensitive))
         return new QIOSIntegration;
 
     return 0;
diff --git a/src/plugins/platforms/ios/qiosapplicationdelegate.mm b/src/plugins/platforms/ios/qiosapplicationdelegate.mm
index cf702c82af..9cf1047a6b 100644
--- a/src/plugins/platforms/ios/qiosapplicationdelegate.mm
+++ b/src/plugins/platforms/ios/qiosapplicationdelegate.mm
@@ -41,9 +41,14 @@
 
 #include "qiosapplicationdelegate.h"
 
+#include "qiosintegration.h"
+#include "qiosservices.h"
 #include "qiosviewcontroller.h"
 #include "qioswindow.h"
 
+#include <QtGui/private/qguiapplication_p.h>
+#include <qpa/qplatformintegration.h>
+
 #include <QtCore/QtCore>
 
 @implementation QIOSApplicationDelegate
@@ -82,6 +87,21 @@
     return YES;
 }
 
+- (BOOL)application:(UIApplication *)application openURL:(NSURL *)url sourceApplication:(NSString *)sourceApplication annotation:(id)annotation
+{
+    Q_UNUSED(application);
+    Q_UNUSED(sourceApplication);
+    Q_UNUSED(annotation);
+
+    if (!QGuiApplication::instance())
+        return NO;
+
+    QIOSIntegration *iosIntegration = static_cast<QIOSIntegration *>(QGuiApplicationPrivate::platformIntegration());
+    QIOSServices *iosServices = static_cast<QIOSServices *>(iosIntegration->services());
+
+    return iosServices->handleUrl(QUrl::fromNSURL(url));
+}
+
 - (void)dealloc
 {
     [window release];
diff --git a/src/plugins/platforms/ios/qiosscreen.mm b/src/plugins/platforms/ios/qiosscreen.mm
index 57522cb1a3..96410952f9 100644
--- a/src/plugins/platforms/ios/qiosscreen.mm
+++ b/src/plugins/platforms/ios/qiosscreen.mm
@@ -189,6 +189,9 @@ void QIOSScreen::updateProperties()
 
 void QIOSScreen::updateStatusBarVisibility()
 {
+    if (!isQtApplication())
+        return;
+
     QWindow *focusWindow = QGuiApplication::focusWindow();
 
     // If we don't have a focus window we leave the status
@@ -199,20 +202,26 @@ void QIOSScreen::updateStatusBarVisibility()
         return;
 
     UIView *view = reinterpret_cast<UIView *>(focusWindow->handle()->winId());
+    QIOSViewController *viewController = static_cast<QIOSViewController *>(view.viewController);
+
+    bool currentStatusBarVisibility = [UIApplication sharedApplication].statusBarHidden;
+    if (viewController.prefersStatusBarHidden == currentStatusBarVisibility)
+        return;
+
 #if QT_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(__IPHONE_7_0)
     if (QSysInfo::MacintoshVersion >= QSysInfo::MV_IOS_7_0) {
-        [view.viewController setNeedsStatusBarAppearanceUpdate];
+        [viewController setNeedsStatusBarAppearanceUpdate];
+        dispatch_async(dispatch_get_main_queue(), ^{
+            updateProperties();
+        });
     } else
 #endif
     {
-        bool wasHidden = [UIApplication sharedApplication].statusBarHidden;
-        QIOSViewController *viewController = static_cast<QIOSViewController *>(view.viewController);
         [[UIApplication sharedApplication]
             setStatusBarHidden:[viewController prefersStatusBarHidden]
             withAnimation:UIStatusBarAnimationNone];
 
-        if ([UIApplication sharedApplication].statusBarHidden != wasHidden)
-            updateProperties();
+        updateProperties();
     }
 }
 
diff --git a/src/plugins/platforms/ios/qiosservices.h b/src/plugins/platforms/ios/qiosservices.h
index 692b3a0b99..aa39fbbed4 100644
--- a/src/plugins/platforms/ios/qiosservices.h
+++ b/src/plugins/platforms/ios/qiosservices.h
@@ -41,6 +41,8 @@
 
 #ifndef QIOSSERVICES_H
 #define QIOSSERVICES_H
+
+#include <qurl.h>
 #include <qpa/qplatformservices.h>
 
 QT_BEGIN_NAMESPACE
@@ -50,6 +52,11 @@ class QIOSServices : public QPlatformServices
 public:
     bool openUrl(const QUrl &url);
     bool openDocument(const QUrl &url);
+
+    bool handleUrl(const QUrl &url);
+
+private:
+    QUrl m_handlingUrl;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/ios/qiosservices.mm b/src/plugins/platforms/ios/qiosservices.mm
index 32203aeb71..0ac6c590ca 100644
--- a/src/plugins/platforms/ios/qiosservices.mm
+++ b/src/plugins/platforms/ios/qiosservices.mm
@@ -42,6 +42,7 @@
 #include "qiosservices.h"
 
 #include <QtCore/qurl.h>
+#include <QtGui/qdesktopservices.h>
 
 #import <UIKit/UIApplication.h>
 
@@ -49,6 +50,9 @@ QT_BEGIN_NAMESPACE
 
 bool QIOSServices::openUrl(const QUrl &url)
 {
+    if (url == m_handlingUrl)
+        return false;
+
     if (url.scheme().isEmpty())
         return openDocument(url);
 
@@ -66,4 +70,19 @@ bool QIOSServices::openDocument(const QUrl &url)
     return QPlatformServices::openDocument(url);
 }
 
+/* Callback from iOS that the application should handle a URL */
+bool QIOSServices::handleUrl(const QUrl &url)
+{
+    QUrl previouslyHandling = m_handlingUrl;
+    m_handlingUrl = url;
+
+    // FIXME: Add platform services callback from QDesktopServices::setUrlHandler
+    // so that we can warn the user if calling setUrlHandler without also setting
+    // up the matching keys in the Info.plist file (CFBundleURLTypes and friends).
+    bool couldHandle = QDesktopServices::openUrl(url);
+
+    m_handlingUrl = previouslyHandling;
+    return couldHandle;
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h
index a5e122bda1..d36a81180c 100644
--- a/src/plugins/platforms/ios/qioswindow.h
+++ b/src/plugins/platforms/ios/qioswindow.h
@@ -74,6 +74,8 @@ public:
     void handleContentOrientationChange(Qt::ScreenOrientation orientation);
     void setVisible(bool visible);
 
+    bool isExposed() const Q_DECL_OVERRIDE;
+
     void raise() { raiseOrLower(true); }
     void lower() { raiseOrLower(false); }
     void requestActivateWindow();
diff --git a/src/plugins/platforms/ios/qioswindow.mm b/src/plugins/platforms/ios/qioswindow.mm
index 0dd810bdf6..7ab136e8b9 100644
--- a/src/plugins/platforms/ios/qioswindow.mm
+++ b/src/plugins/platforms/ios/qioswindow.mm
@@ -449,10 +449,18 @@ QT_BEGIN_NAMESPACE
 QIOSWindow::QIOSWindow(QWindow *window)
     : QPlatformWindow(window)
     , m_view([[QUIView alloc] initWithQIOSWindow:this])
-    , m_normalGeometry(QPlatformWindow::geometry())
     , m_windowLevel(0)
 {
     setParent(QPlatformWindow::parent());
+
+    // Resolve default window geometry in case it was not set before creating the
+    // platform window. This picks up eg. minimum-size if set, and defaults to
+    // the "maxmized" geometry (even though we're not in that window state).
+    // FIXME: Detect if we apply a maximized geometry and send a window state
+    // change event in that case.
+    m_normalGeometry = initialGeometry(window, QPlatformWindow::geometry(),
+        screen()->availableGeometry().width(), screen()->availableGeometry().height());
+
     setWindowState(window->windowState());
 }
 
@@ -579,6 +587,11 @@ void QIOSWindow::applyGeometry(const QRect &rect)
         [m_view layoutIfNeeded];
 }
 
+bool QIOSWindow::isExposed() const
+{
+    return window()->isVisible() && !window()->geometry().isEmpty();
+}
+
 void QIOSWindow::setWindowState(Qt::WindowState state)
 {
     // Update the QWindow representation straight away, so that
diff --git a/src/plugins/platforms/kms/main.cpp b/src/plugins/platforms/kms/main.cpp
index db0582e694..3027e23c04 100644
--- a/src/plugins/platforms/kms/main.cpp
+++ b/src/plugins/platforms/kms/main.cpp
@@ -55,7 +55,7 @@ public:
 QPlatformIntegration *QKmsIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
-    if (system.toLower() == "kms")
+    if (!system.compare(QLatin1String("kms"), Qt::CaseInsensitive))
         return new QKmsIntegration;
 
     return 0;
diff --git a/src/plugins/platforms/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp
index 579984d2fc..27aa91aefe 100644
--- a/src/plugins/platforms/linuxfb/main.cpp
+++ b/src/plugins/platforms/linuxfb/main.cpp
@@ -55,7 +55,7 @@ public:
 QPlatformIntegration* QLinuxFbIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
-    if (system.toLower() == "linuxfb")
+    if (!system.compare(QLatin1String("linuxfb"), Qt::CaseInsensitive))
         return new QLinuxFbIntegration(paramList);
 
     return 0;
diff --git a/src/plugins/platforms/minimal/main.cpp b/src/plugins/platforms/minimal/main.cpp
index 7846b5b387..5e0388a0af 100644
--- a/src/plugins/platforms/minimal/main.cpp
+++ b/src/plugins/platforms/minimal/main.cpp
@@ -55,9 +55,8 @@ public:
 
 QPlatformIntegration *QMinimalIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
-    Q_UNUSED(paramList);
-    if (system.toLower() == "minimal")
-        return new QMinimalIntegration;
+    if (!system.compare(QLatin1String("minimal"), Qt::CaseInsensitive))
+        return new QMinimalIntegration(paramList);
 
     return 0;
 }
diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.cpp b/src/plugins/platforms/minimal/qminimalbackingstore.cpp
index 3aac1bfe33..f58458cd31 100644
--- a/src/plugins/platforms/minimal/qminimalbackingstore.cpp
+++ b/src/plugins/platforms/minimal/qminimalbackingstore.cpp
@@ -41,6 +41,7 @@
 
 
 #include "qminimalbackingstore.h"
+#include "qminimalintegration.h"
 #include "qscreen.h"
 #include <QtCore/qdebug.h>
 #include <qpa/qplatformscreen.h>
@@ -49,10 +50,9 @@
 QT_BEGIN_NAMESPACE
 
 QMinimalBackingStore::QMinimalBackingStore(QWindow *window)
-    : QPlatformBackingStore(window),mDebug(false)
+    : QPlatformBackingStore(window)
+    , mDebug(QMinimalIntegration::instance()->options() & QMinimalIntegration::DebugBackingStore)
 {
-    if (QT_PREPEND_NAMESPACE(qgetenv)("QT_DEBUG_BACKINGSTORE").toInt() > 0)
-        mDebug = true;
     if (mDebug)
         qDebug() << "QMinimalBackingStore::QMinimalBackingStore:" << (quintptr)this;
 }
diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.h b/src/plugins/platforms/minimal/qminimalbackingstore.h
index 5f1fd0f4d3..9265a09d18 100644
--- a/src/plugins/platforms/minimal/qminimalbackingstore.h
+++ b/src/plugins/platforms/minimal/qminimalbackingstore.h
@@ -60,7 +60,7 @@ public:
 
 private:
     QImage mImage;
-    bool mDebug;
+    const bool mDebug;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp
index bb2c5f53c3..7f5c25f239 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.cpp
+++ b/src/plugins/platforms/minimal/qminimalintegration.cpp
@@ -45,6 +45,7 @@
 #include <QtGui/private/qpixmap_raster_p.h>
 #include <QtGui/private/qguiapplication_p.h>
 #include <qpa/qplatformwindow.h>
+#include <qpa/qplatformfontdatabase.h>
 
 #if !defined(Q_OS_WIN)
 #include <QtPlatformSupport/private/qgenericunixeventdispatcher_p.h>
@@ -56,8 +57,27 @@
 
 QT_BEGIN_NAMESPACE
 
-QMinimalIntegration::QMinimalIntegration()
+static const char debugBackingStoreEnvironmentVariable[] = "QT_DEBUG_BACKINGSTORE";
+
+static inline unsigned parseOptions(const QStringList &paramList)
+{
+    unsigned options = 0;
+    foreach (const QString &param, paramList) {
+        if (param == QLatin1String("enable_fonts"))
+            options |= QMinimalIntegration::EnableFonts;
+    }
+    return options;
+}
+
+QMinimalIntegration::QMinimalIntegration(const QStringList &parameters)
+    : m_dummyFontDatabase(0)
+    , m_options(parseOptions(parameters))
 {
+    if (qEnvironmentVariableIsSet(debugBackingStoreEnvironmentVariable)
+        && qgetenv(debugBackingStoreEnvironmentVariable).toInt() > 0) {
+        m_options |= DebugBackingStore | EnableFonts;
+    }
+
     QMinimalScreen *mPrimaryScreen = new QMinimalScreen();
 
     mPrimaryScreen->mGeometry = QRect(0, 0, 240, 320);
@@ -67,6 +87,11 @@ QMinimalIntegration::QMinimalIntegration()
     screenAdded(mPrimaryScreen);
 }
 
+QMinimalIntegration::~QMinimalIntegration()
+{
+    delete m_dummyFontDatabase;
+}
+
 bool QMinimalIntegration::hasCapability(QPlatformIntegration::Capability cap) const
 {
     switch (cap) {
@@ -76,6 +101,24 @@ bool QMinimalIntegration::hasCapability(QPlatformIntegration::Capability cap) co
     }
 }
 
+// Dummy font database that does not scan the fonts directory to be
+// used for command line tools like qmlplugindump that do not create windows
+// unless DebugBackingStore is activated.
+class DummyFontDatabase : public QPlatformFontDatabase
+{
+public:
+    virtual void populateFontDatabase() {}
+};
+
+QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const
+{
+    if (m_options & EnableFonts)
+        return QPlatformIntegration::fontDatabase();
+    if (!m_dummyFontDatabase)
+        m_dummyFontDatabase = new DummyFontDatabase;
+    return m_dummyFontDatabase;
+}
+
 QPlatformWindow *QMinimalIntegration::createPlatformWindow(QWindow *window) const
 {
     Q_UNUSED(window);
@@ -102,4 +145,9 @@ QAbstractEventDispatcher *QMinimalIntegration::createEventDispatcher() const
 #endif
 }
 
+QMinimalIntegration *QMinimalIntegration::instance()
+{
+    return static_cast<QMinimalIntegration *>(QGuiApplicationPrivate::platformIntegration());
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h
index 7dc01e1d51..a737057085 100644
--- a/src/plugins/platforms/minimal/qminimalintegration.h
+++ b/src/plugins/platforms/minimal/qminimalintegration.h
@@ -67,13 +67,28 @@ public:
 class QMinimalIntegration : public QPlatformIntegration
 {
 public:
-    QMinimalIntegration();
+    enum Options { // Options to be passed on command line or determined from environment
+        DebugBackingStore = 0x1,
+        EnableFonts = 0x2
+    };
+
+    explicit QMinimalIntegration(const QStringList &parameters);
+    ~QMinimalIntegration();
 
     bool hasCapability(QPlatformIntegration::Capability cap) const;
+    QPlatformFontDatabase *fontDatabase() const;
 
     QPlatformWindow *createPlatformWindow(QWindow *window) const;
     QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const;
     QAbstractEventDispatcher *createEventDispatcher() const;
+
+    unsigned options() const { return m_options; }
+
+    static QMinimalIntegration *instance();
+
+private:
+    mutable QPlatformFontDatabase *m_dummyFontDatabase;
+    unsigned m_options;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/minimalegl/main.cpp b/src/plugins/platforms/minimalegl/main.cpp
index c951bfb0dc..be85fa082e 100644
--- a/src/plugins/platforms/minimalegl/main.cpp
+++ b/src/plugins/platforms/minimalegl/main.cpp
@@ -63,7 +63,7 @@ QStringList QMinimalEglIntegrationPlugin::keys() const
 QPlatformIntegration* QMinimalEglIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
-    if (system.toLower() == "minimalegl")
+    if (!system.compare(QLatin1String("minimalegl"), Qt::CaseInsensitive))
         return new QMinimalEglIntegration;
 
     return 0;
diff --git a/src/plugins/platforms/offscreen/main.cpp b/src/plugins/platforms/offscreen/main.cpp
index f48451d00d..e89116351b 100644
--- a/src/plugins/platforms/offscreen/main.cpp
+++ b/src/plugins/platforms/offscreen/main.cpp
@@ -56,7 +56,7 @@ public:
 QPlatformIntegration *QOffscreenIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
-    if (system.toLower() == "offscreen")
+    if (!system.compare(QLatin1String("offscreen"), Qt::CaseInsensitive))
         return QOffscreenIntegration::createOffscreenIntegration();
 
     return 0;
diff --git a/src/plugins/platforms/openwfd/main.cpp b/src/plugins/platforms/openwfd/main.cpp
index cea3c50e56..5f5d7594cd 100644
--- a/src/plugins/platforms/openwfd/main.cpp
+++ b/src/plugins/platforms/openwfd/main.cpp
@@ -54,7 +54,7 @@ public:
 QPlatformIntegration* QOpenWFDIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
     Q_UNUSED(paramList);
-    if (system.toLower() == "openwfd")
+    if (!system.compare(QLatin1String("openwfd"), Qt::CaseInsensitive))
         return new QOpenWFDIntegration;
 
     return 0;
diff --git a/src/plugins/platforms/qnx/main.cpp b/src/plugins/platforms/qnx/main.cpp
index fb81928625..50779d3e12 100644
--- a/src/plugins/platforms/qnx/main.cpp
+++ b/src/plugins/platforms/qnx/main.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 
 QPlatformIntegration *QQnxIntegrationPlugin::create(const QString& system, const QStringList& paramList)
 {
-    if (system.toLower() == QLatin1String("qnx"))
+    if (!system.compare(QLatin1String("qnx"), Qt::CaseInsensitive))
         return new QQnxIntegration(paramList);
 
     return 0;
diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
index e7c68f6ff5..e83fc445d6 100644
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
+++ b/src/plugins/platforms/qnx/qqnxfiledialoghelper.h
@@ -87,6 +87,9 @@ public:
 Q_SIGNALS:
     void dialogClosed();
 
+private Q_SLOTS:
+    void emitSignals();
+
 private:
     void setNameFilter(const QString &filter);
     void setNameFilters(const QStringList &filters);
@@ -96,8 +99,8 @@ private:
     QFileDialogOptions::AcceptMode m_acceptMode;
     QString m_selectedFilter;
 
-    QPlatformDialogHelper::DialogCode m_result;
 #if defined(Q_OS_BLACKBERRY_TABLET)
+    QPlatformDialogHelper::DialogCode m_result;
     QList<QUrl> m_paths;
 #endif
 };
diff --git a/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp b/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
index dc841eb1a9..fa6e26977a 100644
--- a/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
+++ b/src/plugins/platforms/qnx/qqnxfiledialoghelper_bb10.cpp
@@ -65,9 +65,9 @@ QQnxFileDialogHelper::QQnxFileDialogHelper(const QQnxIntegration *integration)
       m_integration(integration),
       m_dialog(new QQnxFilePicker),
       m_acceptMode(QFileDialogOptions::AcceptOpen),
-      m_selectedFilter(),
-      m_result(QPlatformDialogHelper::Rejected)
+      m_selectedFilter()
 {
+    connect(m_dialog, &QQnxFilePicker::closed, this, &QQnxFileDialogHelper::emitSignals);
 }
 
 QQnxFileDialogHelper::~QQnxFileDialogHelper()
@@ -85,11 +85,6 @@ void QQnxFileDialogHelper::exec()
     QEventLoop loop;
     connect(m_dialog, SIGNAL(closed()), &loop, SLOT(quit()));
     loop.exec();
-
-    if (m_dialog->selectedFiles().isEmpty())
-        Q_EMIT reject();
-    else
-        Q_EMIT accept();
 }
 
 bool QQnxFileDialogHelper::show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent)
@@ -197,6 +192,14 @@ QString QQnxFileDialogHelper::selectedNameFilter() const
     return m_selectedFilter;
 }
 
+void QQnxFileDialogHelper::emitSignals()
+{
+    if (m_dialog->selectedFiles().isEmpty())
+        Q_EMIT reject();
+    else
+        Q_EMIT accept();
+}
+
 void QQnxFileDialogHelper::setNameFilter(const QString &filter)
 {
     qFileDialogHelperDebug() << Q_FUNC_INFO << "filter =" << filter;
diff --git a/src/plugins/platforms/qnx/qqnxfilepicker.cpp b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
index 5229d1f1f5..56c804a5b4 100644
--- a/src/plugins/platforms/qnx/qqnxfilepicker.cpp
+++ b/src/plugins/platforms/qnx/qqnxfilepicker.cpp
@@ -84,6 +84,9 @@ void QQnxFilePicker::open()
     if (m_invocationHandle)
         return;
 
+    // Clear any previous results
+    m_selectedFiles.clear();
+
     int errorCode = BPS_SUCCESS;
 
     errorCode = navigator_invoke_invocation_create(&m_invocationHandle);
diff --git a/src/plugins/platforms/xcb/main.cpp b/src/plugins/platforms/xcb/main.cpp
index e114827703..f21ea03cf5 100644
--- a/src/plugins/platforms/xcb/main.cpp
+++ b/src/plugins/platforms/xcb/main.cpp
@@ -54,7 +54,7 @@ public:
 
 QPlatformIntegration* QXcbIntegrationPlugin::create(const QString& system, const QStringList& parameters, int &argc, char **argv)
 {
-    if (system.toLower() == "xcb")
+    if (!system.compare(QLatin1String("xcb"), Qt::CaseInsensitive))
         return new QXcbIntegration(parameters, argc, argv);
 
     return 0;
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp
index 96e6534b74..6fd2241f71 100644
--- a/src/plugins/platforms/xcb/qxcbconnection.cpp
+++ b/src/plugins/platforms/xcb/qxcbconnection.cpp
@@ -274,21 +274,22 @@ QXcbConnection::QXcbConnection(QXcbNativeInterface *nativeInterface, bool canGra
         XSetEventQueueOwner(dpy, XCBOwnsEventQueue);
         XSetErrorHandler(nullErrorHandler);
         m_xlib_display = dpy;
-#ifdef XCB_USE_EGL
-        EGLDisplay eglDisplay = eglGetDisplay(dpy);
-        m_egl_display = eglDisplay;
-        EGLint major, minor;
-        eglBindAPI(EGL_OPENGL_ES_API);
-        m_has_egl = eglInitialize(eglDisplay,&major,&minor);
-#endif //XCB_USE_EGL
     }
 #else
+    EGLNativeDisplayType dpy = EGL_DEFAULT_DISPLAY;
     m_connection = xcb_connect(m_displayName.constData(), &m_primaryScreen);
 #endif //XCB_USE_XLIB
 
     if (!m_connection || xcb_connection_has_error(m_connection))
         qFatal("QXcbConnection: Could not connect to display %s", m_displayName.constData());
 
+#ifdef XCB_USE_EGL
+    EGLDisplay eglDisplay = eglGetDisplay(dpy);
+    m_egl_display = eglDisplay;
+    EGLint major, minor;
+    m_has_egl = eglInitialize(eglDisplay, &major, &minor);
+#endif //XCB_USE_EGL
+
     m_reader = new QXcbEventReader(this);
     m_reader->start();