author | eilers <eilers> | 2004-07-17 17:32:27 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-07-17 17:32:27 (UTC) |
commit | 0637a8d3c60bf4da6efb6c26edecfe613919c623 (patch) (unidiff) | |
tree | 0e4141b629906b0eadcd1cc78ea230142227d963 | |
parent | 7d8125ae8cfffe5a7292db1cd353633188ff04e6 (diff) | |
download | opie-0637a8d3c60bf4da6efb6c26edecfe613919c623.zip opie-0637a8d3c60bf4da6efb6c26edecfe613919c623.tar.gz opie-0637a8d3c60bf4da6efb6c26edecfe613919c623.tar.bz2 |
Ok.. MAC handles even weak symbols differently..
Now this should handle mac and linux with qte 2.3.7 and above ..
-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 | |||
@@ -1305,36 +1305,35 @@ void QPEApplication::setCurrentMode( int x, int y, int depth ) | |||
1305 | } | 1305 | } |
1306 | } | 1306 | } |
1307 | 1307 | ||
1308 | void QPEApplication::reset() { | 1308 | void QPEApplication::reset() { |
1309 | // Reconnect to the screen | 1309 | // Reconnect to the screen |
1310 | qt_screen->disconnect(); | 1310 | qt_screen->disconnect(); |
1311 | qt_screen->connect( QString::null ); | 1311 | qt_screen->connect( QString::null ); |
1312 | 1312 | ||
1313 | // Redraw everything | 1313 | // Redraw everything |
1314 | applyStyle(); | 1314 | applyStyle(); |
1315 | } | 1315 | } |
1316 | 1316 | ||
1317 | #if QT_VERSION > 238 | 1317 | #if (QT_VERSION < 238) & Q_OS_MACX |
1318 | bool qt_left_hand_scrollbars = false; | ||
1319 | #else | ||
1318 | #ifdef Q_OS_MACX | 1320 | #ifdef Q_OS_MACX |
1319 | #define WEAK_SYMBOL __attribute__((weak_import)) | 1321 | #define WEAK_SYMBOL __attribute__((weak_import)) |
1320 | #else | 1322 | #else |
1321 | #define WEAK_SYMBOL __attribute__((weak)) | 1323 | #define WEAK_SYMBOL __attribute__((weak)) |
1322 | #endif | 1324 | #endif |
1323 | |||
1324 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; | 1325 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; |
1325 | |||
1326 | #else | ||
1327 | bool qt_left_hand_scrollbars = false; | ||
1328 | #endif | 1326 | #endif |
1327 | |||
1329 | /*! | 1328 | /*! |
1330 | \internal | 1329 | \internal |
1331 | */ | 1330 | */ |
1332 | void QPEApplication::applyStyle() | 1331 | void QPEApplication::applyStyle() |
1333 | { | 1332 | { |
1334 | Config config( "qpe" ); | 1333 | Config config( "qpe" ); |
1335 | config.setGroup( "Appearance" ); | 1334 | config.setGroup( "Appearance" ); |
1336 | 1335 | ||
1337 | #if QT_VERSION > 233 | 1336 | #if QT_VERSION > 233 |
1338 | #if !defined(OPIE_NO_OVERRIDE_QT) | 1337 | #if !defined(OPIE_NO_OVERRIDE_QT) |
1339 | // don't block ourselves ... | 1338 | // don't block ourselves ... |
1340 | Opie::force_appearance = 0; | 1339 | Opie::force_appearance = 0; |