| -rw-r--r-- | library/qpeapplication.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index db8297f..cfe0497 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -1293,60 +1293,59 @@ void QPEApplication::setCurrentMode( int x, int y, int depth ) QPixmapCache::clear(); // Change the screen mode qt_screen->setMode(x, y, depth); if ( qApp->type() == GuiServer ) { // Reconfigure the GuiServer qwsServer->beginDisplayReconfigure(); 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(); } -#if QT_VERSION > 238 +#if (QT_VERSION < 238) & Q_OS_MACX +bool qt_left_hand_scrollbars = false; +#else #ifdef Q_OS_MACX #define WEAK_SYMBOL __attribute__((weak_import)) #else #define WEAK_SYMBOL __attribute__((weak)) #endif - extern bool qt_left_hand_scrollbars WEAK_SYMBOL; - -#else -bool qt_left_hand_scrollbars = false; #endif + /*! \internal */ void QPEApplication::applyStyle() { Config config( "qpe" ); config.setGroup( "Appearance" ); #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 |