| -rw-r--r-- | Rules.make | 3 | ||||
| -rw-r--r-- | config.in | 4 | ||||
| -rw-r--r-- | library/qpeapplication.h | 4 | ||||
| -rw-r--r-- | library/qt_override.cpp | 9 |
4 files changed, 18 insertions, 2 deletions
@@ -50,2 +50,5 @@ ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) endif +ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) + echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ +endif ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) @@ -108,2 +108,6 @@ config OPIE_NO_OVERRIDE_QT +config OPIE_NO_ERASERECT_FIX + boolean "Disable Fixup eraseRect for HancomMobileWord,neocal.. to make libopiecore work on Sharps libqpe" + default n + config OPIE_NO_BUILTIN_SHUTDOWN diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 8c85ad0..d2782e4 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h @@ -166,4 +166,6 @@ protected: virtual void tryQuit(); -#if QT_VERSION > 233 +#ifndef OPIE_NO_ERASE_RECT_HACKFIX + #if QT_VERSION > 233 virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) + #endif #endif 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 @@ -14,2 +14,3 @@ +#ifndef OPIE_NO_ERASE_RECT_HACKFIX struct color_fix_t { @@ -22,3 +23,3 @@ struct color_fix_t { -#ifndef OPIE_NO_OVERRIDE_QT + @@ -31,2 +32,6 @@ static const color_fix_t apps_that_need_special_colors [] = { +#endif + +#ifndef OPIE_NO_OVERRIDE_QT + static const char * const apps_that_need_pointsizes_times_10 [] = { @@ -91,2 +96,3 @@ extern void __gmon_start__ ( ) +#ifndef OPIE_NO_ERASE_RECT_HACKFIX // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles @@ -112,2 +118,3 @@ void QPEApplication::polish ( QWidget *w ) } +#endif |