author | eilers <eilers> | 2004-07-17 17:11:30 (UTC) |
---|---|---|
committer | eilers <eilers> | 2004-07-17 17:11:30 (UTC) |
commit | 7d8125ae8cfffe5a7292db1cd353633188ff04e6 (patch) (unidiff) | |
tree | 5f1436261a19621c3ceec8c5cb65475652ba878e /library | |
parent | e917f3763a0beb6d540adbfa5f59e478d3baec64 (diff) | |
download | opie-7d8125ae8cfffe5a7292db1cd353633188ff04e6.zip opie-7d8125ae8cfffe5a7292db1cd353633188ff04e6.tar.gz opie-7d8125ae8cfffe5a7292db1cd353633188ff04e6.tar.bz2 |
Make it compileable if just qte 2.3.7 is available.
Weak symbols just protect us against unresolved symbols at runtime. But, if it
is unresolved at compile time, linking will fail !
-rw-r--r-- | library/qpeapplication.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f4a7f74..db8297f 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp | |||
@@ -1301,40 +1301,44 @@ void QPEApplication::setCurrentMode( int x, int y, int depth ) | |||
1301 | qwsServer->endDisplayReconfigure(); | 1301 | qwsServer->endDisplayReconfigure(); |
1302 | 1302 | ||
1303 | // Get all the running apps to reset | 1303 | // Get all the running apps to reset |
1304 | QCopEnvelope env( "QPE/System", "reset()" ); | 1304 | QCopEnvelope env( "QPE/System", "reset()" ); |
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 | 1317 | #if QT_VERSION > 238 | |
1318 | #ifdef Q_OS_MACX | 1318 | #ifdef Q_OS_MACX |
1319 | #define WEAK_SYMBOL __attribute__((weak_import)) | 1319 | #define WEAK_SYMBOL __attribute__((weak_import)) |
1320 | #else | 1320 | #else |
1321 | #define WEAK_SYMBOL __attribute__((weak)) | 1321 | #define WEAK_SYMBOL __attribute__((weak)) |
1322 | #endif | 1322 | #endif |
1323 | 1323 | ||
1324 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; | 1324 | extern bool qt_left_hand_scrollbars WEAK_SYMBOL; |
1325 | |||
1326 | #else | ||
1327 | bool qt_left_hand_scrollbars = false; | ||
1328 | #endif | ||
1325 | /*! | 1329 | /*! |
1326 | \internal | 1330 | \internal |
1327 | */ | 1331 | */ |
1328 | void QPEApplication::applyStyle() | 1332 | void QPEApplication::applyStyle() |
1329 | { | 1333 | { |
1330 | Config config( "qpe" ); | 1334 | Config config( "qpe" ); |
1331 | config.setGroup( "Appearance" ); | 1335 | config.setGroup( "Appearance" ); |
1332 | 1336 | ||
1333 | #if QT_VERSION > 233 | 1337 | #if QT_VERSION > 233 |
1334 | #if !defined(OPIE_NO_OVERRIDE_QT) | 1338 | #if !defined(OPIE_NO_OVERRIDE_QT) |
1335 | // don't block ourselves ... | 1339 | // don't block ourselves ... |
1336 | Opie::force_appearance = 0; | 1340 | Opie::force_appearance = 0; |
1337 | 1341 | ||
1338 | static QString appname = Opie::binaryName ( ); | 1342 | static QString appname = Opie::binaryName ( ); |
1339 | 1343 | ||
1340 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); | 1344 | QStringList ex = config. readListEntry ( "NoStyle", ';' ); |