| 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/qpeapplication.cpp | |
| 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/qpeapplication.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index 28fb13a..feba8b6 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -1125,5 +1125,6 @@ void QPEApplication::applyStyle() config.setGroup( "Appearance" ); - #if QT_VERSION > 233 +#if QT_VERSION > 233 +#if !defined(OPIE_NO_OVERRIDE_QT) // don't block ourselves ... Opie::force_appearance = 0; @@ -1139,4 +1140,7 @@ void QPEApplication::applyStyle() } } +#else + int nostyle = 0; +#endif // Widget style @@ -1195,8 +1199,10 @@ void QPEApplication::applyStyle() setFont ( QFont ( ff, fs ), true ); +#if !defined(OPIE_NO_OVERRIDE_QT) // revert to global blocking policy ... Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; Opie::force_appearance &= ~nostyle; - #endif +#endif +#endif } |