summaryrefslogtreecommitdiff
authoreilers <eilers>2004-07-17 17:32:27 (UTC)
committer eilers <eilers>2004-07-17 17:32:27 (UTC)
commit0637a8d3c60bf4da6efb6c26edecfe613919c623 (patch) (unidiff)
tree0e4141b629906b0eadcd1cc78ea230142227d963
parent7d8125ae8cfffe5a7292db1cd353633188ff04e6 (diff)
downloadopie-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 ..
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--library/qpeapplication.cpp9
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
@@ -1311,24 +1311,23 @@ void QPEApplication::reset() {
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
1318bool 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
1324extern bool qt_left_hand_scrollbars WEAK_SYMBOL; 1325extern bool qt_left_hand_scrollbars WEAK_SYMBOL;
1325
1326#else
1327bool qt_left_hand_scrollbars = false;
1328#endif 1326#endif
1327
1329/*! 1328/*!
1330 \internal 1329 \internal
1331*/ 1330*/
1332void QPEApplication::applyStyle() 1331void QPEApplication::applyStyle()
1333{ 1332{
1334 Config config( "qpe" ); 1333 Config config( "qpe" );