1 files changed, 14 insertions, 7 deletions
diff --git a/src/platformsupport/fbconvenience/qfbscreen_p.h b/src/platformsupport/fbconvenience/qfbscreen_p.h
index e9b570aa1c..1c27a941cc 100644
--- a/src/platformsupport/fbconvenience/qfbscreen_p.h
+++ b/src/platformsupport/fbconvenience/qfbscreen_p.h
@@ -66,10 +66,18 @@ class QFbBackingStore;
 class QFbScreen : public QObject, public QPlatformScreen
 {
     Q_OBJECT
+
 public:
+    enum Flag {
+        DontForceFirstWindowToFullScreen = 0x01
+    };
+    Q_DECLARE_FLAGS(Flags, Flag)
+
     QFbScreen();
     ~QFbScreen();
 
+    virtual bool initialize();
+
     QRect geometry() const Q_DECL_OVERRIDE { return mGeometry; }
     int depth() const Q_DECL_OVERRIDE { return mDepth; }
     QImage::Format format() const Q_DECL_OVERRIDE { return mFormat; }
@@ -85,6 +93,8 @@ public:
     virtual void raise(QFbWindow *window);
     virtual void lower(QFbWindow *window);
     virtual void topWindowChanged(QWindow *) {}
+    virtual int windowCount() const;
+    virtual Flags flags() const;
 
     void addPendingBackingStore(QFbBackingStore *bs) { mPendingBackingStores << bs; }
 
@@ -112,20 +122,17 @@ protected:
     int mDepth;
     QImage::Format mFormat;
     QSizeF mPhysicalSize;
-    QImage *mScreenImage;
+    QImage mScreenImage;
 
 private:
-    void invalidateRectCache() { mIsUpToDate = false; }
-    void generateRects();
-
-    QPainter *mCompositePainter;
-    QVector<QPair<QRect, int> > mCachedRects;
+    QPainter *mPainter;
     QList<QFbBackingStore*> mPendingBackingStores;
 
     friend class QFbWindow;
-    bool mIsUpToDate;
 };
 
+Q_DECLARE_OPERATORS_FOR_FLAGS(QFbScreen::Flags)
+
 QT_END_NAMESPACE
 
 #endif // QFBSCREEN_P_H