[oe-commits] org.oe.dev qte 2.3.10: Rethink hardware platform defines.
pfalcon commit
openembedded-commits at lists.openembedded.org
Sat Jan 13 02:46:43 UTC 2007
qte 2.3.10: Rethink hardware platform defines.
* Let there be two major platforms, Zaurus and Wince. Let there be
two defines, QT_QWS_SL5XXX and QT_QWS_IPAQ, to define generic device
of the corresponding platform.
* Let there be also possibility to specialize for specific device of the
platform. But corresponding define must be always used bu the generic platform
device above.
* For example, QT_QWS_SLC700 is a Zaurus C7x0 device, and it always must be
defined together with QT_QWS_SL5XXX. Or QT_QWS_SIMPAD, an QT_QWS_IPAQ
specialization.
* As generic define is implied by specific, if we somewhere have test for
generic define, we don't need to additionally test for "specific" define.
* Thus, bunch of hunks in device-specific patches are superflous and can be
dropped.
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: 8b68732f6ed6c9d72f30670dc4af600785cedeb1
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8b68732f6ed6c9d72f30670dc4af600785cedeb1
Files:
1
packages/qte/qte-2.3.10/c700-hardware.patch
packages/qte/qte-2.3.10/simpad.patch
packages/qte/qte-mt_2.3.10.bb
packages/qte/qte_2.3.10.bb
Diffs:
#
# mt diff -rd74ad2ecc1f949891ddc225aa0c91cd497c08b3e -r8b68732f6ed6c9d72f30670dc4af600785cedeb1
#
#
#
# patch "packages/qte/qte-2.3.10/c700-hardware.patch"
# from [6cbbd2d6aeb03c05012bee17f59debb41b9504a2]
# to [e67e1142659ff464395228365e4243c96f1561bb]
#
# patch "packages/qte/qte-2.3.10/simpad.patch"
# from [f7de455486199023261e04dae47cce4a7083d800]
# to [8fbb4c4b4a30650db7977e90411f05a87d06f447]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [b9bdf28dc302ea0dfbe1b46cd6bf79c9c1c58da5]
# to [be751b5a1b5ad5093f3b591f687fd6d253c32ee7]
#
# patch "packages/qte/qte_2.3.10.bb"
# from [35174132520c7d46b5e5a45b5d962882c880f081]
# to [b95166811e5fe8ba21a1aad9c5dedb2b6f2518ba]
#
============================================================
--- packages/qte/qte-2.3.10/c700-hardware.patch 6cbbd2d6aeb03c05012bee17f59debb41b9504a2
+++ packages/qte/qte-2.3.10/c700-hardware.patch e67e1142659ff464395228365e4243c96f1561bb
@@ -1,28 +1,8 @@
#
# Patch managed by http://www.holgerschurig.de/patcher.html
#
---- qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp~c700-hardware
-+++ qt-2.3.9-snapshot-20050114/src/kernel/qwindowsystem_qws.cpp
-@@ -178,7 +178,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"
- #elif defined(QT_KEYPAD_MODE)
- "None"
-@@ -3308,7 +3308,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.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp~c700-hardware
+++ qt-2.3.9-snapshot-20050114/src/kernel/qwsmouse_qws.cpp
@@ -87,6 +87,19 @@
@@ -45,66 +25,3 @@
#endif
#ifndef QT_QWS_TP_SAMPLE_SIZE
-@@ -592,7 +605,7 @@
- sub[nsub++] = new QAutoMouseSubHandler_intellimouse(fd);
- notify(fd);
- }
--#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2)
-+#if !defined(QT_QWS_IPAQ) && !defined(QT_QWS_SL5XXX) && !defined(QT_QWS_K2) && !defined(QT_QWS_SLC700)
- char fn[] = "/dev/ttyS?";
- for (int ch='0'; ch<='3'; ch++) {
- fn[9] = ch;
-@@ -1274,7 +1287,7 @@
- numSamples(0), skipCount(0)
- {
- Q_UNUSED(dev);
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || 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) {
-@@ -1284,7 +1297,7 @@
- qWarning( "Cannot open /dev/h3600_ts (%s)", strerror(errno));
- return;
- }
--#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#elif defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
- //# ifdef QT_QWS_SL5XXX_TSRAW
- # if 0
- if ((mouseFD = open( "/dev/tsraw", O_RDONLY | O_NDELAY)) < 0) {
-@@ -1310,7 +1323,7 @@
-
- QTPanelHandlerPrivate::~QTPanelHandlerPrivate()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
- if (mouseFD >= 0)
- close(mouseFD);
- #endif
-@@ -1318,7 +1331,7 @@
-
- void QTPanelHandlerPrivate::readMouseData()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
- if(!qt_screen)
- return;
-
-@@ -1337,7 +1350,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 );
-@@ -1997,7 +2010,7 @@
- handler = new QTSLibHandlerPrivate();
- #elif defined(QT_QWS_YOPY)
- handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev);
--#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2)
-+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
- handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev);
- #elif defined(QT_QWS_CASSIOPEIA)
- handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev );
============================================================
--- packages/qte/qte-2.3.10/simpad.patch f7de455486199023261e04dae47cce4a7083d800
+++ packages/qte/qte-2.3.10/simpad.patch 8fbb4c4b4a30650db7977e90411f05a87d06f447
@@ -338,30 +338,3 @@
#endif
QSocketNotifier *mouseNotifier;
-@@ -1323,7 +1330,7 @@
-
- QTPanelHandlerPrivate::~QTPanelHandlerPrivate()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD)
- if (mouseFD >= 0)
- close(mouseFD);
- #endif
-@@ -1331,7 +1338,7 @@
-
- void QTPanelHandlerPrivate::readMouseData()
- {
--#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-+#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD)
- if(!qt_screen)
- return;
-
-@@ -2013,7 +2020,7 @@
- handler = new QTSLibHandlerPrivate();
- #elif defined(QT_QWS_YOPY)
- handler = new QYopyTPanelHandlerPrivate(mouseProtocol,mouseDev);
--#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700)
-+#elif defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX) || defined(QT_QWS_K2) || defined(QT_QWS_SLC700) || defined(QT_QWS_SIMPAD)
- handler = new QTPanelHandlerPrivate(mouseProtocol,mouseDev);
- #elif defined(QT_QWS_CASSIOPEIA)
- handler = new QVrTPanelHandlerPrivate( mouseProtocol, mouseDev );
============================================================
--- packages/qte/qte-mt_2.3.10.bb b9bdf28dc302ea0dfbe1b46cd6bf79c9c1c58da5
+++ packages/qte/qte-mt_2.3.10.bb be751b5a1b5ad5093f3b591f687fd6d253c32ee7
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r7"
+PR = "r8"
EXTRA_OECONF += "-thread"
============================================================
--- packages/qte/qte_2.3.10.bb 35174132520c7d46b5e5a45b5d962882c880f081
+++ packages/qte/qte_2.3.10.bb b95166811e5fe8ba21a1aad9c5dedb2b6f2518ba
@@ -1,3 +1,3 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r47"
+PR = "r48"
More information about the Openembedded-commits
mailing list