| author | zecke <zecke> | 2004-10-15 19:23:42 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2004-10-15 19:23:42 (UTC) |
| commit | ac36bfe2794741188da1d6d4b471f96fd15d47ee (patch) (side-by-side diff) | |
| tree | 5c1bc264fd554142993be8963aed159f32877d6a /library/qpeapplication.cpp | |
| parent | a979ea08e8f9dbade70a9bf4fdc93dcbebb5f3fa (diff) | |
| download | opie-ac36bfe2794741188da1d6d4b471f96fd15d47ee.zip opie-ac36bfe2794741188da1d6d4b471f96fd15d47ee.tar.gz opie-ac36bfe2794741188da1d6d4b471f96fd15d47ee.tar.bz2 | |
-Add a QPEGLOBAL that adds define for 'weak', 'used' and unused symbols
Make use of the newly added qpeglobal.h to kill custom versions of
similiar macros
| -rw-r--r-- | library/qpeapplication.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index df313ce..3efba20 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -87,8 +87,9 @@ #include "applnk.h" #include "qpemenubar.h" #include "textcodecinterface.h" #include "imagecodecinterface.h" +#include <qtopia/qpeglobal.h> #include <unistd.h> #include <sys/file.h> #include <sys/ioctl.h> @@ -1293,14 +1294,9 @@ void QPEApplication::reset() { #if (QT_VERSION < 238) && defined 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; +extern bool qt_left_hand_scrollbars QPE_WEAK_SYMBOL; #endif /*! \internal |