summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--library/qpeapplication.cpp2
-rw-r--r--library/qpeapplication.h11
-rw-r--r--library/qt_override.cpp3
-rw-r--r--library/qt_override_p.h4
4 files changed, 16 insertions, 4 deletions
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index f4db1ab..19adb00 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -961,6 +961,7 @@ void QPEApplication::applyStyle()
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
@@ -1033,6 +1034,7 @@ void QPEApplication::applyStyle()
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
1038void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data ) 1040void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
diff --git a/library/qpeapplication.h b/library/qpeapplication.h
index e35c008..65a6d33 100644
--- a/library/qpeapplication.h
+++ b/library/qpeapplication.h
@@ -118,9 +118,9 @@ protected:
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
124private: 124private:
125#ifndef QT_NO_TRANSLATION 125#ifndef QT_NO_TRANSLATION
126 void installTranslation( const QString& baseName ); 126 void installTranslation( const QString& baseName );
@@ -183,10 +183,15 @@ inline Transformation DegToTrans ( int d )
183 183
184inline void QPEApplication::setCurrentRotation( int r ) 184inline 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
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
@@ -12,7 +12,7 @@
12 12
13#include "qt_override_p.h" 13#include "qt_override_p.h"
14 14
15 15#if QT_VERSION > 233
16 16
17struct color_fix_t { 17struct color_fix_t {
18 char *m_app; 18 char *m_app;
@@ -168,3 +168,4 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco )
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,6 +1,8 @@
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
4namespace Opie { 6namespace Opie {
5 7
6enum ForceAppearance { 8enum ForceAppearance {
@@ -18,4 +20,6 @@ extern int force_appearance;
18 20
19} 21}
20 22
23#endif // (QT_VERSION >233)
24
21#endif 25#endif