Allow Opie beeing build with a Plain version of Qt without weak symbols

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
@@ -28,8 +28,11 @@ else
 	echo CONFIG -= quick-app >> $@
 	echo CONFIG += quick-app-bin >> $@
 	echo \} >> $@
 endif	
+ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
+	echo CONFIG += no-override >> $@
+endif
 
 $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
 	@echo Generating dependency information...
 # add to subdir-y, and add descend rules
diff --git a/config.in b/config.in
index dac9024..ddbc93b 100644
--- a/config.in
+++ b/config.in
@@ -41,8 +41,12 @@ config RELEASE
 config QUICK_LAUNCH
   boolean "Enable Quick Launch"
   default n
 
+config OPIE_NO_OVERRIDE_QT
+  boolean "Build Opie against an unpatched version of Qt"
+  default n
+
 config SPECFILE
   string
   default "qws/linux-generic-g++" if TARGET_X86 && (! X11)
   default "linux-g++" if TARGET_X86 && X11
diff --git a/library/library.pro b/library/library.pro
index 80a0f62..ab1f451 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -117,8 +117,10 @@ SOURCES	=   calendar.cpp \
 	finddialog.cpp \
 	lnkproperties.cpp \
 	qt_override.cpp
 
+
+
 # Qt 3 compatibility
 HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h
 SOURCES += quuid.cpp qlibrary.cpp qlibrary_unix.cpp
 INCLUDEPATH += $(OPIEDIR)/include backend
@@ -148,4 +150,8 @@ TRANSLATIONS = ../i18n/de/libqpe.ts \
 	 ../i18n/da/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
@@ -1124,8 +1124,9 @@ void QPEApplication::applyStyle()
 	Config config( "qpe" );
 	config.setGroup( "Appearance" );
 
     #if QT_VERSION > 233
+#if !defined(OPIE_NO_OVERRIDE_QT)
 	// don't block ourselves ...
 	Opie::force_appearance = 0;
 
 	static QString appname = Opie::binaryName ( );
@@ -1137,8 +1138,11 @@ void QPEApplication::applyStyle()
 			nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
 			break;
 		}
 	}
+#else
+        int nostyle = 0;
+#endif
 
 	// Widget style
 	QString style = config.readEntry( "Style", "FlatStyle" );
 
@@ -1193,12 +1197,14 @@ void QPEApplication::applyStyle()
 	}
 
 	setFont ( QFont ( ff, fs ), true );
 
+#if !defined(OPIE_NO_OVERRIDE_QT)
 	// revert to global blocking policy ...
 	Opie::force_appearance = config. readBoolEntry ( "ForceStyle", false ) ? Opie::Force_All : Opie::Force_None;
 	Opie::force_appearance &= ~nostyle;
     #endif
+#endif
 }
 
 void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
 {
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
@@ -21,9 +21,9 @@ struct color_fix_t {
 	QColorGroup::ColorRole m_set;
 	QColorGroup::ColorRole m_get;
 };
 
-
+#ifndef OPIE_NO_OVERRIDE_QT
 
 static const color_fix_t apps_that_need_special_colors [] = {
 	{ "HancomMobileWord", "HTextEdit", 0, QColorGroup::Background, QColorGroup::Base },
 	{ "neocal", "Display", 0, QColorGroup::Background, QColorGroup::Base },
@@ -72,8 +72,11 @@ const char *Opie::binaryName ( )
 	}	
 	return appname;
 }
 
+#else
+int Opie::force_appearance = 0;
+#endif
 
 // Fix for a toolchain incompatibility (binaries compiled with 
 // old tcs using shared libs compiled with newer tcs)
 
@@ -93,8 +96,9 @@ extern void __gmon_start__ ( )
 // TT made it an inline ...)
 
 void QPEApplication::polish ( QWidget *w )
 {
+#ifndef OPIE_NO_OVERRIDE_QT
 //	qDebug ( "QPEApplication::polish()" );
 
 	for ( const color_fix_t *ptr = apps_that_need_special_colors; ptr-> m_app; ptr++ ) {
 		if (( ::strcmp ( Opie::binaryName ( ), ptr-> m_app ) == 0 ) &&
@@ -104,12 +108,14 @@ void QPEApplication::polish ( QWidget *w )
 			pal. setColor ( ptr-> m_set, pal. color ( QPalette::Active, ptr-> m_get ));
 			w-> setPalette ( pal );
 		}
 	}
+#endif
 	QApplication::polish ( w );
 }
 
 
+#ifndef OPIE_NO_OVERRIDE_QT
 // Fix for the binary incompatibility that TT introduced in Qt/E 2.3.4 -- point sizes
 // were multiplied by 10 (which was incorrect)
 
 QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString const &style, QString const &charset )
@@ -166,6 +172,6 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco )
 		delete deco;
 	else
 		QApplication::qwsSetDecoration_NonWeak ( deco );
 }
-
+#endif
 #endif
\ No newline at end of file