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...

1 files changed, 2 insertions, 0 deletions

diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index 8c85ad0..d2782e4 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -103,131 +103,133 @@ public:
     static StylusMode stylusOperation( QWidget* );
 
     enum InputMethodHint {
         Normal,
         AlwaysOff,
         AlwaysOn
     };
 
     enum screenSaverHint {
         Disable = 0,
         DisableLightOff = 1,
         DisableSuspend = 2,
         Enable = 100
     };
 
     static void setInputMethodHint( QWidget *, InputMethodHint );
     static InputMethodHint inputMethodHint( QWidget * );
 
     void showMainWidget( QWidget*, bool nomax=FALSE );
     void showMainDocumentWidget( QWidget*, bool nomax=FALSE );
     static void showDialog( QDialog*, bool nomax=FALSE );
     static int execDialog( QDialog*, bool nomax=FALSE );
     static void showWidget( QWidget*, bool nomax=FALSE );
     /* Merge setTempScreenSaverMode */
 #ifdef QTOPIA_INTERNAL_INITAPP
     void initApp( int argv, char **argv );
 #endif
 
     static void setKeepRunning();
     bool keepRunning() const;
 
     bool keyboardGrabbed() const;
 
     int exec();
 
 signals:
     void clientMoused();
     void timeChanged();
     void clockChanged( bool pm );
     void micChanged( bool muted );
     void volumeChanged( bool muted );
     void appMessage( const QCString& msg, const QByteArray& data);
     void weekChanged( bool startOnMonday );
     void dateFormatChanged( DateFormat );
     void flush();
     void reload();
     /* linkChanged signal */
 
 private slots:
     void systemMessage( const QCString &msg, const QByteArray &data );
     void pidMessage( const QCString &msg, const QByteArray &data );
     void removeSenderFromStylusDict();
     void hideOrQuit();
 
 protected:
     bool qwsEventFilter( QWSEvent * );
     void internalSetStyle( const QString &style );
     void prepareForTermination(bool willrestart);
     virtual void restart();
     virtual void shutdown();
     bool eventFilter( QObject *, QEvent * );
     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 );
 #endif
     void mapToDefaultAction( QWSKeyEvent *ke, int defKey );
     void processQCopFile();
 
 #if defined(Q_WS_QWS) && !defined(QT_NO_COP)
     QCopChannel *sysChannel;
     QCopChannel *pidChannel;
 #endif
     QPEApplicationData *d;
 
     bool reserved_sh;
 
 
 
 };
 
 inline void QPEApplication::showDialog( QDialog* d, bool nomax )
 {
     showWidget( d, nomax );
 }
 
 inline int QPEApplication::execDialog( QDialog* d, bool nomax )
 {
     showDialog( d, nomax );
     return d->exec();
 }
 
 #ifdef Q_WS_QWS
 extern Q_EXPORT QRect qt_maxWindowRect;
 #endif
 
 inline void QPEApplication::showWidget( QWidget* wg, bool nomax )
 {
     if ( wg->isVisible() )
         wg->show();
     else
     {
         if ( !nomax
                 && ( qApp->desktop()->width() <= 320 ) )
         {
             wg->showMaximized();
         } else {
             #ifdef Q_WS_QWS
                 QSize desk = QSize( qApp->desktop()->width(), qApp->desktop()->height() );
             #else
                 QSize desk = QSize( qt_maxWindowRect.width(), qt_maxWindowRect.height() );
             #endif
 
             QSize sh = wg->sizeHint();
             int w = QMAX( sh.width(), wg->width() );
             int h = QMAX( sh.height(), wg->height() );
             //              desktop                              widget-frame                      taskbar
             w = QMIN( w, ( desk.width() - ( wg->frameGeometry().width() - wg->geometry().width() ) - 25 ) );
             h = QMIN( h, ( desk.height() - ( wg->frameGeometry().height() - wg->geometry().height() ) - 25 ) );
 
             wg->resize( w, h );
             wg->show();
         }
     }
 }