diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-12-09 09:47:41 +0000 |
| commit | 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 (patch) | |
| tree | bf879bea7ef8517ba8c3d1286ef300401d3d484c /qte | |
| parent | 101e2f1623def0a355d20aacb8bd93810703e834 (diff) | |
Merge oe-devel@oe-devel.bkbits.net:openembedded
into hyperion.kergoth.com:/home/kergoth/code/openembedded
2004/12/09 03:39:39-06:00 kergoth.com!kergoth
Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit.
BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA
Diffstat (limited to 'qte')
50 files changed, 0 insertions, 7177 deletions
diff --git a/qte/qte-2.3.7/beagle.patch b/qte/qte-2.3.7/beagle.patch deleted file mode 100644 index 88c3f94c1c..0000000000 --- a/qte/qte-2.3.7/beagle.patch +++ /dev/null @@ -1,45 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~beagle.patch -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp -@@ -350,6 +350,11 @@ - { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 90 -+#ifdef QT_QWS_BEAGLE -+ { Qt::Key_F13, 0xffff, 0xffff, 0xffff }, // lightning -+ { Qt::Key_Up, 0xffff, 0xffff, 0xffff }, // Wheel Up -+ { Qt::Key_Down, 0xffff, 0xffff, 0xffff }, // Wheel Down -+#endif - { 0, 0xffff , 0xffff , 0xffff } - }; - #endif -@@ -406,7 +411,7 @@ - qwsServer->processKeyEvent( unicode, keycode, modifiers, isPress, autoRepeat ); - } - --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_BEAGLE) - #define QT_QWS_AUTOREPEAT_MANUALLY - #endif - -@@ -791,13 +796,15 @@ - bool repeatable = TRUE; - - #if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) && !defined(QT_QWS_CUSTOM) -+#warning "Compiling in Keyboard code" - switch (code) { - case 0x7a: case 0x7b: case 0x7c: case 0x7d: - keyCode = code - 0x7a + Key_F9; - repeatable = FALSE; - break; - case 0x79: -- keyCode = Key_SysReq; -+ qWarning("Keyboard Power Button activated!"); -+ keyCode = Key_F34; // Power Button on Beagle - repeatable = FALSE; - break; - case 0x78: diff --git a/qte/qte-2.3.7/c700-hardware.patch b/qte/qte-2.3.7/c700-hardware.patch deleted file mode 100644 index 36d649f746..0000000000 --- a/qte/qte-2.3.7/c700-hardware.patch +++ /dev/null @@ -1,119 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~c700-hardware 2003-07-17 03:20:26.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-06-29 15:42:57.000000000 +0200 -@@ -126,7 +126,7 @@ - static QRect maxwindow_rect; - extern Q_EXPORT QRect qt_maxWindowRect; - static const char *defaultMouse = --#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) -+#if defined(QT_QWS_CASSIOPEIA) || defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) || defined(QT_QWS_YOPY) || defined(QWS_CUSTOMTOUCHPANEL) - "TPanel" - #else - "Auto" -@@ -3067,7 +3067,7 @@ - void QWSServer::screenSaverSleep() - { - qt_screen->blank(TRUE); --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) -+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLC700) - d->screensavertimer->stop(); - #else - if ( screensaverinterval ) { ---- qt-2.3.7/src/kernel/qwsmouse_qws.cpp~c700-hardware 2004-06-29 15:28:37.000000000 +0200 -+++ qt-2.3.7/src/kernel/qwsmouse_qws.cpp 2004-06-29 15:44:04.000000000 +0200 -@@ -97,6 +97,19 @@ - #define QT_QWS_TP_MOVE_LIMIT 50 - #define QT_QWS_TP_JITTER_LIMIT 2 - #endif -+#elif defined(QT_QWS_SLC700) -+#define QT_QWS_SLC700_RAW -+typedef struct { -+ unsigned short pressure; -+ unsigned short x; -+ unsigned short y; -+ unsigned short millisecs; -+} TS_EVENT; -+#define QT_QWS_TP_SAMPLE_SIZE 10 -+#define QT_QWS_TP_MINIMUM_SAMPLES 4 -+#define QT_QWS_TP_PRESSURE_THRESHOLD 500 -+#define QT_QWS_TP_MOVE_LIMIT 50 -+#define QT_QWS_TP_JITTER_LIMIT 2 - #endif - - #ifndef QT_QWS_TP_SAMPLE_SIZE -@@ -583,7 +596,7 @@ - sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd); - notify(fd); - } --#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) -+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_SLC700) - char fn[] = "/dev/ttyS?"; - for (int ch='0'; ch<='3'; ch++) { - fn[9] = ch; -@@ -1459,7 +1472,7 @@ - : samples(QT_QWS_TP_SAMPLE_SIZE), currSample(0), lastSample(0), - numSamples(0), skipCount(0) - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - #if defined(QT_QWS_IPAQ) - # ifdef QT_QWS_IPAQ_RAW - if ((mouseFD = open( "/dev/h3600_tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1469,7 +1482,7 @@ - qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno)); - return; - } --#elif defined(QT_QWS_SL5XXX) -+#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - //# ifdef QT_QWS_SL5XXX_TSRAW - # if 0 - if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) { -@@ -1495,7 +1508,7 @@ - - QTPanelHandlerPrivate::~QTPanelHandlerPrivate() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - if (mouseFD >= 0) - close(mouseFD); - #endif -@@ -1503,7 +1516,7 @@ - - void QTPanelHandlerPrivate::readMouseData() - { --#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - if(!qt_screen) - return; - -@@ -1522,7 +1535,7 @@ - uchar *mb = mouseBuf+idx; - data = (TS_EVENT *) mb; - if(data->pressure >= QT_QWS_TP_PRESSURE_THRESHOLD) { --#ifdef QT_QWS_SL5XXX -+#if defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - samples[currSample] = QPoint( 1000 - data->x, data->y ); - #else - samples[currSample] = QPoint( data->x, data->y ); -@@ -1541,7 +1554,7 @@ - - mousePos = totalMousePos / (sampleCount - 1); - --# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW) -+# if defined(QT_QWS_IPAQ_RAW) || defined(QT_QWS_SL5XXX_RAW) || defined(QT_QWS_SLC700_RAW) - mousePos = transform( mousePos ); - # endif - if(!waspressed) -@@ -1916,7 +1929,7 @@ - handler = new QCustomTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_YOPY) - handler = new QYopyTPanelHandlerPrivate( mouseProtocol, mouseDev ); --#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) -+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_SLC700) - handler = new QTPanelHandlerPrivate( mouseProtocol, mouseDev ); - #elif defined(QT_QWS_CASSIOPEIA) - handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev ); diff --git a/qte/qte-2.3.7/compile.patch b/qte/qte-2.3.7/compile.patch deleted file mode 100644 index ce4ca82fcb..0000000000 --- a/qte/qte-2.3.7/compile.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- configure 2002-09-06 20:04:34.000000000 -0400 -+++ configure.new 2002-09-06 20:04:16.000000000 -0400 -@@ -250,7 +250,7 @@ - PLATFORM= - XPLATFORM= - FROMMAKE= --QT_CXX="" -+QT_CXX=" \$(CXXFLAGS_EXTRA)" - - - # Parse the arguments, setting things to "yes" or "no". -@@ -1356,6 +1356,7 @@ - COMPILER=`echo $PLATFORM | cut -f 2- -d-` - if [ "$COMPILER" = "g++" ] - then -+ QT_CXX="$QT_CXX -fpermissive" - if [ "$GPLUSPLUS_EXCEPTIONS" = "no" ] - then - QT_C="$QT_C -fno-exceptions" diff --git a/qte/qte-2.3.7/daemonize.patch b/qte/qte-2.3.7/daemonize.patch deleted file mode 100644 index 1f83398988..0000000000 --- a/qte/qte-2.3.7/daemonize.patch +++ /dev/null @@ -1,113 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.7/src/kernel/qapplication_qws.cpp~daemonize 2004-07-17 22:47:54.840820000 +0200 -+++ qt-2.3.7/src/kernel/qapplication_qws.cpp 2004-07-17 23:34:32.407525912 +0200 -@@ -103,6 +103,7 @@ - #endif - - #include <sys/time.h> -+#include <syslog.h> - - #if defined(_OS_AIX_) && defined(_CC_GNU_) - #include <sys/select.h> -@@ -162,6 +163,7 @@ - //these used to be environment variables, they are initialized from - //environment variables in - -+bool qws_daemon = TRUE; - bool qws_savefonts = FALSE; - bool qws_screen_is_interlaced=FALSE; //### should be detected - bool qws_shared_memory = FALSE; -@@ -1614,6 +1616,10 @@ - mwGeometry = argv[i]; - } else if ( arg == "-shared" ) { - qws_shared_memory = TRUE; -+ } else if ( arg == "-daemon" ) { -+ qws_daemon = TRUE; -+ } else if ( arg == "-nodaemon" ) { -+ qws_daemon = FALSE; - } else if ( arg == "-noshared" ) { - qws_shared_memory = FALSE; - } else if ( arg == "-savefonts" ) { -@@ -1670,6 +1676,78 @@ - qt_appType = type; - qws_single_process = TRUE; - -+ /* Daemonize the server process -- (C) Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> -+ * Added a new command line option which only is relevant if the application is created as a GuiServer. -+ * The option is -daemon respectively -nodaemon. If in daemon mode (which is the default now), the -+ * server will detach from the controlling terminal and continue as a daemon. This is done via the standard -+ * UNIX double fork magic. -+ */ -+ if ( qws_daemon ) -+ { -+ qWarning( "qt_init() - starting in daemon mode..." ); -+ -+ int pid1 = fork(); -+ if ( pid1 == -1 ) -+ { -+ qWarning( "qt_init() - can't perform initial fork: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( pid1 ) _exit( 0 ); // ok, first fork performed -+ -+ chdir( "/" ); -+ setsid(); -+ umask(0); -+ close(0); -+ close(1); -+ close(2); -+ -+ int fdnull = ::open( "/dev/null", O_RDWR ); -+ if ( fdnull == -1 ) -+ { -+ syslog( 3, "qt_init() - can't open /dev/null to redirect std{in|out|err}: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ dup2( fdnull, 0 ); // stdin -+ dup2( fdnull, 1 ); // stdout -+ dup2( fdnull, 2 ); // stderr -+ -+ int pid2 = fork(); -+ if ( pid2 == -1 ) -+ { -+ syslog( 3, "qt_init() - can't perform initial fork: %s", strerror( errno ) ); -+ exit( -1 ); -+ } -+ if ( pid2 ) -+ { -+ syslog( 4, "qt_init() [%d] - successfully entered daemon mode", pid2 ); -+ _exit( 0 ); // ok, second fork performed -+ } -+ } -+ -+ /* -+ * , , -+ * /( )` -+ * \ \___ / | B E W A R E ! -+ * /- _ `-/ ' We are a DAEMON now! -+ * (/\/ \ \ /\ -+ * / / | ` \ -+ * O O ) / | -+ * `-^--'`< ' -+ * (_.) _ ) / -+ * `.___/` / -+ * `-----' / -+ * <----. __ / __ \ -+ * <----|====O)))==) \) /==== -+ * <----' `--' `.__,' \ -+ * | | -+ * \ / -+ * ______( (_ / \______ -+ * (FL) ,' ,-----' | \ -+ * `--{__________) \/ -+ * -+ */ -+ -+ - /* Allocate a dedicated virtual terminal -- (C) Michael 'Mickey' Lauer <mickey@tm.informatik.uni-frankfurt.de> - * Added a new command line option which only is relevant if the application is created as a GuiServer. - * The option is -terminal <num>, where <num> specifies the virtual terminal to be occupied by the server. diff --git a/qte/qte-2.3.7/devfs.patch b/qte/qte-2.3.7/devfs.patch deleted file mode 100644 index 822faa7fd1..0000000000 --- a/qte/qte-2.3.7/devfs.patch +++ /dev/null @@ -1,164 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- qt-2.3.7/configure~devfs -+++ qt-2.3.7/configure -@@ -402,6 +402,9 @@ - -tslib) - TSLIB=yes - ;; -+ -devfs) -+ DEVFS=yes -+ ;; - -no-g++-exceptions) - GPLUSPLUS_EXCEPTIONS=no - ;; -@@ -1261,6 +1264,8 @@ - -tslib ............. Use the TSLib (touchscreen access library) mouse handler - by default, instead of the normal device default. - -+ -devfs ............. Use devfs /dev paths. -+ - -no-g++-exceptions . Disable exceptions on platforms using the GNU C++ - compiler by using the -fno-exceptions flag. - -@@ -1327,6 +1332,11 @@ - QT_LIBS="${QT_LIBS} -lts" - fi - -+if [ "x$DEVFS" = "xyes" ] -+then -+ QT_CXX="${QT_CXX} -DQT_QWS_DEVFS" -+fi -+ - if [ "x$THREAD" = "xyes" ] - then - cat >src-mt.mk <<EOF ---- qt-2.3.7/src/kernel/qgfxlinuxfb_qws.cpp~devfs -+++ qt-2.3.7/src/kernel/qgfxlinuxfb_qws.cpp -@@ -101,11 +101,19 @@ - bool QLinuxFbScreen::connect( const QString &displaySpec ) - { - // Check for explicitly specified device -+#ifdef QT_QWS_DEVFS -+ QRegExp r( "/dev/fb/[0-9]+" ); -+#else - QRegExp r( "/dev/fb[0-9]+" ); -+#endif - int len; - int m = r.match( displaySpec, 0, &len ); - -+#ifdef QT_QWS_DEVFS -+ QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb/0"); -+#else - QString dev = (m>=0) ? displaySpec.mid( m, len ) : QString("/dev/fb0"); -+#endif - - fd=open( dev.latin1(), O_RDWR ); - if (fd<0) { -@@ -121,14 +129,22 @@ - - /* Get fixed screen information */ - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qWarning("Error reading fixed information"); - return FALSE; - } - - /* Get variable screen information */ - if (ioctl(fd, FBIOGET_VSCREENINFO, &vinfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qWarning("Error reading variable information"); - return FALSE; - } -@@ -165,7 +181,11 @@ - data += dataoffset; - - if ((int)data == -1) { -- perror("mapping /dev/fb0"); -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else -+ perror("reading /dev/fb0"); -+#endif - qWarning("Error: failed to map framebuffer device to memory."); - return FALSE; - } -@@ -229,7 +249,11 @@ - - static void writeTerm(const char* termctl, int sizeof_termctl) - { -+#ifdef QT_QWS_DEVFS -+ const char* tt[]={"/dev/vc/1","/dev/console","/dev/tty",0}; -+#else - const char* tt[]={"/dev/console","/dev/tty","/dev/tty0",0}; -+#endif - const char** dev=tt; - while (*dev) { - int tty=::open(*dev,O_WRONLY); -@@ -792,7 +816,11 @@ - fb_var_screeninfo vinfo; - - if (ioctl(fd, FBIOGET_FSCREENINFO, &finfo)) { -+#ifdef QT_QWS_DEVFS -+ perror("reading /dev/fb/0"); -+#else - perror("reading /dev/fb0"); -+#endif - qFatal("Error reading fixed information"); - } - ---- qt-2.3.7/src/kernel/qkeyboard_qws.cpp~devfs -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp -@@ -1017,7 +1017,11 @@ - - QWSTtyKeyboardHandler::QWSTtyKeyboardHandler(const QString& device) - { -+#ifdef QT_QWS_DEVFS -+ kbdFD=open(device.isEmpty() ? "/dev/vc/1" : device.latin1(), O_RDWR | O_NDELAY, 0); -+#else - kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); -+#endif - - if ( kbdFD >= 0 ) { - QSocketNotifier *notifier; ---- qt-2.3.7/src/kernel/qwindowsystem_qws.cpp~devfs -+++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp -@@ -762,7 +762,11 @@ - void openDevice() - { - if ( !sn ) { -+#ifdef QT_QWS_DEVFS -+ int fd = ::open("/dev/sound/dsp",O_RDWR); -+#else - int fd = ::open("/dev/dsp",O_RDWR); -+#endif - if ( fd < 0 ) { - // For debugging purposes - defined QT_NO_SOUND if you - // don't have sound hardware! ---- qt-2.3.7/src/kernel/qsoundqss_qws.cpp~devfs -+++ qt-2.3.7/src/kernel/qsoundqss_qws.cpp -@@ -388,7 +388,12 @@ - // - // Don't block open right away. - // -- if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) { -+#ifdef QT_QWS_DEVFS -+ if ((fd = ::open("/dev/sound/dsp", O_WRONLY|O_NONBLOCK)) != -1) -+#else -+ if ((fd = ::open("/dev/dsp", O_WRONLY|O_NONBLOCK)) != -1) -+#endif -+ { - int flags = fcntl(fd, F_GETFL); - flags &= ~O_NONBLOCK; - if (fcntl(fd, F_SETFL, flags) != 0) { diff --git a/qte/qte-2.3.7/encoding.patch b/qte/qte-2.3.7/encoding.patch deleted file mode 100644 index 5ddb43c2f6..0000000000 --- a/qte/qte-2.3.7/encoding.patch +++ /dev/null @@ -1,49 +0,0 @@ -German umlaute quite likely french, italian, spanish did -not work due QFile::[decode,encode]Name did call QString -local8Bit,fromLocal8Bit which plainly tried to use utf8 -encoding even if not useful. So a filename got changed -and QFileInfo recognized the file not beeing present anymore... -which lead to files not be shown. -Also with Year-Names problem exists as the base system sent -it encoded upstream. - -If you want to have UTF-8 encoding use LC_CTYPE as always and -QTextCodec::codecForLocale will use the right UTF-8 encoding. - -As fallback the old behaviour was preserved - - - - - - - ---- qt-2.3.8-old/src/tools/qstring.cpp 2004-07-23 14:33:02.000000000 +0200 -+++ qt-2.3.8/src/tools/qstring.cpp 2004-07-23 14:32:31.000000000 +0200 -@@ -14469,7 +14469,11 @@ - return qt_winQString2MB( *this ); - #endif - #ifdef _WS_QWS_ -- return utf8(); // ##### if there is ANY 8 bit format supported? -+ QTextCodec* codec = QTextCodec::codecForLocale(); -+ return codec -+ ? codec->fromUnicode(*this) -+ : utf8(); -+ //return latin1(); // ##### if there is ANY 8 bit format supported? - #endif - #endif - } -@@ -14515,7 +14519,12 @@ - return qt_winMB2QString( local8Bit ); - #endif - #ifdef _WS_QWS_ -- return fromUtf8(local8Bit,len); -+ QTextCodec* codec = QTextCodec::codecForLocale(); -+ if( len < 0) len = qstrlen(local8Bit); -+ return codec -+ ? codec->toUnicode(local8Bit, len) -+ : QString::fromUtf8(local8Bit,len); -+// return fromLatin1(local8Bit,len); - #endif - #endif // QT_NO_TEXTCODEC - } diff --git a/qte/qte-2.3.7/fix-qgfxraster.patch b/qte/qte-2.3.7/fix-qgfxraster.patch deleted file mode 100644 index 0a2986bfa1..0000000000 --- a/qte/qte-2.3.7/fix-qgfxraster.patch +++ /dev/null @@ -1,30 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - ---- qt-2.3.7/src/kernel/qgfxraster_qws.cpp~fix-qgfxraster -+++ qt-2.3.7/src/kernel/qgfxraster_qws.cpp -@@ -3876,14 +3876,15 @@ - for( loopc2=0;loopc2<frontadd;loopc2++ ) - *(alphaptr++)=get_value_32(16,(unsigned char **)&temppos); - -- PackType temp2; -- unsigned char * cp; -+ volatile PackType temp2; -+ volatile unsigned short int * cp; - for( loopc2=0;loopc2<count;loopc2++ ) { -- temp2=*((PackType *)temppos); -- cp=(unsigned char *)&temp2; -- *(alphaptr++)=get_value_32(16,&cp); -- *(alphaptr++)=get_value_32(16,&cp); -- temppos += 2; -+ temp2=*reinterpret_cast<PackType *>(temppos); -+ cp=reinterpret_cast<volatile unsigned short int *>(&temp2); -+ *(alphaptr++)=qt_conv16ToRgb(*cp); -+ cp++; -+ *(alphaptr++)=qt_conv16ToRgb(*cp); -+ temppos += 2; - } - - for( loopc2=0;loopc2<backadd;loopc2++ ) diff --git a/qte/qte-2.3.7/gcc3_4.patch b/qte/qte-2.3.7/gcc3_4.patch deleted file mode 100644 index a7f168138d..0000000000 --- a/qte/qte-2.3.7/gcc3_4.patch +++ /dev/null @@ -1,510 +0,0 @@ -diff -ur qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp ---- qt-2.3.7_old/src/kernel/qgfxtransformed_qws.cpp 2004-09-10 21:08:04.000000000 +0200 -+++ qt-2.3.7/src/kernel/qgfxtransformed_qws.cpp 2004-09-10 21:08:42.000000000 +0200 -@@ -671,11 +671,11 @@ - inline int tx( int x, int y ) { - switch ( qt_trans_screen->transformation() ) { - case QTransformedScreen::Rot90: -- return y - xoffs + yoffs; -+ return y - this->xoffs + this->yoffs; - case QTransformedScreen::Rot180: -- return (width - x - 1) - xoffs - xoffs; -+ return (this->width - x - 1) - this->xoffs - this->xoffs; - case QTransformedScreen::Rot270: -- return (height - y - 1) - xoffs - yoffs; -+ return (this->height - y - 1) - this->xoffs - this->yoffs; - default: - return x; - } -@@ -683,11 +683,11 @@ - inline int ty( int x, int y ) { - switch ( qt_trans_screen->transformation() ) { - case QTransformedScreen::Rot90: -- return (width - x - 1) - yoffs - xoffs; -+ return (this->width - x - 1) - this->yoffs - this->xoffs; - case QTransformedScreen::Rot180: -- return (height - y - 1) - yoffs - yoffs; -+ return (this->height - y - 1) - this->yoffs - this->yoffs; - case QTransformedScreen::Rot270: -- return x - yoffs + xoffs; -+ return x - this->yoffs + this->xoffs; - default: - return y; - } -@@ -715,23 +715,23 @@ - template <const int depth, const int type> - void QGfxTransformedRaster<depth,type>::setSourceWidgetOffset(int x, int y) - { -- if ( srcbits == buffer ) { -+ if ( this->srcbits == this->buffer ) { - switch ( qt_trans_screen->transformation() ) { - case QTransformedScreen::Rot90: -- srcwidgetoffs = QPoint( y, width - x - srcwidth ); -+ this->srcwidgetoffs = QPoint( y, this->width - x - this->srcwidth ); - break; - case QTransformedScreen::Rot180: -- srcwidgetoffs = QPoint( width - x - srcwidth, height - y - srcheight ); -+ this->srcwidgetoffs = QPoint( this->width - x - this->srcwidth, this->height - y - this->srcheight ); - break; - case QTransformedScreen::Rot270: -- srcwidgetoffs = QPoint( height - y - srcheight, x ); -+ this->srcwidgetoffs = QPoint( this->height - y - this->srcheight, x ); - break; - default: -- srcwidgetoffs = QPoint( x, y ); -+ this->srcwidgetoffs = QPoint( x, y ); - break; - } - } else -- srcwidgetoffs = QPoint( x, y ); -+ this->srcwidgetoffs = QPoint( x, y ); - } - - template <const int depth, const int type> -@@ -739,8 +739,8 @@ - { - QT_TRANS_GFX_BASE<depth,type>::setSource(i); - QSize s = qt_screen->mapToDevice( QSize(i->width(), i->height()) ); -- srcwidth = s.width(); -- srcheight = s.height(); -+ this->srcwidth = s.width(); -+ this->srcheight = s.height(); - } - - template <const int depth, const int type> -@@ -782,7 +782,7 @@ - if ( w == 0 || h == 0 ) - return; - QRect r( x, y, w, h ); -- if ( cbrush.style() == SolidPattern ) { -+ if ( this->cbrush.style() == Qt::SolidPattern ) {< |
