| -rw-r--r-- | Rules.make | 3 | ||||
| -rw-r--r-- | config.in | 4 | ||||
| -rw-r--r-- | library/library.pro | 6 | ||||
| -rw-r--r-- | library/qpeapplication.cpp | 10 | ||||
| -rw-r--r-- | library/qt_override.cpp | 40 |
5 files changed, 44 insertions, 19 deletions
@@ -30,4 +30,7 @@ else 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 @@ -42,4 +42,8 @@ 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 diff --git a/library/library.pro b/library/library.pro index 80a0f62..ab1f451 100644 --- a/library/library.pro +++ b/library/library.pro @@ -119,4 +119,6 @@ SOURCES = calendar.cpp \ qt_override.cpp + + # Qt 3 compatibility HEADERS += quuid.h qcom.h qlibrary.h qlibrary_p.h @@ -150,2 +152,6 @@ 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 @@ -1125,5 +1125,6 @@ void QPEApplication::applyStyle() 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; @@ -1139,4 +1140,7 @@ void QPEApplication::applyStyle() } } +#else + int nostyle = 0; +#endif // Widget style @@ -1195,8 +1199,10 @@ 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 +#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 @@ -23,10 +23,10 @@ struct color_fix_t { }; - +#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 } }; @@ -36,5 +36,5 @@ static const char * const apps_that_need_pointsizes_times_10 [] = { "hancomsheet", "HancomPresenterViewer", - + 0 }; @@ -57,23 +57,26 @@ 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) @@ -82,5 +85,5 @@ extern "C" { extern void __gmon_start__ ( ) __attribute__(( weak )); -extern void __gmon_start__ ( ) +extern void __gmon_start__ ( ) { } @@ -90,9 +93,10 @@ 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()" ); @@ -106,8 +110,10 @@ void QPEApplication::polish ( QWidget *w ) } } +#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) @@ -121,6 +127,6 @@ QValueList <int> QFontDatabase::pointSizes ( QString const &family, QString cons 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; } } @@ -157,5 +163,5 @@ void QApplication::setFont ( const QFont &fnt, bool informWidgets, const char *c QApplication::setFont_NonWeak ( fnt, informWidgets, className ); } - + void QApplication::qwsSetDecoration ( QWSDecoration *deco ) @@ -168,4 +174,4 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco ) QApplication::qwsSetDecoration_NonWeak ( deco ); } - -#endif
\ No newline at end of file +#endif +#endif |