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

3 files changed, 37 insertions, 19 deletions

diff --git a/library/library.pro b/library/library.pro
index 80a0f62..ab1f451 100644
--- a/library/library.pro
+++ b/library/library.pro
@@ -115,12 +115,14 @@ SOURCES	=   calendar.cpp \
 	backend/vobject.cpp \
 	findwidget_p.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
 LIBS		+= -ldl -lcrypt -lm
 INTERFACES = passwordbase_p.ui categoryeditbase_p.ui findwidgetbase_p.ui lnkpropertiesbase_p.ui
@@ -146,6 +148,10 @@ TRANSLATIONS = ../i18n/de/libqpe.ts \
 	 ../i18n/it/libqpe.ts \
 	 ../i18n/zh_TW/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
@@ -1121,13 +1121,14 @@ void QPEApplication::reset() {
 */
 void QPEApplication::applyStyle()
 {
 	Config config( "qpe" );
 	config.setGroup( "Appearance" );
 
-    #if QT_VERSION > 233
+#if QT_VERSION > 233
+#if !defined(OPIE_NO_OVERRIDE_QT)
 	// don't block ourselves ...
 	Opie::force_appearance = 0;
 
 	static QString appname = Opie::binaryName ( );
 
 	QStringList ex = config. readListEntry ( "NoStyle", ';' );
@@ -1135,12 +1136,15 @@ void QPEApplication::applyStyle()
 	for ( QStringList::Iterator it = ex. begin ( ); it != ex. end ( ); ++it ) {
 		if ( QRegExp (( *it ). mid ( 1 ), false, true ). find ( appname, 0 ) >= 0 ) {
 			nostyle = ( *it ). left ( 1 ). toInt ( 0, 32 );
 			break;
 		}
 	}
+#else
+        int nostyle = 0;
+#endif
 
 	// Widget style
 	QString style = config.readEntry( "Style", "FlatStyle" );
 
 	// don't set a custom style
 	if ( nostyle & Opie::Force_Style )
@@ -1191,16 +1195,18 @@ void QPEApplication::applyStyle()
 		ff = "Vera";
 		fs = 10;
 	}
 
 	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
+#endif
 }
 
 void QPEApplication::systemMessage( const QCString& msg, const QByteArray& data )
 {
 #ifdef Q_WS_QWS
 	QDataStream stream( data, IO_ReadOnly );
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,26 +19,26 @@ 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 }
 };
 
 static const char * const apps_that_need_pointsizes_times_10 [] = {
 	"HancomMobileWord",
 	"hancomsheet",
 	"HancomPresenterViewer",
-	
+
 	0
 };
 
 
 
 
@@ -53,78 +53,84 @@ static void binaryNameFree ( )
 	::free ((void *) Opie::binaryName ( )); // we need to cast away the const here
 }
 
 const char *Opie::binaryName ( )
 {
 	static const char *appname = 0;
-	
+
 	if ( !appname ) {
 		char dst [PATH_MAX + 1];
 		int l = ::readlink ( "/proc/self/exe", dst, PATH_MAX );
-			
-		if ( l <= 0 ) 
+
+		if ( l <= 0 )
 			l = 0;
-			
+
 		dst [l] = 0;
 		const char *b = ::strrchr ( dst, '/' );
 		appname = ::strdup ( b ? b + 1 : dst );
-		
+
 		::atexit ( binaryNameFree );
-	}	
+	}
 	return appname;
 }
 
+#else
+int Opie::force_appearance = 0;
+#endif
 
-// Fix for a toolchain incompatibility (binaries compiled with 
+// Fix for a toolchain incompatibility (binaries compiled with
 // old tcs using shared libs compiled with newer tcs)
 
 extern "C" {
 
 extern void __gmon_start__ ( ) __attribute__(( weak ));
 
-extern void __gmon_start__ ( ) 
+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 
+// 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()" );
 
 	QValueList <int> sl = pointSizes_NonWeak ( family, style, charset );
 
 	for ( const char * const *ptr = apps_that_need_pointsizes_times_10; *ptr; ptr++ ) {
 		if ( ::strcmp ( Opie::binaryName ( ), *ptr ) == 0 ) {
-			for ( QValueList <int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it ) 
-				*it *= 10;	
+			for ( QValueList <int>::Iterator it = sl. begin ( ); it != sl. end ( ); ++it )
+				*it *= 10;
 		}
 	}
 	return sl;
 }
 
 
@@ -153,19 +159,19 @@ void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *c
 {
 //	qDebug ( "QApplication::setFont()" );
 
 	if (!( Opie::force_appearance & Opie::Force_Font ))
 		QApplication::setFont_NonWeak ( fnt, informWidgets, className );
 }
-	
+
 
 void QApplication::qwsSetDecoration ( QWSDecoration *deco )
 {
 //	qDebug ( "QApplication::qwsSetDecoration()" );
 
 	if ( Opie::force_appearance & Opie::Force_Decoration )
 		delete deco;
 	else
 		QApplication::qwsSetDecoration_NonWeak ( deco );
 }
-
-#endif
\ No newline at end of file
+#endif
+#endif