5 files changed, 27 insertions, 2 deletions

diff --git a/Rules.make b/Rules.make
index 4833b11..a1e6f09 100644
--- a/Rules.make
+++ b/Rules.make
@@ -31,2 +31,5 @@ else
         endif
+ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
+        echo CONFIG += no-override >> $@
+endif
 
diff --git a/config.in b/config.in
index dac9024..ddbc93b 100644
--- a/config.in
+++ b/config.in
@@ -44,2 +44,6 @@ config QUICK_LAUNCH
 
+config OPIE_NO_OVERRIDE_QT
+  boolean "Build Opie against an unpatched version of Qt"
+  default n
+
 config SPECFILE
diff --git a/library/library.pro b/library/library.pro
index 80a0f62..ab1f451 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -120,2 +120,4 @@ SOURCES	=   calendar.cpp \
 
+
+
 # Qt 3 compatibility
@@ -151 +153,5 @@ TRANSLATIONS = ../i18n/de/libqpe.ts \
 include ( $(OPIEDIR)/include.pro )
+
+contains( CONFIG, no-override ){
+    DEFINES += OPIE_NO_OVERRIDE_QT
+}
diff --git a/library/qpeapplication.cpp b/library/qpeapplication.cpp
index 28fb13a..feba8b6 100644
--- a/library/qpeapplication.cpp
+++ b/library/qpeapplication.cpp
@@ -1127,2 +1127,3 @@ void QPEApplication::applyStyle()
     #if QT_VERSION > 233
+#if !defined(OPIE_NO_OVERRIDE_QT)
         // don't block ourselves ...
@@ -1140,2 +1141,5 @@ void QPEApplication::applyStyle()
         }
+#else
+        int nostyle = 0;
+#endif
 
@@ -1196,2 +1200,3 @@ void QPEApplication::applyStyle()
 
+#if !defined(OPIE_NO_OVERRIDE_QT)
         // revert to global blocking policy ...
@@ -1200,2 +1205,3 @@ void QPEApplication::applyStyle()
     #endif
+#endif
 }
diff --git a/library/qt_override.cpp b/library/qt_override.cpp
index edda874..df5a419 100644
--- a/library/qt_override.cpp
+++ b/library/qt_override.cpp
@@ -24,3 +24,3 @@ struct color_fix_t {
 
-
+#ifndef OPIE_NO_OVERRIDE_QT
 
@@ -75,2 +75,5 @@ const char *Opie::binaryName ( )
 
+#else
+int Opie::force_appearance = 0;
+#endif
 
@@ -96,2 +99,3 @@ void QPEApplication::polish ( QWidget *w )
 {
+#ifndef OPIE_NO_OVERRIDE_QT
         //qDebug ( "QPEApplication::polish()" );
@@ -107,2 +111,3 @@ void QPEApplication::polish ( QWidget *w )
         }
+#endif
         QApplication::polish ( w );
@@ -111,2 +116,3 @@ void QPEApplication::polish ( QWidget *w )
 
+#ifndef OPIE_NO_OVERRIDE_QT
 // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes
@@ -169,3 +175,3 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco )
 }
-
+#endif
 #endif
\ No newline at end of file