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

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
@@ -963,2 +963,3 @@ void QPEApplication::applyStyle()
 
+    #if QT_VERSION > 233
 	// don't block ourselves ...
@@ -1035,2 +1036,3 @@ void QPEApplication::applyStyle()
 	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
@@ -120,5 +120,5 @@ protected:
     virtual void tryQuit();
-
+#if QT_VERSION > 233
     virtual void polish ( QWidget * ); // this is actually implemented in qt_override.cpp (!)
-
+#endif
 private:
@@ -185,6 +185,11 @@ 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
@@ -14,3 +14,3 @@
 
-
+#if QT_VERSION > 233
 
@@ -170 +170,2 @@ 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
@@ -3,4 +3,6 @@
 
+#if QT_VERSION > 233
+
 namespace Opie {
-	
+
 enum ForceAppearance {
@@ -9,4 +11,4 @@ enum ForceAppearance {
 	Force_Decoration = 0x04,
-	
-	Force_All        = 0xff, 
+
+	Force_All        = 0xff,
 	Force_None       = 0x00,
@@ -20,2 +22,4 @@ extern int force_appearance;
 
+#endif // (QT_VERSION >233)
+
 #endif