projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add demo application.
[bertos.git]
/
drv
/
lcd_gfx_qt.h
diff --git
a/drv/lcd_gfx_qt.h
b/drv/lcd_gfx_qt.h
index b6864e439bb01582f5a91f7b8eff2a22f80f944a..642dc7e8311d1e59397006c3dcdbf0b226d1f76c 100755
(executable)
--- a/
drv/lcd_gfx_qt.h
+++ b/
drv/lcd_gfx_qt.h
@@
-14,6
+14,9
@@
/*#*
*#* $Log$
/*#*
*#* $Log$
+ *#* Revision 1.4 2006/02/20 02:00:40 bernie
+ *#* Port to Qt 4.1.
+ *#*
*#* Revision 1.3 2006/02/15 09:13:16 bernie
*#* Switch to BITMAP_FMT_PLANAR_V_LSB.
*#*
*#* Revision 1.3 2006/02/15 09:13:16 bernie
*#* Switch to BITMAP_FMT_PLANAR_V_LSB.
*#*
@@
-28,8
+31,13
@@
#ifndef DRV_LCD_GFX_QT_H
#define DRV_LCD_GFX_QT_H
#ifndef DRV_LCD_GFX_QT_H
#define DRV_LCD_GFX_QT_H
-#include <qframe.h>
-#include <qcolor.h>
+#if _QT < 4
+ #include <qframe.h>
+ #include <qcolor.h>
+#else
+ #include <QtGui/QColor>
+ #include <QtGui/QFrame>
+#endif
// fwd decls
class QSizePolicy;
// fwd decls
class QSizePolicy;
@@
-53,8
+61,7
@@
public:
protected:
virtual QSizePolicy sizePolicy() const;
virtual QSize sizeHint() const;
protected:
virtual QSizePolicy sizePolicy() const;
virtual QSize sizeHint() const;
-// virtual void paintEvent(QPaintEvent *event);
- virtual void drawContents(QPainter *p);
+ virtual void paintEvent(QPaintEvent *event);
// Operations
public:
// Operations
public: