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

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

Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd

1 files changed, 16 insertions, 1 deletions

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