| -rw-r--r-- | library/qpeapplication.h | 4 | ||||
| -rw-r--r-- | library/qt_override.cpp | 9 |
2 files changed, 11 insertions, 2 deletions
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index 8c85ad0..d2782e4 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h @@ -165,6 +165,8 @@ protected: bool raiseAppropriateWindow(); 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 private: 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 @@ -13,4 +13,5 @@ #if QT_VERSION > 233 +#ifndef OPIE_NO_ERASE_RECT_HACKFIX struct color_fix_t { char *m_app; @@ -21,5 +22,5 @@ struct color_fix_t { }; -#ifndef OPIE_NO_OVERRIDE_QT + static const color_fix_t apps_that_need_special_colors [] = { @@ -30,4 +31,8 @@ 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 [] = { "HancomMobileWord", @@ -90,4 +95,5 @@ extern void __gmon_start__ ( ) +#ifndef OPIE_NO_ERASE_RECT_HACKFIX // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles // that set a background pixmap (it would be easier to fix eraseRect(), but @@ -111,4 +117,5 @@ void QPEApplication::polish ( QWidget *w ) QApplication::polish ( w ); } +#endif |