-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 | |||
@@ -960,8 +960,9 @@ void QPEApplication::applyStyle() | |||
960 | { | 960 | { |
961 | Config config( "qpe" ); | 961 | Config config( "qpe" ); |
962 | config.setGroup( "Appearance" ); | 962 | config.setGroup( "Appearance" ); |
963 | 963 | ||
964 | #if QT_VERSION > 233 | ||
964 | // don't block ourselves ... | 965 | // don't block ourselves ... |
965 | Opie::force_appearance = 0; | 966 | Opie::force_appearance = 0; |
966 | 967 | ||
967 | static QString appname = Opie::binaryName ( ); | 968 | static QString appname = Opie::binaryName ( ); |
@@ -1032,8 +1033,9 @@ void QPEApplication::applyStyle() | |||
1032 | 1033 | ||
1033 | // revert to global blocking policy ... | 1034 | // revert to global blocking policy ... |
1034 | Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; | 1035 | Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None; |
1035 | Opie::force_appearance &= ~nostyle; | 1036 | Opie::force_appearance &= ~nostyle; |
1037 | #endif | ||
1036 | } | 1038 | } |
1037 | 1039 | ||
1038 | void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) | 1040 | void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) |
1039 | { | 1041 | { |
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index e35c008..65a6d33 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -117,11 +117,11 @@ protected: | |||
117 | bool eventFilter( QObject *, QEvent * ); | 117 | bool eventFilter( QObject *, QEvent * ); |
118 | void timerEvent( QTimerEvent * ); | 118 | void timerEvent( QTimerEvent * ); |
119 | bool raiseAppropriateWindow(); | 119 | bool raiseAppropriateWindow(); |
120 | virtual void tryQuit(); | 120 | virtual void tryQuit(); |
121 | 121 | #if QT_VERSION > 233 | |
122 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) | 122 | virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!) |
123 | 123 | #endif | |
124 | private: | 124 | private: |
125 | #ifndef QT_NO_TRANSLATION | 125 | #ifndef QT_NO_TRANSLATION |
126 | void installTranslation( const QString& baseName ); | 126 | void installTranslation( const QString& baseName ); |
127 | #endif | 127 | #endif |
@@ -182,12 +182,17 @@ inline Transformation DegToTrans ( int d ) | |||
182 | */ | 182 | */ |
183 | 183 | ||
184 | inline void QPEApplication::setCurrentRotation( int r ) | 184 | inline void QPEApplication::setCurrentRotation( int r ) |
185 | { | 185 | { |
186 | // setTransformation has been introduced in Qt/Embedded 2.3.4 snapshots | ||
187 | // for compatibility with the SharpROM use fallback to setDefaultTransformation() | ||
188 | #if QT_VERSION > 233 | ||
186 | Transformation e = DegToTrans( r ); | 189 | Transformation e = DegToTrans( r ); |
187 | |||
188 | setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 ); | 190 | setenv( "QWS_DISPLAY", QString( "Transformed:Rot%1:0" ).arg( r ).latin1(), 1 ); |
189 | qApp->desktop()->qwsDisplay()->setTransformation( e ); | 191 | qApp->desktop()->qwsDisplay()->setTransformation( e ); |
192 | #else | ||
193 | setDefaultRotation( r ); | ||
194 | #endif | ||
190 | } | 195 | } |
191 | 196 | ||
192 | 197 | ||
193 | #endif | 198 | #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 | |||
@@ -11,9 +11,9 @@ | |||
11 | #include <sys/param.h> // for toolchains with old libc headers | 11 | #include <sys/param.h> // for toolchains with old libc headers |
12 | 12 | ||
13 | #include "qt_override_p.h" | 13 | #include "qt_override_p.h" |
14 | 14 | ||
15 | 15 | #if QT_VERSION > 233 | |
16 | 16 | ||
17 | struct color_fix_t { | 17 | struct color_fix_t { |
18 | char *m_app; | 18 | char *m_app; |
19 | char *m_class; | 19 | char *m_class; |
@@ -167,4 +167,5 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco ) | |||
167 | else | 167 | else |
168 | QApplication::qwsSetDecoration_NonWeak ( deco ); | 168 | QApplication::qwsSetDecoration_NonWeak ( deco ); |
169 | } | 169 | } |
170 | 170 | ||
171 | #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 | |||
@@ -1,15 +1,17 @@ | |||
1 | #ifndef __QT_OVERRIDE_H__ | 1 | #ifndef __QT_OVERRIDE_H__ |
2 | #define __QT_OVERRIDE_H__ | 2 | #define __QT_OVERRIDE_H__ |
3 | 3 | ||
4 | #if QT_VERSION > 233 | ||
5 | |||
4 | namespace Opie { | 6 | namespace Opie { |
5 | 7 | ||
6 | enum ForceAppearance { | 8 | enum ForceAppearance { |
7 | Force_Style = 0x01, | 9 | Force_Style = 0x01, |
8 | Force_Font = 0x02, | 10 | Force_Font = 0x02, |
9 | Force_Decoration = 0x04, | 11 | Force_Decoration = 0x04, |
10 | 12 | ||
11 | Force_All = 0xff, | 13 | Force_All = 0xff, |
12 | Force_None = 0x00, | 14 | Force_None = 0x00, |
13 | }; | 15 | }; |
14 | 16 | ||
15 | extern const char *binaryName ( ); | 17 | extern const char *binaryName ( ); |
@@ -17,5 +19,7 @@ extern const char *binaryName ( ); | |||
17 | extern int force_appearance; | 19 | extern int force_appearance; |
18 | 20 | ||
19 | } | 21 | } |
20 | 22 | ||
23 | #endif // (QT_VERSION >233) | ||
24 | |||
21 | #endif | 25 | #endif |