| -rw-r--r-- | library/qpeapplication.h | 2 | ||||
| -rw-r--r-- | library/qt_override.cpp | 9 |
2 files changed, 10 insertions, 1 deletions
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: void timerEvent( QTimerEvent * ); bool raiseAppropriateWindow(); virtual void tryQuit(); +#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: #ifndef QT_NO_TRANSLATION 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 @@ #if QT_VERSION > 233 +#ifndef OPIE_NO_ERASE_RECT_HACKFIX struct color_fix_t { char *m_app; char *m_class; @@ -20,7 +21,7 @@ struct color_fix_t { QColorGroup::ColorRole m_get; }; -#ifndef OPIE_NO_OVERRIDE_QT + static const color_fix_t apps_that_need_special_colors [] = { { "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base }, @@ -29,6 +30,10 @@ static const color_fix_t apps_that_need_special_colors [] = { { 0, 0, 0, QColorGroup::Base, QColorGroup::Base } }; +#endif + +#ifndef OPIE_NO_OVERRIDE_QT + static const char * const apps_that_need_pointsizes_times_10 [] = { "HancomMobileWord", "hancomsheet", @@ -89,6 +94,7 @@ 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 // TT made it an inline ...) @@ -110,6 +116,7 @@ void QPEApplication::polish ( QWidget *w ) #endif QApplication::polish ( w ); } +#endif #ifndef OPIE_NO_OVERRIDE_QT |