| author | zecke <zecke> | 2004-05-17 21:15:42 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-05-17 21:15:42 (UTC) |
| commit | 598c9bc76840120fa3efdb000461bae2c1fef639 (patch) (side-by-side diff) | |
| tree | 4cf0c66149f7bee38a2bcface9e7fbfd0d28b85a /library/qpeapplication.h | |
| parent | 1827ce23d0719a22c14613dc5859093818da1d0a (diff) | |
| download | opie-598c9bc76840120fa3efdb000461bae2c1fef639.zip opie-598c9bc76840120fa3efdb000461bae2c1fef639.tar.gz opie-598c9bc76840120fa3efdb000461bae2c1fef639.tar.bz2 | |
ich@opiezilla:~/programming/opie/head/opie$ nm lib/libopiecore2.so | grep polish
U _ZN14QPEApplication6polishEP7QWidget
ich@opiezilla:~/programming/opie/head/opie$ nm lib/libopiecore2.so | grep polish
U _ZN12QApplication6polishEP7QWidget
in qt_override we had to overwrite the Palette for some widgets for some styles (setting no
background liquid and such) we overwrote the polish method.
As we did not inherit from QPEApplication the 'polish' symbol was only internal to
libqpe and this way Opie apps worked on Opies and Sharps libqpe, and Sharp apps work
on our libqpe. Now with libopiecore the compiler tries to include different symbols as shown above.
So for now we could disable the legacy palette polishing which shouldn't hurt anyway.
OApplication is the source of all evil, we wouldn't 'pull' in the polish symbol... but having
a 'shadow' weak symbol as backup isn't good as well.
Chicken you may enable the option in config.in...
| -rw-r--r-- | library/qpeapplication.h | 4 |
1 files changed, 3 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,8 +164,10 @@ protected: void timerEvent( QTimerEvent * ); 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: #ifndef QT_NO_TRANSLATION |