rev 8144 - trunk/packages/qt4-x11/debian/patches
Fathi Boudra
fabo at alioth.debian.org
Thu Dec 6 21:48:31 UTC 2007
Author: fabo
Date: 2007-12-06 21:48:31 +0000 (Thu, 06 Dec 2007)
New Revision: 8144
Added:
trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff
trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
Removed:
trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff
trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff
trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff
trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff
trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff
trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff
trunk/packages/qt4-x11/debian/patches/0197-fix-qstylesheetstyle.diff
trunk/packages/qt4-x11/debian/patches/0198-fix-qstylesheetstyle2.diff
Modified:
trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff
trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
trunk/packages/qt4-x11/debian/patches/series
Log:
* Prepare Qt4.3.3:
* Update patches.
* Add patches 0200 and 0203.
* Remove patches merged upstream.
Deleted: trunk/packages/qt4-x11/debian/patches/0163-fix-gcc43-support.diff
Modified: trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0167-fix-group-reading.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -9,7 +9,7 @@
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -845,9 +845,16 @@
+@@ -843,9 +843,16 @@
} else if (own == OwnerGroup) {
struct group *gr = 0;
#if !defined(QT_NO_THREAD) && defined(_POSIX_THREAD_SAFE_FUNCTIONS) && !defined(Q_OS_OPENBSD)
Added: trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0172-prefer-xrandr-over-xinerama.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -0,0 +1,47 @@
+qt-bugs@ issue : none
+Trolltech task ID : none
+bugs.kde.org number :
+applied: no
+author: Dirk Mueller <mueller at kde.org>
+
+only trust libxinerama if its not the emulated information
+coming from xrandr 1.2. xrandr 1.2 is merged fb and libxinerama
+presents then virtual screens in clone mode, which qt (and KDE)
+can't deal with.
+
+proper fix would be to detect crtcs as virtual screens, but
+given that qt can't deal with dynamically changing number of screens,
+this is for "when I have time".
+
+--- a/src/gui/kernel/qdesktopwidget_x11.cpp
++++ b/src/gui/kernel/qdesktopwidget_x11.cpp
+@@ -140,7 +140,8 @@
+
+ // get the geometry of each screen
+ int i, x, y, w, h;
+- for (i = 0; i < screenCount; i++) {
++ int itScreenCount = screenCount;
++ for (i = 0; i < itScreenCount; i++) {
+
+ #ifndef QT_NO_XINERAMA
+ if (use_xinerama) {
+@@ -158,10 +159,19 @@
+ }
+
+ rects[i].setRect(x, y, w, h);
++ if (i > 0 && rects[i-1].intersects(rects[i]) &&
++ (rects[i].width()*rects[i].height()) >
++ (rects[i-1].width()*rects[i-1].height())) {
++ rects[i-1] = rects[i];
++ screenCount--;
++ }
+ workareas[i] = QRect();
+ }
+
+ #ifndef QT_NO_XINERAMA
++ if (use_xinerama && screenCount == 1)
++ use_xinerama = false;
++
+ if (xinerama_screeninfo)
+ XFree(xinerama_screeninfo);
+ #endif // QT_NO_XINERAMA
Modified: trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0175-fix-s390-qatomic.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -8,7 +8,7 @@
--- a/src/corelib/arch/qatomic_s390.h
+++ b/src/corelib/arch/qatomic_s390.h
-@@ -197,10 +197,20 @@
+@@ -195,10 +195,20 @@
#endif
}
Modified: trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0176-coverity-fixes.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -8,7 +8,7 @@
--- a/src/gui/painting/qimagescale.cpp
+++ b/src/gui/painting/qimagescale.cpp
-@@ -1020,6 +1020,7 @@
+@@ -1024,6 +1024,7 @@
buffer = QImage(dw, dh, src.format());
if (buffer.isNull()) {
qWarning("QImage: out of memory, returning null");
@@ -18,7 +18,7 @@
--- a/src/svg/qsvghandler.cpp
+++ b/src/svg/qsvghandler.cpp
-@@ -1144,15 +1144,9 @@
+@@ -1142,15 +1142,9 @@
if (!size.isEmpty()) {
QSvgHandler::LengthType type;
qreal len = parseLength(size, type, handler);
Modified: trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0178-transparency-window-types.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -6,23 +6,32 @@
This patch adds Qt support for new window types used for compositing.
---- a/src/gui/kernel/qapplication_x11.cpp
-+++ b/src/gui/kernel/qapplication_x11.cpp
-@@ -214,6 +214,11 @@
- "_NET_WM_WINDOW_TYPE_SPLASH\0"
- "_NET_WM_WINDOW_TYPE_TOOLBAR\0"
- "_NET_WM_WINDOW_TYPE_UTILITY\0"
-+ "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0"
-+ "_NET_WM_WINDOW_TYPE_POPUP_MENU\0"
-+ "_NET_WM_WINDOW_TYPE_COMBO\0"
-+ "_NET_WM_WINDOW_TYPE_DND\0"
-+ "_NET_WM_WINDOW_TYPE_TOOLTIP\0"
+
+--- a/src/gui/kernel/qwidget.h
++++ b/src/gui/kernel/qwidget.h
+@@ -352,6 +352,19 @@
- "_KDE_NET_WM_FRAME_STRUT\0"
+ void setWindowOpacity(qreal level);
+ qreal windowOpacity() const;
++#if defined(Q_WS_X11)
++ enum X11WindowType {
++ X11WindowTypeSelect,
++ X11WindowTypeCombo,
++ X11WindowTypeDND,
++ X11WindowTypeTooltip,
++ X11WindowTypeMenu, // torn-off
++ X11WindowTypeDropdown,
++ X11WindowTypePopup
++ };
++ void x11SetWindowType( X11WindowType type = X11WindowTypeSelect );
++ void x11SetWindowTransient( QWidget* parent );
++#endif
+ bool isWindowModified() const;
+ #ifndef QT_NO_TOOLTIP
--- a/src/gui/kernel/qdnd_x11.cpp
+++ b/src/gui/kernel/qdnd_x11.cpp
-@@ -270,6 +270,7 @@
+@@ -268,6 +268,7 @@
QWidget(QApplication::desktop()->screen(screen),
Qt::Tool | Qt::FramelessWindowHint | Qt::X11BypassWindowManagerHint)
{
@@ -30,7 +39,7 @@
}
void setPixmap(const QPixmap &pm)
-@@ -1438,6 +1439,7 @@
+@@ -1436,6 +1437,7 @@
// recreate the pixmap on the new screen...
delete xdnd_data.deco;
xdnd_data.deco = new QShapedPixmapWidget(screen);
@@ -38,7 +47,7 @@
if (!QWidget::mouseGrabber()) {
updatePixmap();
xdnd_data.deco->grabMouse();
-@@ -1899,6 +1901,7 @@
+@@ -1897,6 +1899,7 @@
object = o;
object->d_func()->target = 0;
xdnd_data.deco = new QShapedPixmapWidget();
@@ -48,7 +57,7 @@
--- a/src/gui/kernel/qt_x11_p.h
+++ b/src/gui/kernel/qt_x11_p.h
-@@ -530,6 +530,11 @@
+@@ -528,6 +528,11 @@
_NET_WM_WINDOW_TYPE_SPLASH,
_NET_WM_WINDOW_TYPE_TOOLBAR,
_NET_WM_WINDOW_TYPE_UTILITY,
@@ -62,7 +71,7 @@
--- a/src/gui/kernel/qtooltip.cpp
+++ b/src/gui/kernel/qtooltip.cpp
-@@ -149,6 +149,9 @@
+@@ -147,6 +147,9 @@
setMouseTracking(true);
fadingOut = false;
reuseTip(text);
@@ -72,7 +81,7 @@
}
void QTipLabel::restartHideTimer()
-@@ -369,6 +372,10 @@
+@@ -367,6 +370,10 @@
// that is showing (removes flickering)
if (QTipLabel::instance->tipChanged(pos, text, w)){
QTipLabel::instance->reuseTip(text);
@@ -83,7 +92,7 @@
QTipLabel::instance->setTipRect(w, rect);
QTipLabel::instance->placeTip(pos, w);
}
-@@ -378,6 +385,10 @@
+@@ -376,6 +383,10 @@
if (!text.isEmpty()){ // no tip can be reused, create new tip:
new QTipLabel(pos, text, w); // sets QTipLabel::instance to itself
@@ -94,31 +103,23 @@
QTipLabel::instance->setTipRect(w, rect);
QTipLabel::instance->placeTip(pos, w);
QTipLabel::instance->setObjectName(QLatin1String("qtooltip_label"));
---- a/src/gui/kernel/qwidget.h
-+++ b/src/gui/kernel/qwidget.h
-@@ -354,6 +354,19 @@
+--- a/src/gui/kernel/qapplication_x11.cpp
++++ b/src/gui/kernel/qapplication_x11.cpp
+@@ -212,6 +212,11 @@
+ "_NET_WM_WINDOW_TYPE_SPLASH\0"
+ "_NET_WM_WINDOW_TYPE_TOOLBAR\0"
+ "_NET_WM_WINDOW_TYPE_UTILITY\0"
++ "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU\0"
++ "_NET_WM_WINDOW_TYPE_POPUP_MENU\0"
++ "_NET_WM_WINDOW_TYPE_COMBO\0"
++ "_NET_WM_WINDOW_TYPE_DND\0"
++ "_NET_WM_WINDOW_TYPE_TOOLTIP\0"
- void setWindowOpacity(qreal level);
- qreal windowOpacity() const;
-+#if defined(Q_WS_X11)
-+ enum X11WindowType {
-+ X11WindowTypeSelect,
-+ X11WindowTypeCombo,
-+ X11WindowTypeDND,
-+ X11WindowTypeTooltip,
-+ X11WindowTypeMenu, // torn-off
-+ X11WindowTypeDropdown,
-+ X11WindowTypePopup
-+ };
-+ void x11SetWindowType( X11WindowType type = X11WindowTypeSelect );
-+ void x11SetWindowTransient( QWidget* parent );
-+#endif
+ "_KDE_NET_WM_FRAME_STRUT\0"
- bool isWindowModified() const;
- #ifndef QT_NO_TOOLTIP
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -562,10 +562,6 @@
+@@ -560,10 +560,6 @@
}
#endif // QT_NO_XRENDER
@@ -129,7 +130,7 @@
QtMWMHints mwmhints;
mwmhints.flags = 0L;
mwmhints.functions = MWM_FUNC_ALL;
-@@ -576,15 +572,11 @@
+@@ -574,15 +570,11 @@
if (topLevel) {
ulong wsa_mask = 0;
if (type == Qt::SplashScreen) {
@@ -146,7 +147,7 @@
mwmhints.decorations |= MWM_DECOR_BORDER;
mwmhints.decorations |= MWM_DECOR_RESIZEH;
-@@ -606,22 +598,6 @@
+@@ -604,22 +596,6 @@
wsa.save_under = True;
wsa_mask |= CWSaveUnder;
}
@@ -169,7 +170,7 @@
if (flags & Qt::X11BypassWindowManagerHint) {
wsa.override_redirect = True;
-@@ -640,6 +616,7 @@
+@@ -638,6 +614,7 @@
wsa.save_under = True;
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -177,7 +178,7 @@
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -684,12 +661,7 @@
+@@ -682,12 +659,7 @@
// set mwm hints
SetMWMHints(dpy, id, mwmhints);
@@ -191,7 +192,7 @@
// set _NET_WM_PID
long curr_pid = getpid();
-@@ -785,6 +757,63 @@
+@@ -783,6 +755,63 @@
q->setAttribute(Qt::WA_OutsideWSRange, true);
}
@@ -257,7 +258,7 @@
destroyWindow is true.
--- a/src/gui/widgets/qcombobox.cpp
+++ b/src/gui/widgets/qcombobox.cpp
-@@ -333,6 +333,10 @@
+@@ -332,6 +332,10 @@
combo->update();
}
}
@@ -267,10 +268,10 @@
+#endif
}
- void QComboBoxPrivateContainer::leaveEvent(QEvent *)
+ void QComboBoxPrivateContainer::resizeEvent(QResizeEvent *e)
--- a/src/gui/widgets/qmenu.cpp
+++ b/src/gui/widgets/qmenu.cpp
-@@ -99,6 +99,9 @@
+@@ -97,6 +97,9 @@
QTornOffMenu(QMenu *p) : QMenu(*(new QTornOffMenuPrivate(p)))
{
setParent(p, Qt::Window | Qt::Tool);
@@ -280,7 +281,7 @@
setAttribute(Qt::WA_DeleteOnClose, true);
setWindowTitle(p->windowTitle());
setEnabled(p->isEnabled());
-@@ -145,6 +148,9 @@
+@@ -143,6 +146,9 @@
}
defaultMenuAction = menuAction = new QAction(q);
menuAction->d_func()->menu = q;
@@ -290,10 +291,11 @@
}
//Windows and KDE allows menus to cover the taskbar, while GNOME and Mac don't
-@@ -1682,6 +1688,32 @@
+@@ -1678,6 +1684,33 @@
+ }
}
setGeometry(QRect(pos, size));
-
++
+#ifdef Q_WS_X11
+ QWidget* top = this;
+ for(;;) {
@@ -323,7 +325,7 @@
#ifndef QT_NO_EFFECTS
int hGuess = qApp->layoutDirection() == Qt::RightToLeft ? QEffects::LeftScroll : QEffects::RightScroll;
int vGuess = QEffects::DownScroll;
-@@ -1878,6 +1910,9 @@
+@@ -1874,6 +1907,9 @@
if (QMenuBar *mb = qobject_cast<QMenuBar*>(d->causedPopup.widget))
mb->d_func()->setCurrentAction(0);
#endif
Modified: trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0179-transient-hack.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -10,7 +10,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -1650,7 +1650,7 @@
+@@ -1648,7 +1648,7 @@
do_size_hints(q, extra);
// udpate WM_TRANSIENT_FOR
Modified: trunk/packages/qt4-x11/debian/patches/0180-window-role.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0180-window-role.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -36,7 +36,7 @@
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
-@@ -1008,9 +1008,18 @@
+@@ -1006,9 +1006,18 @@
{
Q_D(QObject);
d->objectName = name;
@@ -57,7 +57,7 @@
QObject::child is compat but needs to call itself recursively,
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
-@@ -139,6 +139,9 @@
+@@ -137,6 +137,9 @@
mutable quint32 connectedSignals;
QString objectName;
@@ -69,7 +69,7 @@
class QSemaphore;
--- a/src/gui/kernel/qwidget_p.h
+++ b/src/gui/kernel/qwidget_p.h
-@@ -309,6 +309,7 @@
+@@ -307,6 +307,7 @@
#if defined(Q_WS_X11)
void setWindowRole(const char *role);
@@ -79,7 +79,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -671,11 +671,8 @@
+@@ -669,11 +669,8 @@
// when we create a toplevel widget, the frame strut should be dirty
data.fstrut_dirty = 1;
@@ -93,7 +93,7 @@
// set client leader property
XChangeProperty(dpy, id, ATOM(WM_CLIENT_LEADER),
-@@ -2671,12 +2668,20 @@
+@@ -2669,12 +2666,20 @@
void QWidgetPrivate::setWindowRole(const char *role)
{
Q_Q(QWidget);
Deleted: trunk/packages/qt4-x11/debian/patches/0185-fix-format-strings.diff
Modified: trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0187-fix-font-fixed-pitch.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -1,5 +1,5 @@
qt-bugs@ issue : 173297
-Trolltech task ID : 175024
+Trolltech task ID : 175024 (status: pending for Qt 4.4.0)
applied: no
author: Matthew Woehlke <mw_triad at users.sourceforge.net>
@@ -17,7 +17,7 @@
--- a/src/gui/text/qfont.cpp
+++ b/src/gui/text/qfont.cpp
-@@ -2093,7 +2093,6 @@
+@@ -2091,7 +2091,6 @@
{
QFontEngine *engine = d->engineForScript(QUnicodeTables::Common);
Q_ASSERT(engine != 0);
@@ -25,7 +25,7 @@
if (!engine->fontDef.fixedPitchComputed) {
QChar ch[2] = { QLatin1Char('i'), QLatin1Char('m') };
QGlyphLayout g[2];
-@@ -2102,7 +2101,6 @@
+@@ -2100,7 +2099,6 @@
engine->fontDef.fixedPitch = g[0].advance.x == g[1].advance.x;
engine->fontDef.fixedPitchComputed = true;
}
@@ -35,7 +35,7 @@
--- a/src/gui/text/qfont_p.h
+++ b/src/gui/text/qfont_p.h
-@@ -66,9 +66,7 @@
+@@ -64,9 +64,7 @@
styleStrategy(QFont::PreferDefault), styleHint(QFont::AnyStyle),
weight(50), fixedPitch(false), style(QFont::StyleNormal), stretch(100),
ignorePitch(true)
@@ -45,7 +45,7 @@
{
}
-@@ -90,7 +88,7 @@
+@@ -88,7 +86,7 @@
uint stretch : 12; // 0-400
uint ignorePitch : 1;
Deleted: trunk/packages/qt4-x11/debian/patches/0188-fix-moc-parser-same-name-header.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0189-fix-q3toolbar-qcombobox-signal-slot.diff
Modified: trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0191-listview-alternate-row-colors.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -1,5 +1,5 @@
qt-bugs@ issue : 178507
-Trolltech task ID : 179170
+Trolltech task ID : 179170 (status: fixed for Qt 4.4.0)
applied: no
author: Matthew Woehlke <mw_triad at users.sourceforge.net>
Modified: trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0192-itemdelegate-palette-state.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -1,5 +1,5 @@
qt-bugs@ issue : 178507
-Trolltech task ID : 179170
+Trolltech task ID : 179170 (status: fixed for Qt 4.4.0)
applied: no
author: Matthew Woehlke <mw_triad at users.sourceforge.net>
@@ -9,7 +9,7 @@
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
-@@ -635,10 +635,10 @@
+@@ -633,10 +633,10 @@
QPen pen = painter->pen();
QPalette::ColorGroup cg = option.state & QStyle::State_Enabled
Deleted: trunk/packages/qt4-x11/debian/patches/0193-qtreeview-division-by-zero.diff
Modified: trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0194-fix-moveonly-dnd-in-itemviews.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -1,13 +1,24 @@
qt-bugs@ issue : 181399
-Trolltech task ID : 181413
+Trolltech task ID : 181413 (status: pending for Qt 4.4.0)
applied: no
author: Matthias Kretz <kretz at kde.org>
Allows drag and drop to work without pressing the shift key for itemviews that use InternalMove.
+--- a/src/gui/itemviews/qlistview.cpp
++++ b/src/gui/itemviews/qlistview.cpp
+@@ -992,7 +992,7 @@
+ }
+ QDrag *drag = new QDrag(this);
+ drag->setMimeData(d->model->mimeData(indexes));
+- Qt::DropAction action = drag->start(supportedActions);
++ Qt::DropAction action = drag->exec(supportedActions);
+ d->dynamicListView->draggedItems.clear();
+ if (action == Qt::MoveAction)
+ d->clearOrRemove();
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
-@@ -2968,7 +2968,7 @@
+@@ -2966,7 +2966,7 @@
#ifndef QT_NO_DRAGANDDROP
/*!
@@ -16,7 +27,7 @@
*/
void QAbstractItemView::startDrag(Qt::DropActions supportedActions)
{
-@@ -2985,7 +2985,7 @@
+@@ -2983,7 +2983,7 @@
drag->setPixmap(pixmap);
drag->setMimeData(data);
drag->setHotSpot(d->pressedPosition - rect.topLeft());
@@ -25,14 +36,3 @@
d->clearOrRemove();
}
}
---- a/src/gui/itemviews/qlistview.cpp
-+++ b/src/gui/itemviews/qlistview.cpp
-@@ -992,7 +992,7 @@
- d->dynamicListView->draggedItems.push_back(*it);
- QDrag *drag = new QDrag(this);
- drag->setMimeData(d->model->mimeData(indexes));
-- Qt::DropAction action = drag->start(supportedActions);
-+ Qt::DropAction action = drag->exec(supportedActions);
- d->dynamicListView->draggedItems.clear();
- if (action == Qt::MoveAction)
- d->clearOrRemove();
Modified: trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/0195-compositing-properties.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -9,7 +9,7 @@
--- a/src/gui/kernel/qwidget_x11.cpp
+++ b/src/gui/kernel/qwidget_x11.cpp
-@@ -616,7 +616,11 @@
+@@ -614,7 +614,11 @@
wsa.save_under = True;
XChangeWindowAttributes(dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa);
@@ -18,11 +18,11 @@
+ QByteArray appName = qAppName().toLatin1();
+ class_hint.res_name = appName.data(); // application name
+ class_hint.res_class = const_cast<char *>(QX11Info::appClass()); // application class
-+ XSetClassHint(dpy, id, &class_hint);
++ XSetWMProperties(dpy, id, 0, 0, 0, 0, 0, 0, &class_hint);
} else if (topLevel && !desktop) { // top-level widget
if (!X11->wm_client_leader)
create_wm_client_leader();
-@@ -661,29 +665,34 @@
+@@ -659,29 +663,34 @@
// set mwm hints
SetMWMHints(dpy, id, mwmhints);
Deleted: trunk/packages/qt4-x11/debian/patches/0196-q3toolbar-clean-rebuild.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0197-fix-qstylesheetstyle.diff
Deleted: trunk/packages/qt4-x11/debian/patches/0198-fix-qstylesheetstyle2.diff
Added: trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0200-fix-qsslsocket-waitfor.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -0,0 +1,60 @@
+qt-bugs@ issue : N188142
+Trolltech task ID : 188329 (status: fixed for Qt 4.4.0)
+bugs.kde.org number : None
+applied: no
+author: Andreas Hartmetz <ahartmetz at gmail.com>
+
+This patch fixes that some QSslSocket::waitFor$X methods, when passed -1 as the
+argument, behave as if they were passed 0. -1 is supposed to mean "wait indefi-
+nitely" while 0 means "don't wait".
+
+
+--- a/src/network/qsslsocket.cpp
++++ b/src/network/qsslsocket.cpp
+@@ -250,6 +250,19 @@
+ #include <QtNetwork/qhostaddress.h>
+ #include <QtNetwork/qhostinfo.h>
+
++/*
++ Returns the difference between msecs and elapsed. If msecs is -1,
++ however, -1 is returned.
++*/
++static int qt_timeout_value(int msecs, int elapsed)
++{
++ if (msecs == -1)
++ return -1;
++
++ int timeout = msecs - elapsed;
++ return timeout < 0 ? 0 : timeout;
++}
++
+ class QSslSocketGlobalData
+ {
+ public:
+@@ -1109,7 +1122,7 @@
+ startClientEncryption();
+ // Loop, waiting until the connection has been encrypted or an error
+ // occurs.
+- if (!d->plainSocket->waitForReadyRead(qBound(0, msecs - stopWatch.elapsed(), msecs)))
++ if (!d->plainSocket->waitForReadyRead(qt_timeout_value(msecs, stopWatch.elapsed())))
+ return false;
+ }
+ return d->connectionEncrypted;
+@@ -1137,7 +1150,7 @@
+ return false;
+ }
+
+- while (d->plainSocket->waitForReadyRead(qBound(0, msecs - stopWatch.elapsed(), msecs))) {
++ while (d->plainSocket->waitForReadyRead(qt_timeout_value(msecs, stopWatch.elapsed()))) {
+ if (d->readBuffer.size() != oldReadBufferSize) {
+ // If the read buffer has grown, readyRead() must have been emitted.
+ return true;
+@@ -1166,7 +1179,7 @@
+ return false;
+ }
+
+- return d->plainSocket->waitForBytesWritten(qBound(0, msecs - stopWatch.elapsed(), msecs));
++ return d->plainSocket->waitForBytesWritten(qt_timeout_value(msecs, stopWatch.elapsed()));
+ }
+
+ /*!
Added: trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/0203-qtexthtmlparser-link-color.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -0,0 +1,18 @@
+qt-bugs@ issue : none
+Trolltech task ID : none
+applied: yes
+author: Rafael Fernández López <ereslibre at kde.org>
+
+Links are assigned a foreground color according to the system current color scheme.
+
+--- a/src/gui/text/qtexthtmlparser.cpp
++++ b/src/gui/text/qtexthtmlparser.cpp
+@@ -1031,7 +1031,7 @@
+ && !attributes.at(i + 1).isEmpty()) {
+ hasHref = true;
+ charFormat.setUnderlineStyle(QTextCharFormat::SingleUnderline);
+- charFormat.setForeground(Qt::blue);
++ charFormat.setForeground(QApplication::palette().link());
+ }
+ }
+
Modified: trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/02_launch_assistant-qt4.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -2,7 +2,7 @@
--- a/tools/assistant/lib/qassistantclient.cpp
+++ b/tools/assistant/lib/qassistantclient.cpp
-@@ -187,11 +187,11 @@
+@@ -185,11 +185,11 @@
: QObject( parent ), host ( QLatin1String("localhost") )
{
if ( path.isEmpty() )
Modified: trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/03_launch_moc-qt4.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -4,7 +4,7 @@
--- a/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
+++ b/tools/qdbus/tools/qdbuscpp2xml/qdbuscpp2xml.cpp
-@@ -391,7 +391,7 @@
+@@ -389,7 +389,7 @@
else {
// run moc on this file
QProcess proc;
Modified: trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/04_launch_uic-qt4.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -2,7 +2,7 @@
--- a/tools/designer/src/lib/shared/qdesigner_utils.cpp
+++ b/tools/designer/src/lib/shared/qdesigner_utils.cpp
-@@ -133,7 +133,7 @@
+@@ -131,7 +131,7 @@
binary += QDir::separator();
switch (mode) {
case UIC_GenerateCode:
Modified: trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/07_trust_dpkg-arch_over_uname-m.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -1,7 +1,5 @@
author: Sune Vuorela
Reported to trolltech as N180631 - and task 181882
-Index: b/configure
-===================================================================
--- a/configure
+++ b/configure
@@ -93,7 +93,44 @@
Modified: trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/08_load_ssl.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -1,6 +1,6 @@
--- a/src/network/qsslsocket_openssl_symbols.cpp
+++ b/src/network/qsslsocket_openssl_symbols.cpp
-@@ -249,7 +249,7 @@
+@@ -247,7 +247,7 @@
return false;
}
#else
@@ -9,7 +9,7 @@
if (!libssl.load()) {
// Cannot find libssl
qWarning("QSslSocket: cannot find ssl library: %s.",
-@@ -257,7 +257,7 @@
+@@ -255,7 +255,7 @@
return false;
}
Modified: trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -4,7 +4,7 @@
--- a/tools/qtestlib/src/qtestcase.h
+++ b/tools/qtestlib/src/qtestcase.h
-@@ -210,7 +210,7 @@
+@@ -208,7 +208,7 @@
template <typename T1, typename T2>
bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
Modified: trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/31_arm_eabi_fix.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -4,7 +4,7 @@
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
-@@ -331,7 +331,7 @@
+@@ -329,7 +329,7 @@
# if defined(Q_OS_DARWIN) && __GNUC__ == 3 && (__GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 3)
# define Q_BROKEN_DEBUG_STREAM
# endif
Modified: trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/40_alpha_ice.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -1,6 +1,6 @@
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
-@@ -69,14 +69,7 @@
+@@ -67,14 +67,7 @@
{
public:
static QSettings *findConfiguration();
@@ -16,7 +16,7 @@
static QSettings *configuration()
{
#ifdef QT_NO_THREAD
-@@ -95,6 +88,15 @@
+@@ -93,6 +86,15 @@
}
};
@@ -34,7 +34,7 @@
settings = QLibraryInfoPrivate::findConfiguration();
--- a/src/corelib/tools/qhash.h
+++ b/src/corelib/tools/qhash.h
-@@ -479,7 +479,7 @@
+@@ -477,7 +477,7 @@
}
template <class Key, class T>
Modified: trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/50_kfreebsd_build_fix.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -4,7 +4,7 @@
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
-@@ -125,6 +125,12 @@
+@@ -123,6 +123,12 @@
# define Q_OS_RELIANT
#elif defined(__linux__) || defined(__linux)
# define Q_OS_LINUX
@@ -17,7 +17,7 @@
#elif defined(__FreeBSD__) || defined(__DragonFly__)
# define Q_OS_FREEBSD
# define Q_OS_BSD4
-@@ -145,8 +151,6 @@
+@@ -143,8 +149,6 @@
# define Q_OS_AIX
#elif defined(__Lynx__)
# define Q_OS_LYNX
@@ -28,7 +28,7 @@
#elif defined(__QNXNTO__)
--- a/src/corelib/plugin/qlibrary.cpp
+++ b/src/corelib/plugin/qlibrary.cpp
-@@ -293,11 +293,11 @@
+@@ -291,11 +291,11 @@
#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
@@ -44,7 +44,7 @@
const char *pattern, ulong p_len)
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
-@@ -63,7 +63,7 @@
+@@ -61,7 +61,7 @@
#include <qdebug.h>
#include <time.h>
@@ -53,7 +53,7 @@
# include <fenv.h>
#endif
-@@ -5930,7 +5930,7 @@
+@@ -5927,7 +5927,7 @@
_control87(MCW_EM, MCW_EM);
#endif
@@ -62,7 +62,7 @@
fenv_t envp;
feholdexcept(&envp);
#endif
-@@ -5946,7 +5946,7 @@
+@@ -5943,7 +5943,7 @@
#endif //_M_X64
#endif //Q_OS_WIN
Modified: trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/60_m68k_inotify_fix.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -5,7 +5,7 @@
--- a/src/corelib/io/qfilesystemwatcher_inotify.cpp
+++ b/src/corelib/io/qfilesystemwatcher_inotify.cpp
-@@ -103,6 +103,10 @@
+@@ -101,6 +101,10 @@
# define __NR_inotify_init 269
# define __NR_inotify_add_watch 270
# define __NR_inotify_rm_watch 271
Modified: trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/80_hurd_max_path.diff 2007-12-06 21:48:31 UTC (rev 8144)
@@ -2,7 +2,7 @@
--- a/src/corelib/io/qfsfileengine_unix.cpp
+++ b/src/corelib/io/qfsfileengine_unix.cpp
-@@ -55,6 +55,10 @@
+@@ -53,6 +53,10 @@
# include <private/qcore_mac_p.h>
#endif
Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series 2007-12-06 16:50:32 UTC (rev 8143)
+++ trunk/packages/qt4-x11/debian/patches/series 2007-12-06 21:48:31 UTC (rev 8144)
@@ -1,23 +1,18 @@
# qt-copy patches
-0163-fix-gcc43-support.diff
0167-fix-group-reading.diff
+#0172-prefer-xrandr-over-xinerama.diff
0175-fix-s390-qatomic.diff
0176-coverity-fixes.diff
0178-transparency-window-types.diff
0179-transient-hack.diff
0180-window-role.diff
-0185-fix-format-strings.diff
0187-fix-font-fixed-pitch.diff
-0188-fix-moc-parser-same-name-header.diff
-0189-fix-q3toolbar-qcombobox-signal-slot.diff
0191-listview-alternate-row-colors.diff
0192-itemdelegate-palette-state.diff
-0193-qtreeview-division-by-zero.diff
0194-fix-moveonly-dnd-in-itemviews.diff
0195-compositing-properties.diff
-0196-q3toolbar-clean-rebuild.diff
-0197-fix-qstylesheetstyle.diff
-0198-fix-qstylesheetstyle2.diff
+0200-fix-qsslsocket-waitfor.diff
+0203-qtexthtmlparser-link-color.diff
# debian patches
01_qmake_for_debian.diff
More information about the pkg-kde-commits
mailing list