-rw-r--r-- | Rules.make | 3 | ||||
-rw-r--r-- | config.in | 4 | ||||
-rw-r--r-- | library/qpeapplication.h | 2 | ||||
-rw-r--r-- | library/qt_override.cpp | 9 |
4 files changed, 17 insertions, 1 deletions
@@ -48,6 +48,9 @@ endif | |||
48 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) | 48 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) |
49 | echo CONFIG += no-override >> $@ | 49 | echo CONFIG += no-override >> $@ |
50 | endif | 50 | endif |
51 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) | ||
52 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ | ||
53 | endif | ||
51 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) | 54 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) |
52 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ | 55 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ |
53 | endif | 56 | endif |
@@ -106,6 +106,10 @@ config OPIE_NO_OVERRIDE_QT | |||
106 | boolean "Build Opie against an unpatched version of Qt" | 106 | boolean "Build Opie against an unpatched version of Qt" |
107 | default n | 107 | default n |
108 | 108 | ||
109 | config OPIE_NO_ERASERECT_FIX | ||
110 | boolean "Disable Fixup eraseRect for HancomMobileWord,neocal.. to make libopiecore work on Sharps libqpe" | ||
111 | default n | ||
112 | |||
109 | config OPIE_NO_BUILTIN_SHUTDOWN | 113 | config OPIE_NO_BUILTIN_SHUTDOWN |
110 | boolean "Disable the built in shutdown application" | 114 | boolean "Disable the built in shutdown application" |
111 | default y | 115 | default y |
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 8c85ad0..d2782e4 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -164,9 +164,11 @@ protected: | |||
164 | void timerEvent( QTimerEvent * ); | 164 | void timerEvent( QTimerEvent * ); |
165 | bool raiseAppropriateWindow(); | 165 | bool raiseAppropriateWindow(); |
166 | virtual void tryQuit(); | 166 | virtual void tryQuit(); |
167 | #ifndef OPIE_NO_ERASE_RECT_HACKFIX | ||
167 | #if QT_VERSION > 233 | 168 | #if QT_VERSION > 233 |
168 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) | 169 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) |
169 | #endif | 170 | #endif |
171 | #endif | ||
170 | private: | 172 | private: |
171 | #ifndef QT_NO_TRANSLATION | 173 | #ifndef QT_NO_TRANSLATION |
172 | void installTranslation( const QString& baseName ); | 174 | void installTranslation( const QString& baseName ); |
diff --git a/library/qt_override.cpp b/library/qt_override.cpp index 4d1f475..56f82d7 100644 --- a/library/qt_override.cpp +++ b/library/qt_override.cpp | |||
@@ -12,6 +12,7 @@ | |||
12 | 12 | ||
13 | #if QT_VERSION > 233 | 13 | #if QT_VERSION > 233 |
14 | 14 | ||
15 | #ifndef OPIE_NO_ERASE_RECT_HACKFIX | ||
15 | struct color_fix_t { | 16 | struct color_fix_t { |
16 | char *m_app; | 17 | char *m_app; |
17 | char *m_class; | 18 | char *m_class; |
@@ -20,7 +21,7 @@ struct color_fix_t { | |||
20 | QColorGroup::ColorRole m_get; | 21 | QColorGroup::ColorRole m_get; |
21 | }; | 22 | }; |
22 | 23 | ||
23 | #ifndef OPIE_NO_OVERRIDE_QT | 24 | |
24 | 25 | ||
25 | static const color_fix_t apps_that_need_special_colors [] = { | 26 | static const color_fix_t apps_that_need_special_colors [] = { |
26 | { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base }, | 27 | { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base }, |
@@ -29,6 +30,10 @@ static const color_fix_t apps_that_need_special_colors [] = { | |||
29 | { 0, 0, 0, QColorGroup::Base, QColorGroup::Base } | 30 | { 0, 0, 0, QColorGroup::Base, QColorGroup::Base } |
30 | }; | 31 | }; |
31 | 32 | ||
33 | #endif | ||
34 | |||
35 | #ifndef OPIE_NO_OVERRIDE_QT | ||
36 | |||
32 | static const char * const apps_that_need_pointsizes_times_10 [] = { | 37 | static const char * const apps_that_need_pointsizes_times_10 [] = { |
33 | "HancomMobileWord", | 38 | "HancomMobileWord", |
34 | "hancomsheet", | 39 | "hancomsheet", |
@@ -89,6 +94,7 @@ extern void __gmon_start__ ( ) | |||
89 | } | 94 | } |
90 | 95 | ||
91 | 96 | ||
97 | #ifndef OPIE_NO_ERASE_RECT_HACKFIX | ||
92 | // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles | 98 | // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles |
93 | // that set a background pixmap (it would be easier to fix eraseRect(), but | 99 | // that set a background pixmap (it would be easier to fix eraseRect(), but |
94 | // TT made it an inline ...) | 100 | // TT made it an inline ...) |
@@ -110,6 +116,7 @@ void QPEApplication::polish ( QWidget *w ) | |||
110 | #endif | 116 | #endif |
111 | QApplication::polish ( w ); | 117 | QApplication::polish ( w ); |
112 | } | 118 | } |
119 | #endif | ||
113 | 120 | ||
114 | 121 | ||
115 | #ifndef OPIE_NO_OVERRIDE_QT | 122 | #ifndef OPIE_NO_OVERRIDE_QT |