| -rw-r--r-- | library/qpeapplication.cpp | 2 | ||||
| -rw-r--r-- | library/qpeapplication.h | 11 | ||||
| -rw-r--r-- | library/qt_override.cpp | 3 | ||||
| -rw-r--r-- | library/qt_override_p.h | 10 |
4 files changed, 19 insertions, 7 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp index f4db1ab..19adb00 100644 --- a/library/qpeapplication.cpp +++ b/library/qpeapplication.cpp @@ -962,4 +962,5 @@ void QPEApplication::applyStyle() config.setGroup( "Appearance" ); + #if QT_VERSION > 233 // don't block ourselves ... Opie::force_appearance = 0; @@ -1034,4 +1035,5 @@ void QPEApplication::applyStyle() Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; Opie::force_appearance &= ~nostyle; + #endif } diff --git a/library/qpeapplication.h b/library/qpeapplication.h index e35c008..65a6d33 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h @@ -119,7 +119,7 @@ protected: bool raiseAppropriateWindow(); virtual void tryQuit(); - +#if QT_VERSION > 233 virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) - +#endif private: #ifndef QT_NO_TRANSLATION @@ -184,8 +184,13 @@ inline Transformation DegToTrans ( int d ) inline void QPEApplication::setCurrentRotation( int r ) { + // setTransformation has been introduced in Qt/Embedded 2.3.4 snapshots + // for compatibility with the SharpROM use fallback to setDefaultTransformation() + #if QT_VERSION > 233 Transformation e = DegToTrans( r ); - setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 ); qApp->desktop()->qwsDisplay()->setTransformation( e ); + #else + setDefaultRotation( r ); + #endif } diff --git a/library/qt_override.cpp b/library/qt_override.cpp index 02c48a0..edda874 100644 --- a/library/qt_override.cpp +++ b/library/qt_override.cpp @@ -13,5 +13,5 @@ #include "qt_override_p.h" - +#if QT_VERSION > 233 struct color_fix_t { @@ -169,2 +169,3 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco ) } +#endif
\ No newline at end of file diff --git a/library/qt_override_p.h b/library/qt_override_p.h index d11917c..cb05d15 100644 --- a/library/qt_override_p.h +++ b/library/qt_override_p.h @@ -2,12 +2,14 @@ #define __QT_OVERRIDE_H__ +#if QT_VERSION > 233 + namespace Opie { - + enum ForceAppearance { Force_Style = 0x01, Force_Font = 0x02, Force_Decoration = 0x04, - - Force_All = 0xff, + + Force_All = 0xff, Force_None = 0x00, }; @@ -19,3 +21,5 @@ extern int force_appearance; } +#endif // (QT_VERSION >233) + #endif |