author | zecke <zecke> | 2004-06-27 19:36:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-06-27 19:36:48 (UTC) |
commit | 78cd13f15c6057e18b6f095841a90bb438dd6fd2 (patch) (side-by-side diff) | |
tree | 08376c584867032bc4fa5725467d46615b02e700 /library | |
parent | 0ef75ca5409d290df36d1c0bbf0413e37bfd4124 (diff) | |
download | opie-78cd13f15c6057e18b6f095841a90bb438dd6fd2.zip opie-78cd13f15c6057e18b6f095841a90bb438dd6fd2.tar.gz opie-78cd13f15c6057e18b6f095841a90bb438dd6fd2.tar.bz2 |
Safe eilers some time for weak symbols on MacOS X
-rw-r--r-- | library/qpeapplication.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 4bc0c5f..b686e2e 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -1292,49 +1292,55 @@ void QPEApplication::setCurrentMode( int x, int y, int depth ) // 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(); } -extern bool qt_left_hand_scrollbars __attribute__(( weak )); +#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; /*! \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 |