diff options
Diffstat (limited to 'qte')
-rw-r--r-- | qte/qte-2.3.7-r0/opie.patch | 562 | ||||
-rw-r--r-- | qte/qte-2.3.7-r0/tslib.patch | 221 | ||||
-rw-r--r-- | qte/qte-2.3.7/c700-hardware.patch (renamed from qte/qte-2.3.7-r0/c700-hardware.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/compile.patch (renamed from qte/qte-2.3.7-r0/compile.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/devfs.patch (renamed from qte/qte-2.3.7-r0/devfs.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/gcc3_4.patch (renamed from qte/qte-2.3.7-r0/gcc3_4.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/keyboard.patch (renamed from qte/qte-2.3.7-r0/keyboard.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/lefthand.patch (renamed from qte/qte-2.3.7-r0/lefthand.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/no-moc.patch (renamed from qte/qte-2.3.7-r0/no-moc.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/opie.patch (renamed from qte/qte-2.3.7-r0/qiconview-speed.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/qiconview-speed.patch (renamed from qte/qte-2.3.7-r0/qpe.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/qpe.patch (renamed from qte/qte-2.3.8-snap-r0/qpe.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/qtopia.patch (renamed from qte/qte-2.3.7-r0/qtopia.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/sharp_char.h (renamed from qte/qte-2.3.7-r0/sharp_char.h) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/simpad.patch (renamed from qte/qte-2.3.7-r0/simpad.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/tslib.patch (renamed from qte/qte-2.3.8-snap-r0/tslib.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/update-qtfontdir (renamed from qte/qte-2.3.7-r0/update-qtfontdir) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.7/vt-switch.patch (renamed from qte/qte-2.3.7-r0/vt-switch.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/c700-config.patch (renamed from qte/qte-2.3.8-snap-r0/c700-config.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/c700-hardware.patch (renamed from qte/qte-2.3.8-snap-r0/c700-hardware.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/compile.patch (renamed from qte/qte-2.3.8-snap-r0/compile.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/devfs.patch (renamed from qte/qte-2.3.8-snap-r0/devfs.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/keyboard.patch (renamed from qte/qte-2.3.8-snap-r0/keyboard.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/no-moc.patch (renamed from qte/qte-2.3.8-snap-r0/no-moc.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/qpe.patch (renamed from qte/qte-2.3.8-snap-r0/qtopia.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/qtopia.patch (renamed from qte/qte-2.3.8-snap-r0/tslib-calibrate.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/tslib-calibrate.patch (renamed from qte/qte-2.3.8-snap-r0/tslib-defines.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/tslib-defines.patch (renamed from qte/qte-2.3.8-snap-r0/tslib2.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/tslib.patch (renamed from qte/qte-2.3.8-snap-r0/vt-switch.patch) | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/tslib2.patch | 0 | ||||
-rw-r--r-- | qte/qte-2.3.8-snap/vt-switch.patch | 0 |
31 files changed, 0 insertions, 783 deletions
diff --git a/qte/qte-2.3.7-r0/opie.patch b/qte/qte-2.3.7-r0/opie.patch deleted file mode 100644 index f3272bee52..0000000000 --- a/qte/qte-2.3.7-r0/opie.patch +++ /dev/null @@ -1,562 +0,0 @@ -diff -ur qt-2.3.7_clean/configs/linux-generic-g++-shared qt-2.3.7/configs/linux-generic-g++-shared ---- qt-2.3.7_clean/configs/linux-generic-g++-shared 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-shared 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic-g++-shared-debug qt-2.3.7/configs/linux-generic-g++-shared-debug ---- qt-2.3.7_clean/configs/linux-generic-g++-shared-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-shared-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic-g++-static qt-2.3.7/configs/linux-generic-g++-static ---- qt-2.3.7_clean/configs/linux-generic-g++-static 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-static 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic-g++-static-debug qt-2.3.7/configs/linux-generic-g++-static-debug ---- qt-2.3.7_clean/configs/linux-generic-g++-static-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic-g++-static-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic_rtti-g++-shared qt-2.3.7/configs/linux-generic_rtti-g++-shared ---- qt-2.3.7_clean/configs/linux-generic_rtti-g++-shared 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic_rtti-g++-shared-debug qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug ---- qt-2.3.7_clean/configs/linux-generic_rtti-g++-shared-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-shared-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic_rtti-g++-static qt-2.3.7/configs/linux-generic_rtti-g++-static ---- qt-2.3.7_clean/configs/linux-generic_rtti-g++-static 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-static 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-generic_rtti-g++-static-debug qt-2.3.7/configs/linux-generic_rtti-g++-static-debug ---- qt-2.3.7_clean/configs/linux-generic_rtti-g++-static-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-generic_rtti-g++-static-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = - -diff -ur qt-2.3.7_clean/configs/linux-x86rtti-g++-shared qt-2.3.7/configs/linux-x86rtti-g++-shared ---- qt-2.3.7_clean/configs/linux-x86rtti-g++-shared 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-shared 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = -lm - -diff -ur qt-2.3.7_clean/configs/linux-x86rtti-g++-shared-debug qt-2.3.7/configs/linux-x86rtti-g++-shared-debug ---- qt-2.3.7_clean/configs/linux-x86rtti-g++-shared-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-shared-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = -lm - -diff -ur qt-2.3.7_clean/configs/linux-x86rtti-g++-static qt-2.3.7/configs/linux-x86rtti-g++-static ---- qt-2.3.7_clean/configs/linux-x86rtti-g++-static 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-static 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = -lm - -diff -ur qt-2.3.7_clean/configs/linux-x86rtti-g++-static-debug qt-2.3.7/configs/linux-x86rtti-g++-static-debug ---- qt-2.3.7_clean/configs/linux-x86rtti-g++-static-debug 2004-06-04 02:17:54.000000000 +0200 -+++ qt-2.3.7/configs/linux-x86rtti-g++-static-debug 2004-06-04 02:22:25.000000000 +0200 -@@ -36,7 +36,7 @@ - SYSCONF_LIBS_YACC = - - # Linking applications --SYSCONF_LINK = gcc -+SYSCONF_LINK = g++ - SYSCONF_LFLAGS = - SYSCONF_LIBS = -lm - -diff -ur qt-2.3.7_clean/include/qapplication.h qt-2.3.7/include/qapplication.h ---- qt-2.3.7_clean/include/qapplication.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/include/qapplication.h 2004-06-04 02:22:25.000000000 +0200 -@@ -61,6 +61,10 @@ - class QSemaphore; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - // REMOVE IN 3.0 (just here for moc source compatibility) - #define QNonBaseApplication QApplication - -@@ -85,7 +89,10 @@ - - #ifndef QT_NO_STYLE - static QStyle &style(); -- static void setStyle( QStyle* ); -+ static void setStyle( QStyle* ) QT_WEAK_SYMBOL; -+private: -+ static void setStyle_NonWeak( QStyle* ); -+public: - #endif - #if 1 /* OBSOLETE */ - enum ColorMode { NormalColors, CustomColors }; -@@ -106,11 +113,19 @@ - #ifndef QT_NO_PALETTE - static QPalette palette( const QWidget* = 0 ); - static void setPalette( const QPalette &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - #endif - static QFont font( const QWidget* = 0 ); - static void setFont( const QFont &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - static QFontMetrics fontMetrics(); - - QWidget *mainWidget() const; -@@ -207,7 +222,10 @@ - void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); - #ifndef QT_NO_QWS_MANAGER - static QWSDecoration &qwsDecoration(); -- static void qwsSetDecoration( QWSDecoration *); -+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; -+private: -+ static void qwsSetDecoration_NonWeak( QWSDecoration *); -+public: - #endif - #endif - -diff -ur qt-2.3.7_clean/include/qfontdatabase.h qt-2.3.7/include/qfontdatabase.h ---- qt-2.3.7_clean/include/qfontdatabase.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/include/qfontdatabase.h 2004-06-04 02:22:25.000000000 +0200 -@@ -59,6 +59,10 @@ - class QDiskFont; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - class QFontDatabasePrivate; - - class Q_EXPORT QFontDatabase -@@ -67,9 +71,16 @@ - QFontDatabase(); - - QStringList families( bool onlyForLocale = TRUE ) const; -+ -+ - QValueList<int> pointSizes( const QString &family, - const QString &style = QString::null, -- const QString &charSet = QString::null ); -+ const QString &charSet = QString::null ) QT_WEAK_SYMBOL; -+private: -+ QValueList<int> pointSizes_NonWeak( const QString &family, -+ const QString &style, -+ const QString &charSet ); -+public: - QStringList styles( const QString &family, - const QString &charSet = QString::null ) const; - QStringList charSets( const QString &familyName, -diff -ur qt-2.3.7_clean/src/kernel/qapplication.cpp qt-2.3.7/src/kernel/qapplication.cpp ---- qt-2.3.7_clean/src/kernel/qapplication.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -35,6 +35,8 @@ - ** - **********************************************************************/ - -+#define QT_WEAK_SYMBOL __attribute__(( weak )) -+ - #include "qobjectlist.h" - #include "qobjectdict.h" - #include "qapplication.h" -@@ -933,11 +935,16 @@ - #ifndef QT_NO_STYLE - void QApplication::setStyle( QStyle *style ) - { -+ setStyle_NonWeak ( style ); -+} -+ -+void QApplication::setStyle_NonWeak( QStyle *style ) -+{ - QStyle* old = app_style; -- app_style = style; - - if ( startingUp() ) { - delete old; -+ app_style = style; - return; - } - -@@ -958,6 +965,8 @@ - old->unPolish( qApp ); - } - -+ app_style = style; -+ - // take care of possible palette requirements of certain gui - // styles. Do it before polishing the application since the style - // might call QApplication::setStyle() itself -@@ -1184,13 +1193,30 @@ - \sa QWidget::setPalette(), palette(), QStyle::polish() - */ - --void QApplication::setPalette( const QPalette &palette, bool informWidgets, -+void QApplication::setPalette ( const QPalette &palette, bool informWidgets, -+ const char* className ) -+{ -+ setPalette_NonWeak ( palette, informWidgets, className ); -+} -+ -+void QApplication::setPalette_NonWeak ( const QPalette &palette, bool informWidgets, - const char* className ) - { - QPalette pal = palette; - #ifndef QT_NO_STYLE -- if ( !startingUp() ) -+ if ( !startingUp() ) { - qApp->style().polish( pal ); // NB: non-const reference -+ if ( className ) { -+ // if we just polished a class specific palette (this normally -+ // only called by qt_fix_tooltips - see below), we better re- -+ // polish the global palette. Some styles like liquid can get -+ // confused, because they can not detect if the polished palette -+ // is the global one or only a class specific one. -+ // (liquid uses this palette to calculate blending pixmaps) -+ QPalette p = qApp-> palette ( ); -+ qApp->style().polish ( p ); -+ } -+ } - #endif - bool all = FALSE; - if ( !className ) { -@@ -1275,6 +1301,12 @@ - void QApplication::setFont( const QFont &font, bool informWidgets, - const char* className ) - { -+ setFont_NonWeak ( font, informWidgets, className ); -+} -+ -+void QApplication::setFont_NonWeak( const QFont &font, bool informWidgets, -+ const char* className ) -+{ - bool all = FALSE; - if ( !className ) { - if ( !app_font ) { -diff -ur qt-2.3.7_clean/src/kernel/qapplication.h qt-2.3.7/src/kernel/qapplication.h ---- qt-2.3.7_clean/src/kernel/qapplication.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication.h 2004-06-04 02:22:25.000000000 +0200 -@@ -61,6 +61,10 @@ - class QSemaphore; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - // REMOVE IN 3.0 (just here for moc source compatibility) - #define QNonBaseApplication QApplication - -@@ -85,7 +89,10 @@ - - #ifndef QT_NO_STYLE - static QStyle &style(); -- static void setStyle( QStyle* ); -+ static void setStyle( QStyle* ) QT_WEAK_SYMBOL; -+private: -+ static void setStyle_NonWeak( QStyle* ); -+public: - #endif - #if 1 /* OBSOLETE */ - enum ColorMode { NormalColors, CustomColors }; -@@ -106,11 +113,19 @@ - #ifndef QT_NO_PALETTE - static QPalette palette( const QWidget* = 0 ); - static void setPalette( const QPalette &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setPalette_NonWeak( const QPalette &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - #endif - static QFont font( const QWidget* = 0 ); - static void setFont( const QFont &, bool informWidgets=FALSE, -+ const char* className = 0 ) QT_WEAK_SYMBOL; -+private: -+ static void setFont_NonWeak( const QFont &, bool informWidgets=FALSE, - const char* className = 0 ); -+public: - static QFontMetrics fontMetrics(); - - QWidget *mainWidget() const; -@@ -207,7 +222,10 @@ - void qwsSetCustomColors( QRgb *colortable, int start, int numColors ); - #ifndef QT_NO_QWS_MANAGER - static QWSDecoration &qwsDecoration(); -- static void qwsSetDecoration( QWSDecoration *); -+ static void qwsSetDecoration( QWSDecoration *) QT_WEAK_SYMBOL; -+private: -+ static void qwsSetDecoration_NonWeak( QWSDecoration *); -+public: - #endif - #endif - -diff -ur qt-2.3.7_clean/src/kernel/qapplication_qws.cpp qt-2.3.7/src/kernel/qapplication_qws.cpp ---- qt-2.3.7_clean/src/kernel/qapplication_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -2804,6 +2804,11 @@ - */ - void QApplication::qwsSetDecoration( QWSDecoration *d ) - { -+ qwsSetDecoration_NonWeak ( d ); -+} -+ -+void QApplication::qwsSetDecoration_NonWeak( QWSDecoration *d ) -+{ - if ( d ) { - delete qws_decoration; - qws_decoration = d; -diff -ur qt-2.3.7_clean/src/kernel/qfontdatabase.cpp qt-2.3.7/src/kernel/qfontdatabase.cpp ---- qt-2.3.7_clean/src/kernel/qfontdatabase.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qfontdatabase.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -35,6 +35,8 @@ - ** - **********************************************************************/ - -+#define QT_WEAK_SYMBOL __attribute__(( weak )) -+ - #include "qfontdatabase.h" - - #ifndef QT_NO_FONTDATABASE -@@ -2424,6 +2426,13 @@ - const QString &style, - const QString &charSet ) - { -+ return pointSizes_NonWeak ( family, style, charSet ); -+} -+ -+QValueList<int> QFontDatabase::pointSizes_NonWeak ( const QString &family, -+ const QString &style, -+ const QString &charSet ) -+{ - QString cs( charSet ); - if ( charSet.isEmpty() ) { - QStringList lst = charSets( family ); -diff -ur qt-2.3.7_clean/src/kernel/qfontdatabase.h qt-2.3.7/src/kernel/qfontdatabase.h ---- qt-2.3.7_clean/src/kernel/qfontdatabase.h 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qfontdatabase.h 2004-06-04 02:22:25.000000000 +0200 -@@ -59,6 +59,10 @@ - class QDiskFont; - #endif - -+#if !defined( QT_WEAK_SYMBOL ) -+#define QT_WEAK_SYMBOL -+#endif -+ - class QFontDatabasePrivate; - - class Q_EXPORT QFontDatabase -@@ -67,9 +71,16 @@ - QFontDatabase(); - - QStringList families( bool onlyForLocale = TRUE ) const; -+ -+ - QValueList<int> pointSizes( const QString &family, - const QString &style = QString::null, -- const QString &charSet = QString::null ); -+ const QString &charSet = QString::null ) QT_WEAK_SYMBOL; -+private: -+ QValueList<int> pointSizes_NonWeak( const QString &family, -+ const QString &style, -+ const QString &charSet ); -+public: - QStringList styles( const QString &family, - const QString &charSet = QString::null ) const; - QStringList charSets( const QString &familyName, -diff -ur qt-2.3.7_clean/src/kernel/qgfxraster_qws.cpp qt-2.3.7/src/kernel/qgfxraster_qws.cpp ---- qt-2.3.7_clean/src/kernel/qgfxraster_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -4237,7 +4237,7 @@ - setAlphaType(IgnoreAlpha); - if ( w <= 0 || h <= 0 || !ncliprect ) return; - GFX_START(QRect(rx+xoffs, ry+yoffs, w+1, h+1)) --#ifdef QWS_EXPERIMENTAL_FASTPATH -+#if 0 // def QWS_EXPERIMENTAL_FASTPATH !! this is crashing HancomWord on OZ !! - // ### fix for 8bpp - // This seems to be reliable now, at least for 16bpp - -diff -ur qt-2.3.7_clean/src/kernel/qkeyboard_qws.cpp qt-2.3.7/src/kernel/qkeyboard_qws.cpp ---- qt-2.3.7_clean/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -238,7 +238,7 @@ - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 -- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 -+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 - { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 -diff -ur qt-2.3.7_clean/src/kernel/qwindowsystem_qws.cpp qt-2.3.7/src/kernel/qwindowsystem_qws.cpp ---- qt-2.3.7_clean/src/kernel/qwindowsystem_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -844,6 +844,18 @@ - { - } - -+static void catchSegvSignal( int ) -+{ -+#ifndef QT_NO_QWS_KEYBOARD -+ if ( qwsServer ) -+ qwsServer->closeKeyboard(); -+#endif -+ QWSServer::closedown(); -+ fprintf(stderr, "Segmentation fault.\n"); -+ exit(1); -+} -+ -+ - /*! - \class QWSServer qwindowsystem_qws.h - \brief Server-specific functionality in Qt/Embedded -@@ -936,6 +948,7 @@ - } - - signal(SIGPIPE, ignoreSignal); //we get it when we read -+ signal(SIGSEGV, catchSegvSignal); //recover the keyboard on crash - #endif - focusw = 0; - mouseGrabber = 0; -diff -ur qt-2.3.7_clean/src/widgets/qcommonstyle.cpp qt-2.3.7/src/widgets/qcommonstyle.cpp ---- qt-2.3.7_clean/src/widgets/qcommonstyle.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/widgets/qcommonstyle.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -566,7 +566,7 @@ - bool enabled, bool active ) - { - #ifndef QT_NO_MENUBAR --#ifndef QT_NO_STYLE_SGI -+#if 1 // #ifndef QT_NO_STYLE_SGI - if (draw_menu_bar_impl != 0) { - QDrawMenuBarItemImpl impl = draw_menu_bar_impl; - (this->*impl)(p, x, y, w, h, mi, g, enabled, active); -diff -ur qt-2.3.7_clean/src/widgets/qlistview.cpp qt-2.3.7/src/widgets/qlistview.cpp ---- qt-2.3.7_clean/src/widgets/qlistview.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/widgets/qlistview.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -4968,9 +4968,9 @@ - l = l->childItem ? l->childItem : l->siblingItem; - - if ( l && l->height() ) -- s.setHeight( s.height() + 10 * l->height() ); -- else -- s.setHeight( s.height() + 140 ); -+ s.setHeight( s.height() + 4 /*10*/ * l->height() ); -+ else // ^v much too big for handhelds -+ s.setHeight( s.height() + 30 /*140*/ ); - - if ( s.width() > s.height() * 3 ) - s.setHeight( s.width() / 3 ); -diff -ur qt-2.3.7_clean/src/widgets/qtoolbutton.cpp qt-2.3.7/src/widgets/qtoolbutton.cpp ---- qt-2.3.7_clean/src/widgets/qtoolbutton.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/widgets/qtoolbutton.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -230,7 +230,7 @@ - else - QToolTip::add( this, textLabel ); - } --#endif -+#endif - } - - -@@ -324,12 +324,12 @@ - QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Large, QIconSet::Normal); - w = pm.width(); - h = pm.height(); -- if ( w < 32 ) -- w = 32; -- if ( h < 32 ) -- h = 32; -+ if ( w < 24 ) -+ w = 24; -+ if ( h < 24 ) -+ h = 24; - } else { -- w = h = 16; -+ w = h = 14; - QPixmap pm = iconSet(TRUE).pixmap(QIconSet::Small, QIconSet::Normal); - w = pm.width(); - h = pm.height(); diff --git a/qte/qte-2.3.7-r0/tslib.patch b/qte/qte-2.3.7-r0/tslib.patch deleted file mode 100644 index dc2848f42e..0000000000 --- a/qte/qte-2.3.7-r0/tslib.patch +++ /dev/null @@ -1,221 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.7/src/kernel/qwsmouse_qws.cpp~tslib -+++ qt-2.3.7/src/kernel/qwsmouse_qws.cpp -@@ -7,6 +7,10 @@ - ** - ** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. - ** -+** Portions Copyright (C) 2003 Texas Instruments, Inc. -+** Rights to said portions for use under the GPL and QPL licenses -+** are hereby granted to Trolltech AS. -+** - ** This file is part of the kernel module of the Qt GUI Toolkit. - ** - ** This file may be distributed and/or modified under the terms of the -@@ -59,6 +63,9 @@ - #ifdef QT_QWS_CASSIOPEIA - #include <linux/tpanel.h> - #endif -+#if QWS_TSLIB -+#include <tslib.h> -+#endif - - #if defined(QT_QWS_IPAQ) - #define QT_QWS_IPAQ_RAW -@@ -1093,6 +1100,137 @@ - return sent; - } - -+class QTSLibHandler : public QWSMouseHandler -+{ -+ Q_OBJECT -+public: -+ QTSLibHandler(); -+ ~QTSLibHandler(); -+ -+ virtual void clearCalibration(); -+ virtual void calibrate( QWSPointerCalibrationData * ); -+ // Not Used -> virtual void getCalibration( QWSPointerCalibrationData * ); -+ -+private: -+ void openTs(); -+ void closeTs(); -+ bool raw; -+#ifdef QWS_TSLIB -+ struct tsdev *ts; -+#endif -+ -+private slots: -+ void readMouseData(); -+}; -+ -+QTSLibHandler::QTSLibHandler() -+ : raw(false) -+{ -+ openTs(); -+} -+ -+QTSLibHandler::~QTSLibHandler() -+{ -+ closeTs(); -+} -+ -+void QTSLibHandler::openTs() -+{ -+#ifdef QWS_TSLIB -+ char *tsdevice; -+ -+ if( ( tsdevice = getenv( "TSLIB_TSDEVICE" ) ) != NULL ) { -+ ts = ts_open( tsdevice, 1 ); -+ } else { -+ ts = ts_open( "/dev/ts", 1 ); -+ } -+ -+ if (!ts) { -+ qWarning( "Cannot open touchscreen (%s)", strerror( errno ) ); -+ return; -+ } -+ -+ if (ts_config( ts )) { -+ qWarning( "Cannot configure touchscreen (%s)", strerror( errno ) ); -+ return; -+ } -+ -+ QSocketNotifier *mouseNotifier; -+ mouseNotifier = new QSocketNotifier( ts_fd(ts), QSocketNotifier::Read, -+ this ); -+ connect( mouseNotifier, SIGNAL( activated( int ) ), this, SLOT( readMouseData() ) ); -+#endif -+} -+ -+void QTSLibHandler::closeTs() -+{ -+#ifdef QWS_TSLIB -+ if (ts) -+ ts_close(ts); -+#endif -+} -+ -+void QTSLibHandler::clearCalibration() -+{ -+ raw = true; -+} -+ -+void QTSLibHandler::calibrate( QWSPointerCalibrationData *cd ) -+{ -+ QPoint dev_tl = cd->devPoints[ QWSPointerCalibrationData::TopLeft ]; -+ QPoint dev_br = cd->devPoints[ QWSPointerCalibrationData::BottomRight ]; -+ QPoint screen_tl = cd->screenPoints[ QWSPointerCalibrationData::TopLeft ]; -+ QPoint screen_br = cd->screenPoints[ QWSPointerCalibrationData::BottomRight ]; -+ int a, b, c, d, e, f, s; -+ -+ s = 1 << 16; -+ -+ a = s * (screen_tl.x() - screen_br.x() ) / (dev_tl.x() - dev_br.x()); -+ b = 0; -+ c = s * screen_tl.x() - a * dev_tl.x(); -+ -+ d = 0; -+ e = s * (screen_tl.y() - screen_br.y() ) / (dev_tl.y() - dev_br.y()); -+ f = s * screen_tl.y() - e * dev_tl.y(); -+ -+ QString calFile = "/etc/pointercal"; -+#ifndef QT_NO_TEXTSTREAM -+ QFile file( calFile ); -+ if ( file.open( IO_WriteOnly ) ) { -+ QTextStream t( &file ); -+ t << a << " " << b << " " << c << " "; -+ t << d << " " << e << " " << f << " " << s; -+ file.flush(); closeTs(); -+ openTs(); -+ } else -+#endif -+ { -+ qDebug( "Could not save calibration: %s", calFile.latin1() ); -+ } -+ raw = false; -+} -+ -+void QTSLibHandler::readMouseData() -+{ -+#ifdef QWS_TSLIB -+ if(!qt_screen) -+ return; -+ -+ struct ts_sample sample; -+ int ret; -+ if (raw) { -+ if ((ret = ts_read_raw(ts, &sample, 1)) < 0) -+ return; -+ } else { -+ if ((ret = ts_read(ts, &sample, 1)) < 0) -+ return; -+ } -+ -+ QPoint pos( sample.x, sample.y ); -+ emit mouseChanged( pos, sample.pressure != 0 ? 1 : 0 ); -+#endif -+} -+ - /* - * Handler for /dev/tpanel Linux kernel driver - */ -@@ -1689,12 +1827,14 @@ - break; - - case TPanel: --#if defined(QWS_CUSTOMTOUCHPANEL) -- handler = new QCustomTPanelHandlerPrivate(mouseProtocol,mouseDev); -+#if defined(QWS_TSLIB) -+ handler = new QTSLibHandler( ); -+#elif defined(QWS_CUSTOMTOUCHPANEL) -+ handler = new QCustomTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_YOPY) -- handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev); -+ handler = new QYopyTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -- handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev); -+ handler = new QTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #endif ---- qt-2.3.7/configure~tslib -+++ qt-2.3.7/configure -@@ -399,6 +399,9 @@ - -kde) - KDE=yes - ;; -+ -tslib) -+ TSLIB=yes -+ ;; - -no-g++-exceptions) - GPLUSPLUS_EXCEPTIONS=no - ;; -@@ -1255,6 +1258,9 @@ - set to point to a KDE 2 installation. - See http://www.kde.org - -+ -tslib ............. Use the TSLib (touchscreen access library) mouse handler -+ by default, instead of the normal device default. -+ - -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ - compiler by using the -fno-exceptions flag. - -@@ -1314,6 +1320,13 @@ - [ "x$SM" = "xno" ] && QT_CXX="${QT_CXX} -DQT_NO_SM_SUPPORT" - [ "x$XFT" = "xyes" ] && QT_CXX="${QT_CXX} -DQT_XFT" - [ "x$XFT" = "xno" ] && QT_CXX="${QT_CXX} -DQT_NO_XKB" -+ -+if [ "x$TSLIB" = "xyes" ] -+then -+ QT_CXX="${QT_CXX} -DQWS_TSLIB" -+ QT_LIBS="${QT_LIBS} -lts" -+fi -+ - if [ "x$THREAD" = "xyes" ] - then - cat >src-mt.mk <<EOF diff --git a/qte/qte-2.3.7-r0/c700-hardware.patch b/qte/qte-2.3.7/c700-hardware.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/c700-hardware.patch +++ b/qte/qte-2.3.7/c700-hardware.patch diff --git a/qte/qte-2.3.7-r0/compile.patch b/qte/qte-2.3.7/compile.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/compile.patch +++ b/qte/qte-2.3.7/compile.patch diff --git a/qte/qte-2.3.7-r0/devfs.patch b/qte/qte-2.3.7/devfs.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/devfs.patch +++ b/qte/qte-2.3.7/devfs.patch diff --git a/qte/qte-2.3.7-r0/gcc3_4.patch b/qte/qte-2.3.7/gcc3_4.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/gcc3_4.patch +++ b/qte/qte-2.3.7/gcc3_4.patch diff --git a/qte/qte-2.3.7-r0/keyboard.patch b/qte/qte-2.3.7/keyboard.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/keyboard.patch +++ b/qte/qte-2.3.7/keyboard.patch diff --git a/qte/qte-2.3.7-r0/lefthand.patch b/qte/qte-2.3.7/lefthand.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/lefthand.patch +++ b/qte/qte-2.3.7/lefthand.patch diff --git a/qte/qte-2.3.7-r0/no-moc.patch b/qte/qte-2.3.7/no-moc.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/no-moc.patch +++ b/qte/qte-2.3.7/no-moc.patch diff --git a/qte/qte-2.3.7-r0/qiconview-speed.patch b/qte/qte-2.3.7/opie.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/qiconview-speed.patch +++ b/qte/qte-2.3.7/opie.patch diff --git a/qte/qte-2.3.7-r0/qpe.patch b/qte/qte-2.3.7/qiconview-speed.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/qpe.patch +++ b/qte/qte-2.3.7/qiconview-speed.patch diff --git a/qte/qte-2.3.8-snap-r0/qpe.patch b/qte/qte-2.3.7/qpe.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/qpe.patch +++ b/qte/qte-2.3.7/qpe.patch diff --git a/qte/qte-2.3.7-r0/qtopia.patch b/qte/qte-2.3.7/qtopia.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/qtopia.patch +++ b/qte/qte-2.3.7/qtopia.patch diff --git a/qte/qte-2.3.7-r0/sharp_char.h b/qte/qte-2.3.7/sharp_char.h index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/sharp_char.h +++ b/qte/qte-2.3.7/sharp_char.h diff --git a/qte/qte-2.3.7-r0/simpad.patch b/qte/qte-2.3.7/simpad.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/simpad.patch +++ b/qte/qte-2.3.7/simpad.patch diff --git a/qte/qte-2.3.8-snap-r0/tslib.patch b/qte/qte-2.3.7/tslib.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/tslib.patch +++ b/qte/qte-2.3.7/tslib.patch diff --git a/qte/qte-2.3.7-r0/update-qtfontdir b/qte/qte-2.3.7/update-qtfontdir index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/update-qtfontdir +++ b/qte/qte-2.3.7/update-qtfontdir diff --git a/qte/qte-2.3.7-r0/vt-switch.patch b/qte/qte-2.3.7/vt-switch.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.7-r0/vt-switch.patch +++ b/qte/qte-2.3.7/vt-switch.patch diff --git a/qte/qte-2.3.8-snap-r0/c700-config.patch b/qte/qte-2.3.8-snap/c700-config.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/c700-config.patch +++ b/qte/qte-2.3.8-snap/c700-config.patch diff --git a/qte/qte-2.3.8-snap-r0/c700-hardware.patch b/qte/qte-2.3.8-snap/c700-hardware.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/c700-hardware.patch +++ b/qte/qte-2.3.8-snap/c700-hardware.patch diff --git a/qte/qte-2.3.8-snap-r0/compile.patch b/qte/qte-2.3.8-snap/compile.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/compile.patch +++ b/qte/qte-2.3.8-snap/compile.patch diff --git a/qte/qte-2.3.8-snap-r0/devfs.patch b/qte/qte-2.3.8-snap/devfs.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/devfs.patch +++ b/qte/qte-2.3.8-snap/devfs.patch diff --git a/qte/qte-2.3.8-snap-r0/keyboard.patch b/qte/qte-2.3.8-snap/keyboard.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/keyboard.patch +++ b/qte/qte-2.3.8-snap/keyboard.patch diff --git a/qte/qte-2.3.8-snap-r0/no-moc.patch b/qte/qte-2.3.8-snap/no-moc.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/no-moc.patch +++ b/qte/qte-2.3.8-snap/no-moc.patch diff --git a/qte/qte-2.3.8-snap-r0/qtopia.patch b/qte/qte-2.3.8-snap/qpe.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/qtopia.patch +++ b/qte/qte-2.3.8-snap/qpe.patch diff --git a/qte/qte-2.3.8-snap-r0/tslib-calibrate.patch b/qte/qte-2.3.8-snap/qtopia.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/tslib-calibrate.patch +++ b/qte/qte-2.3.8-snap/qtopia.patch diff --git a/qte/qte-2.3.8-snap-r0/tslib-defines.patch b/qte/qte-2.3.8-snap/tslib-calibrate.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/tslib-defines.patch +++ b/qte/qte-2.3.8-snap/tslib-calibrate.patch diff --git a/qte/qte-2.3.8-snap-r0/tslib2.patch b/qte/qte-2.3.8-snap/tslib-defines.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/tslib2.patch +++ b/qte/qte-2.3.8-snap/tslib-defines.patch diff --git a/qte/qte-2.3.8-snap-r0/vt-switch.patch b/qte/qte-2.3.8-snap/tslib.patch index e69de29bb2..e69de29bb2 100644 --- a/qte/qte-2.3.8-snap-r0/vt-switch.patch +++ b/qte/qte-2.3.8-snap/tslib.patch diff --git a/qte/qte-2.3.8-snap/tslib2.patch b/qte/qte-2.3.8-snap/tslib2.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/qte/qte-2.3.8-snap/tslib2.patch diff --git a/qte/qte-2.3.8-snap/vt-switch.patch b/qte/qte-2.3.8-snap/vt-switch.patch new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/qte/qte-2.3.8-snap/vt-switch.patch |