| author | zecke <zecke> | 2003-10-04 08:59:51 (UTC) |
|---|---|---|
| committer | zecke <zecke> | 2003-10-04 08:59:51 (UTC) |
| commit | dc9510f788212a6be063349461540e4bea690f51 (patch) (side-by-side diff) | |
| tree | b8728fdc12c1580287f16f3828180beac5d55c13 /library | |
| parent | 23f729eb7487ad189591c3b0c9af9d3afecd3b91 (diff) | |
| download | opie-dc9510f788212a6be063349461540e4bea690f51.zip opie-dc9510f788212a6be063349461540e4bea690f51.tar.gz opie-dc9510f788212a6be063349461540e4bea690f51.tar.bz2 | |
Allow Opie beeing build with a Plain version of Qt without weak symbols
| -rw-r--r-- | library/library.pro | 6 | ||||
| -rw-r--r-- | library/qpeapplication.cpp | 6 | ||||
| -rw-r--r-- | library/qt_override.cpp | 10 |
3 files changed, 20 insertions, 2 deletions
diff --git a/library/library.pro b/library/library.pro index 80a0f62..ab1f451 100644 --- a/library/library.pro +++ b/library/library.pro @@ -120,2 +120,4 @@ SOURCES = calendar.cpp \ + + # Qt 3 compatibility @@ -151 +153,5 @@ TRANSLATIONS = ../i18n/de/libqpe.ts \ include ( $(OPIEDIR)/include.pro ) + +contains( CONFIG, no-override ){ + DEFINES += OPIE_NO_OVERRIDE_QT +} diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 28fb13a..feba8b6 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -1127,2 +1127,3 @@ void QPEApplication::applyStyle() #if QT_VERSION > 233 +#if !defined(OPIE_NO_OVERRIDE_QT) // don't block ourselves ... @@ -1140,2 +1141,5 @@ void QPEApplication::applyStyle() } +#else + int nostyle = 0; +#endif @@ -1196,2 +1200,3 @@ void QPEApplication::applyStyle() +#if !defined(OPIE_NO_OVERRIDE_QT) // revert to global blocking policy ... @@ -1200,2 +1205,3 @@ void QPEApplication::applyStyle() #endif +#endif } diff --git a/library/qt_override.cpp b/library/qt_override.cpp index edda874..df5a419 100644 --- a/library/qt_override.cpp +++ b/library/qt_override.cpp @@ -24,3 +24,3 @@ struct color_fix_t { - +#ifndef OPIE_NO_OVERRIDE_QT @@ -75,2 +75,5 @@ const char *Opie::binaryName ( ) +#else +int Opie::force_appearance = 0; +#endif @@ -96,2 +99,3 @@ void QPEApplication::polish ( QWidget *w ) { +#ifndef OPIE_NO_OVERRIDE_QT // qDebug ( "QPEApplication::polish()" ); @@ -107,2 +111,3 @@ void QPEApplication::polish ( QWidget *w ) } +#endif QApplication::polish ( w ); @@ -111,2 +116,3 @@ void QPEApplication::polish ( QWidget *w ) +#ifndef OPIE_NO_OVERRIDE_QT // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes @@ -169,3 +175,3 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco ) } - +#endif #endif
\ No newline at end of file |