diff options
author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-07-02 15:31:17 +0530 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 06:06:04 +0200 |
commit | 58f644dbcffdb9afc77c5635b732c88c2660a79d (patch) | |
tree | fecbb892ff009451631958d3c7e2b0d1e0ab62cd /src/plugins/platforms/linuxfb/qlinuxfbintegration.h | |
parent | 2407f4f706725052e40668b25dcaaf8fa8bb19b1 (diff) |
linuxfb: make linuxfb compile
The plugin now compiles, it is not known to work.
Change-Id: I8dd086eb7fc41c6e197debc2601eebba3404187c
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Diffstat (limited to 'src/plugins/platforms/linuxfb/qlinuxfbintegration.h')
-rw-r--r-- | src/plugins/platforms/linuxfb/qlinuxfbintegration.h | 36 |
1 files changed, 10 insertions, 26 deletions
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h index 200cd81bd4..430375dbb6 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h @@ -39,38 +39,21 @@ ** ****************************************************************************/ -#ifndef QGRAPHICSSYSTEM_LINUXFB_H -#define QGRAPHICSSYSTEM_LINUXFB_H +#ifndef QLINUXFBINTEGRATION_H +#define QLINUXFBINTEGRATION_H #include <qpa/qplatformintegration.h> -#include "../fb_base/fb_base.h" -QT_BEGIN_NAMESPACE - -class QLinuxFbScreen : public QFbScreen -{ - Q_OBJECT -public: - QLinuxFbScreen(uchar * d, int w, int h, int lstep, QImage::Format screenFormat); - void setGeometry(QRect rect); - void setFormat(QImage::Format format); - -public slots: - QRegion doRedraw(); +#include <QtPlatformSupport/private/qfbscreen_p.h> -private: - QImage * mFbScreenImage; - uchar * data; - int bytesPerLine; - - QPainter *compositePainter; -}; +QT_BEGIN_NAMESPACE class QLinuxFbIntegrationPrivate; struct fb_cmap; struct fb_var_screeninfo; struct fb_fix_screeninfo; class QAbstractEventDispatcher; +class QLinuxFbScreen; class QLinuxFbIntegration : public QPlatformIntegration { @@ -81,9 +64,9 @@ public: bool hasCapability(QPlatformIntegration::Capability cap) const; QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const; - QPlatformWindow *createPlatformWindow(QWidget *widget, WId WinId) const; - QWindowSurface *createWindowSurface(QWidget *widget, WId WinId) const; - QAbstractEventDispatcher *createEventDispatcher() const; + QPlatformWindow *createPlatformWindow(QWindow *window) const; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const; + QAbstractEventDispatcher *guiThreadEventDispatcher() const; QList<QPlatformScreen *> screens() const { return mScreens; } @@ -134,4 +117,5 @@ private: QT_END_NAMESPACE -#endif +#endif // QLINUXFBINTEGRATION_H + |