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

1 files changed, 8 insertions, 2 deletions

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
@@ -19,13 +19,13 @@ struct color_fix_t {
 	char *m_class;
 	char *m_name;
 	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 },
 	
 	{ 0, 0, 0, QColorGroup::Base, QColorGroup::Base }
@@ -70,12 +70,15 @@ const char *Opie::binaryName ( )
 		
 		::atexit ( binaryNameFree );
 	}	
 	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)
 
 extern "C" {
 
@@ -91,27 +94,30 @@ extern void __gmon_start__ ( )
 // Fix for apps, that use QPainter::eraseRect() which doesn't work with styles
 // that set a background pixmap (it would be easier to fix eraseRect(), but 
 // 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 ) &&
 		    ( ptr-> m_class ? w-> inherits ( ptr-> m_class ) : true ) &&
 		    ( ptr-> m_name ? ( ::strcmp ( w-> name ( ), ptr-> m_name ) == 0 ) : true )) {
 			QPalette pal = w-> palette ( );
 			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 )
 {
 //	qDebug ( "QFontDatabase::pointSizes()" );
@@ -164,8 +170,8 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco )
 
 	if ( Opie::force_appearance & Opie::Force_Decoration )
 		delete deco;
 	else
 		QApplication::qwsSetDecoration_NonWeak ( deco );
 }
-
+#endif
 #endif
\ No newline at end of file