1 files changed, 8 insertions, 2 deletions

diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 28fb13a..feba8b6 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1103,62 +1103,66 @@ void QPEApplication::setCurrentMode( int x, int y, int depth )
         qwsServer->endDisplayReconfigure();
 
         // Get all the running apps to reset
         QCopEnvelope env( "QPE/System", "reset()" );
     }
 }
 
 void QPEApplication::reset() {
     // Reconnect to the screen
     qt_screen->disconnect();
     qt_screen->connect( QString::null );
 
     // Redraw everything
     applyStyle();
 }
 
 /*!
   \internal
 */
 void QPEApplication::applyStyle()
 {
         Config config( "qpe" );
         config.setGroup( "Appearance" );
 
-    #if QT_VERSION > 233
+#if QT_VERSION > 233
+#if !defined(OPIE_NO_OVERRIDE_QT)
         // don't block ourselves ...
         Opie::force_appearance = 0;
 
         static QString appname = Opie::binaryName ( );
 
         QStringList ex = config. readListEntry ( "NoStyle", ';' );
         int nostyle = 0;
         for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) {
                 if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) {
                         nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
                         break;
                 }
         }
+#else
+        int nostyle = 0;
+#endif
 
         // Widget style
         QString style = config.readEntry( "Style", "FlatStyle" );
 
         // don't set a custom style
         if ( nostyle & Opie::Force_Style )
                 style = "FlatStyle";
 
         internalSetStyle ( style );
 
         // Colors - from /etc/colors/Liquid.scheme
         QColor bgcolor( config.readEntry( "Background", "#E0E0E0" ) );
         QColor btncolor( config.readEntry( "Button", "#96c8fa" ) );
         QPalette pal( btncolor, bgcolor );
         QString color = config.readEntry( "Highlight", "#73adef" );
         pal.setColor( QColorGroup::Highlight, QColor( color ) );
         color = config.readEntry( "HighlightedText", "#FFFFFF" );
         pal.setColor( QColorGroup::HighlightedText, QColor( color ) );
         color = config.readEntry( "Text", "#000000" );
         pal.setColor( QColorGroup::Text, QColor( color ) );
         color = config.readEntry( "ButtonText", "#000000" );
         pal.setColor( QPalette::Active, QColorGroup::ButtonText, QColor( color ) );
         color = config.readEntry( "Base", "#FFFFFF" );
         pal.setColor( QColorGroup::Base, QColor( color ) );
@@ -1173,52 +1177,54 @@ void QPEApplication::applyStyle()
 
         // don't set a custom deco
         if ( nostyle & Opie::Force_Decoration )
                 dec = "";
 
         //qDebug ( "Setting Deco: %s -- old %s (%d)", dec.latin1(), d-> decorationName.latin1(), nostyle);
 
         if ( dec != d->decorationName ) {
                 qwsSetDecoration( new QPEDecoration( dec ) );
                 d->decorationName = dec;
         }
 
         // Font
         QString ff = config.readEntry( "FontFamily", font().family() );
         int fs = config.readNumEntry( "FontSize", font().pointSize() );
 
         // don't set a custom font
         if ( nostyle & Opie::Force_Font ) {
                 ff = "Vera";
                 fs = 10;
         }
 
         setFont ( QFont ( ff, fs ), true );
 
+#if !defined(OPIE_NO_OVERRIDE_QT)
         // revert to global blocking policy ...
         Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
         Opie::force_appearance &= ~nostyle;
-    #endif
+#endif
+#endif
 }
 
 void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
 {
 #ifdef Q_WS_QWS
         QDataStream stream( data, IO_ReadOnly );
         if ( msg == "applyStyle()" ) {
                 applyStyle();
         }
         else if ( msg == "toggleApplicationMenu()" ) {
                 QWidget *active = activeWindow ( );
 
                 if ( active ) {
                         QPEMenuToolFocusManager *man = QPEMenuToolFocusManager::manager ( );
                         bool oldactive = man-> isActive ( );
 
                         man-> setActive( !man-> isActive() );
 
                         if ( !oldactive && !man-> isActive ( )) { // no menubar to toggle -> try O-Menu
                                 QCopEnvelope e ( "QPE/TaskBar", "toggleStartMenu()" );
                         }
                 }
         }
         else if ( msg == "setDefaultRotation(int)" ) {