author | mickeyl <mickeyl> | 2003-05-16 19:07:01 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-05-16 19:07:01 (UTC) |
commit | 1ac65aca5d1219e537238330501bc441dd2a3324 (patch) (unidiff) | |
tree | f60f613028dbef184e4b2fd31c5499d1e07c6e6b /library | |
parent | e7dc14955879dfabf5093b06784402c4525eed2a (diff) | |
download | opie-1ac65aca5d1219e537238330501bc441dd2a3324.zip opie-1ac65aca5d1219e537238330501bc441dd2a3324.tar.gz opie-1ac65aca5d1219e537238330501bc441dd2a3324.tar.bz2 |
enable opie to compile against a non-patched qt 2.3.2
to prepare the possibility of building an opie 1.0 feed for the sharp rom
-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 | 4 |
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 | |||
@@ -963,2 +963,3 @@ void QPEApplication::applyStyle() | |||
963 | 963 | ||
964 | #if QT_VERSION > 233 | ||
964 | // don't block ourselves ... | 965 | // don't block ourselves ... |
@@ -1035,2 +1036,3 @@ void QPEApplication::applyStyle() | |||
1035 | Opie::force_appearance &= ~nostyle; | 1036 | Opie::force_appearance &= ~nostyle; |
1037 | #endif | ||
1036 | } | 1038 | } |
diff --git a/library/qpeapplication.h b/library/qpeapplication.h index e35c008..65a6d33 100644 --- a/library/qpeapplication.h +++ b/library/qpeapplication.h | |||
@@ -120,5 +120,5 @@ protected: | |||
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: |
@@ -185,6 +185,11 @@ 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 | } |
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 | |||
@@ -14,3 +14,3 @@ | |||
14 | 14 | ||
15 | 15 | #if QT_VERSION > 233 | |
16 | 16 | ||
@@ -170 +170,2 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco ) | |||
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 | |||
@@ -3,2 +3,4 @@ | |||
3 | 3 | ||
4 | #if QT_VERSION > 233 | ||
5 | |||
4 | namespace Opie { | 6 | namespace Opie { |
@@ -20,2 +22,4 @@ extern int force_appearance; | |||
20 | 22 | ||
23 | #endif // (QT_VERSION >233) | ||
24 | |||
21 | #endif | 25 | #endif |