-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 | 6 | ||||
-rw-r--r-- | library/qt_override.cpp | 10 |
5 files changed, 27 insertions, 2 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 @@ -43,4 +43,8 @@ config QUICK_LAUNCH default n +config OPIE_NO_OVERRIDE_QT + boolean "Build Opie against an unpatched version of Qt" + default n + config SPECFILE string 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 @@ -1126,4 +1126,5 @@ void QPEApplication::applyStyle() #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 } 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,5 +23,5 @@ struct color_fix_t { }; - +#ifndef OPIE_NO_OVERRIDE_QT static const color_fix_t apps_that_need_special_colors [] = { @@ -74,4 +74,7 @@ const char *Opie::binaryName ( ) } +#else +int Opie::force_appearance = 0; +#endif // Fix for a toolchain incompatibility (binaries compiled with @@ -95,4 +98,5 @@ extern void __gmon_start__ ( ) 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) @@ -168,4 +174,4 @@ void QApplication::qwsSetDecoration ( QWSDecoration *deco ) QApplication::qwsSetDecoration_NonWeak ( deco ); } - +#endif #endif
\ No newline at end of file |