Hello community,
here is the log from the commit of package qt3
checked in at Fri Oct 6 17:24:42 CEST 2006.
--------
--- KDE/qt3/qt3-devel-doc.changes 2006-09-14 18:47:20.000000000 +0200
+++ /mounts/work_src_done/STABLE/qt3/qt3-devel-doc.changes 2006-10-06 17:24:10.000000000 +0200
@@ -1,0 +2,5 @@
+Wed Oct 4 19:39:56 CEST 2006 - dmueller@suse.de
+
+- fix headers to compile in -pedantic mode
+
+-------------------------------------------------------------------
qt3-extensions.changes: same change
qt3-static.changes: same change
qt3.changes: same change
New:
----
pedantic-headers.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qt3-devel-doc.spec ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:20.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:20.000000000 +0200
@@ -18,7 +18,7 @@
Summary: Qt 3 Development Kit
Group: Documentation/HTML
Version: 3.3.6
-Release: 17
+Release: 21
PreReq: /bin/grep
BuildArch: noarch
Provides: qt3-devel-tutorial
@@ -81,6 +81,7 @@
Patch113: fix-assistant-path.patch
Patch114: 0070-fix-broken-fonts.patch
Patch115: restore-qtextedit-performance.diff
+Patch116: pedantic-headers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -140,6 +141,7 @@
%patch113
%patch114
%patch115
+%patch116
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
ln -sf $PWD/src/kernel/qinputcontext.h include/
@@ -223,6 +225,8 @@
/usr/share/pixmaps/assistant3.png
%changelog -n qt3-devel-doc
+* Wed Oct 04 2006 - dmueller@suse.de
+- fix headers to compile in -pedantic mode
* Thu Sep 14 2006 - dmueller@suse.de
- don't install static libs as executable
* Fri Sep 01 2006 - llunak@suse.cz
++++++ qt3-extensions.spec ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -14,7 +14,7 @@
BuildRequires: cups-devel krb5-devel libjpeg-devel mysql-devel postgresql-devel qt3-devel sqlite2-devel unixODBC-devel update-desktop-files
License: GPL, QPL
Version: 3.3.6
-Release: 17
+Release: 21
Autoreqprov: on
Requires: qt3 = %version
Group: Development/Tools/Other
@@ -76,6 +76,7 @@
Patch113: fix-assistant-path.patch
Patch114: 0070-fix-broken-fonts.patch
Patch115: restore-qtextedit-performance.diff
+Patch116: pedantic-headers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -133,6 +134,7 @@
%patch113
%patch114
%patch115
+%patch116
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
ln -sf $PWD/src/kernel/qinputcontext.h include/
@@ -467,6 +469,8 @@
%{_mandir}/man*/*
%changelog -n qt3-extensions
+* Wed Oct 04 2006 - dmueller@suse.de
+- fix headers to compile in -pedantic mode
* Thu Sep 14 2006 - dmueller@suse.de
- don't install static libs as executable
* Fri Sep 01 2006 - llunak@suse.cz
++++++ qt3-static.spec ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -17,7 +17,7 @@
Autoreqprov: on
Summary: static program library for developing applications with graphical user interfaces
Version: 3.3.6
-Release: 17
+Release: 21
%define x11_free -x11-free-
%define rversion %version
# COMMON-BEGIN
@@ -75,6 +75,7 @@
Patch113: fix-assistant-path.patch
Patch114: 0070-fix-broken-fonts.patch
Patch115: restore-qtextedit-performance.diff
+Patch116: pedantic-headers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -143,6 +144,7 @@
%patch113
%patch114
%patch115
+%patch116
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
ln -sf $PWD/src/kernel/qinputcontext.h include/
@@ -232,6 +234,8 @@
#/usr/lib/qt3/%{_lib}/libqt-mini.a
%changelog -n qt3-static
+* Wed Oct 04 2006 - dmueller@suse.de
+- fix headers to compile in -pedantic mode
* Thu Sep 14 2006 - dmueller@suse.de
- don't install static libs as executable
* Fri Sep 01 2006 - llunak@suse.cz
++++++ qt3.spec ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -19,7 +19,7 @@
Autoreqprov: on
Summary: A library for developing applications with graphical user interfaces
Version: 3.3.6
-Release: 17
+Release: 21
Provides: qt_library_%version
PreReq: /bin/grep
%define x11_free -x11-free-
@@ -78,6 +78,7 @@
Patch113: fix-assistant-path.patch
Patch114: 0070-fix-broken-fonts.patch
Patch115: restore-qtextedit-performance.diff
+Patch116: pedantic-headers.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -144,6 +145,7 @@
%patch113
%patch114
%patch115
+%patch116
ln -sf $PWD/src/inputmethod/qinputcontextfactory.h include/
ln -sf $PWD/src/inputmethod/qinputcontextplugin.h include/
ln -sf $PWD/src/kernel/qinputcontext.h include/
@@ -363,6 +365,8 @@
/etc/profile.d/qt3.*
%changelog -n qt3
+* Wed Oct 04 2006 - dmueller@suse.de
+- fix headers to compile in -pedantic mode
* Thu Sep 14 2006 - dmueller@suse.de
- don't install static libs as executable
* Fri Sep 01 2006 - llunak@suse.cz
++++++ 0001-dnd_optimization.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,11 +1,3 @@
-qt-bugs@ issue : 16115
-applied: no
-author: Lubos Lunak
-
-See http://lists.kde.org/?t=104388858900001&r=1&w=2
-
-
-================================================================================
--- src/kernel/qdnd_x11.cpp
+++ src/kernel/qdnd_x11.cpp
@@ -49,13 +49,15 @@
@@ -136,7 +128,7 @@
return TRUE;
} else if ( e->type() == QEvent::MouseButtonRelease ) {
qApp->removeEventFilter( this );
-@@ -1123,7 +1193,7 @@
+@@ -1126,7 +1196,7 @@
qt_xdnd_deco->grabMouse();
}
}
@@ -145,7 +137,7 @@
if ( qt_xdnd_source_sameanswer.contains( globalPos ) &&
qt_xdnd_source_sameanswer.isValid() ) {
-@@ -1714,7 +1784,7 @@
+@@ -1717,7 +1787,7 @@
// qt_xdnd_source_object persists until we get an xdnd_finish message
}
@@ -154,7 +146,7 @@
{
if ( qt_xdnd_deco ) {
QPixmap pm;
-@@ -1729,9 +1799,8 @@
+@@ -1732,9 +1802,8 @@
defaultPm = new QPixmap(default_pm);
pm = *defaultPm;
}
@@ -166,7 +158,7 @@
//if ( willDrop ) {
qt_xdnd_deco->show();
//} else {
-@@ -1740,4 +1809,9 @@
+@@ -1743,4 +1812,9 @@
}
}
++++++ 0002-dnd_active_window_fix.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,14 +1,3 @@
-qt-bugs@ issue : 25122
-applied: no
-author: Lubos Lunak
-
- Hello,
-
- for example: Open Konqueror window, showing some files. Start dragging one
- desktop icon. If you press/release Ctrl, there'll be a '+' attached to the
- icon, showing the DND operation. Now, while still doing DND, make the
- Konqueror window active (Alt+Tab with KDE-3.1.2+, hover over its taskbar
-================================================================================
--- src/kernel/qapplication_x11.cpp
+++ src/kernel/qapplication_x11.cpp
@@ -3972,7 +3972,7 @@
@@ -152,7 +141,7 @@
}
-@@ -1751,6 +1771,7 @@
+@@ -1754,6 +1774,7 @@
qt_xdnd_source_sameanswer = QRect();
move(QCursor::pos());
heartbeat = startTimer(200);
@@ -169,5 +158,5 @@
- void updateMode( ButtonState newstate );
+ bool updateMode( ButtonState newstate );
void updateCursor();
-
- QWidget * dragSource;
+ #if defined(Q_WS_X11)
+ void createCursors();
++++++ 0005-qpixmap_mitshm.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,5 +1,5 @@
--- mkspecs/linux-g++/qplatformdefs.h
-+++ mkspecs/linux-g++/qplatformdefs.h 2004/09/08 07:19:01
++++ mkspecs/linux-g++/qplatformdefs.h
@@ -102,5 +102,6 @@
#define QT_VSNPRINTF ::vsnprintf
#endif
@@ -8,7 +8,7 @@
#endif // QPLATFORMDEFS_H
--- src/kernel/qpixmap_x11.cpp
-+++ src/kernel/qpixmap_x11.cpp 2004/09/08 07:19:01
++++ src/kernel/qpixmap_x11.cpp
@@ -37,7 +37,19 @@
// NOT REVISED
@@ -63,7 +63,7 @@
-#endif // QT_MITSHM
+#endif // QT_MITSHM_XFORM
-+
+
+#ifdef QT_MITSHM_CONVERSIONS
+
+static bool qt_mitshm_error = false;
@@ -154,12 +154,12 @@
+ }
+ return xi;
+}
-
++
+#endif // QT_MITSHM_CONVERSIONS
/*****************************************************************************
Internal functions
-@@ -625,9 +728,20 @@
+@@ -628,9 +731,20 @@
d = 32; // > 8 ==> 32
XImage *xi = (XImage *)data->ximage; // any cached ximage?
@@ -182,7 +182,7 @@
Q_CHECK_PTR( xi );
QImage::Endian bitOrder = QImage::IgnoreEndian;
-@@ -636,15 +750,31 @@
+@@ -639,15 +753,31 @@
QImage::LittleEndian : QImage::BigEndian;
}
image.create( w, h, d, 0, bitOrder );
@@ -216,7 +216,7 @@
if (axi) {
image.setAlphaBuffer( TRUE );
-@@ -658,7 +788,12 @@
+@@ -661,7 +791,12 @@
src += axi->bytes_per_line;
}
@@ -230,7 +230,7 @@
}
} else if (msk) {
image.setAlphaBuffer( TRUE );
-@@ -800,6 +935,12 @@
+@@ -803,6 +938,12 @@
xi->bits_per_pixel );
#endif
image.reset();
@@ -243,7 +243,7 @@
return image;
}
-@@ -905,10 +1046,22 @@
+@@ -908,10 +1049,22 @@
delete [] carr;
}
if ( data->optim != BestOptim ) { // throw away image data
@@ -268,7 +268,7 @@
return image;
}
-@@ -1078,6 +1231,11 @@
+@@ -1081,6 +1234,11 @@
bool trucol = (visual->c_class == TrueColor);
int nbytes = image.numBytes();
uchar *newbits= 0;
@@ -280,7 +280,7 @@
if ( trucol ) { // truecolor display
QRgb pix[256]; // pixel translation table
-@@ -1106,9 +1264,18 @@
+@@ -1109,9 +1267,18 @@
}
}
@@ -301,7 +301,7 @@
Q_CHECK_PTR( newbits );
if ( !newbits ) // no memory
return FALSE;
-@@ -1314,6 +1481,7 @@
+@@ -1438,6 +1605,7 @@
}
newbits = (uchar *)malloc( nbytes ); // copy image into newbits
@@ -309,7 +309,7 @@
Q_CHECK_PTR( newbits );
if ( !newbits ) // no memory
return FALSE;
-@@ -1431,11 +1599,18 @@
+@@ -1555,11 +1723,18 @@
}
if ( !xi ) { // X image not created
@@ -329,7 +329,7 @@
Q_CHECK_PTR( newerbits );
if ( !newerbits ) // no memory
return FALSE;
-@@ -1453,7 +1628,15 @@
+@@ -1577,7 +1752,15 @@
"(bpp=%d)", xi->bits_per_pixel );
#endif
}
@@ -346,7 +346,7 @@
}
if ( hd && (width() != (int)w || height() != (int)h || this->depth() != dd) ) {
-@@ -1486,19 +1669,24 @@
+@@ -1610,19 +1793,24 @@
}
@@ -379,7 +379,7 @@
if ( image.hasAlphaBuffer() ) {
QBitmap m;
m = image.createAlphaMask( conversion_flags );
-@@ -1534,13 +1722,22 @@
+@@ -1658,13 +1846,22 @@
data->alphapm->rendhd =
(HANDLE) XftDrawCreateAlpha( x11Display(), data->alphapm->hd, 8 );
@@ -407,7 +407,7 @@
char *aptr = axi->data;
if (image.depth() == 32) {
-@@ -1558,14 +1755,48 @@
+@@ -1691,14 +1888,48 @@
}
GC gc = XCreateGC(x11Display(), data->alphapm->hd, 0, 0);
@@ -458,7 +458,7 @@
return TRUE;
}
-@@ -1722,7 +1953,7 @@
+@@ -1855,7 +2086,7 @@
return pm;
}
@@ -467,7 +467,7 @@
static bool try_once = TRUE;
if (try_once) {
try_once = FALSE;
-@@ -1755,7 +1986,7 @@
+@@ -1888,7 +2119,7 @@
dbpl = ((w*bpp+31)/32)*4;
dbytes = dbpl*h;
@@ -476,7 +476,7 @@
if ( use_mitshm ) {
dptr = (uchar *)xshmimg->data;
uchar fillbyte = bpp == 8 ? white.pixel() : 0xff;
-@@ -1771,7 +2002,7 @@
+@@ -1904,7 +2135,7 @@
memset( dptr, Qt::white.pixel( x11Screen() ), dbytes );
else
memset( dptr, 0xff, dbytes );
@@ -485,7 +485,7 @@
}
#endif
-@@ -1802,7 +2033,7 @@
+@@ -1935,7 +2166,7 @@
} else {
xbpl = (w*bpp)/8;
p_inc = dbpl - xbpl;
@@ -494,7 +494,7 @@
if ( use_mitshm )
p_inc = xshmimg->bytes_per_line - xbpl;
#endif
-@@ -1839,7 +2070,7 @@
+@@ -1972,7 +2203,7 @@
QPixmap pm( w, h );
pm.data->uninit = FALSE;
pm.x11SetScreen( x11Screen() );
@@ -503,7 +503,7 @@
if ( use_mitshm ) {
XCopyArea( dpy, xshmpm, pm.handle(), gc, 0, 0, w, h, 0, 0 );
} else {
-@@ -1848,7 +2079,7 @@
+@@ -1981,7 +2212,7 @@
ZPixmap, 0, (char *)dptr, w, h, 32, 0 );
XPutImage( dpy, pm.handle(), gc, xi, 0, 0, 0, 0, w, h);
qSafeXDestroyImage( xi );
++++++ 0007-qpixmap_constants.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,10 +1,3 @@
-qt-bugs@ issue : 11790 (part of)
-applied: no
-author: Lubos Lunak
-
-See 0005-qpixmap_mitshm.patch for details.
-
-================================================================================
--- src/kernel/qpixmap_x11.cpp
+++ src/kernel/qpixmap_x11.cpp
@@ -1116,9 +1116,6 @@
++++++ 0038-dragobject-dont-prefer-unknown.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,45 +1,6 @@
-qt-bugs@ issue : 38642
-bugs.kde.org number : 71084
-applied: no
-author: Lubos Lunak
-
-Hello,
-
- start Mozilla, go e.g. to http://kde.org, start KWrite (or basically any Qt
-app that accepts text drops), select 'Conquer your Desktop!', and try to
-drag&drop it onto KWrite. The only text pasted should be 'm'.
-
- I don't know much the related mimetype and encoding stuff, so I'm unsure
-whose fault this actually is. The text drag is provided as a lot of
-text/something targets, to list some text/_moz_htmlinfo, text/x-moz-url,
-text/unicode and similar. The problem is, Kate uses QTextDrag::decode() with
-no subtype specified, probably with the intention that as Kate is a text
-editor, it can accept any text pasted. And since the first target provided by
-mozilla is text/x-moz-url, (which moreover seems to be encoded as 16bit
-unicode), the text dropped is completely wrong. You can easily see all
-targets provided by Mozilla with see_mime.patch applied.
-
- Solution #1: Say that Kate (any pretty much everybody else expecting text)
-should say "plain" as the subtype. In such case, I suggest you drop the
-QTextDrag::decode() variant with no subtype specified, and stress more the
-fact that not specifying a subtype can result in a lot of rubbish. It's
-simply too tempting to leave the subtype empty and try to accept anything.
-
- Solution #2: When trying to accept anything, try to get useful data. Which
-means either sorting the subtypes available somehow, checking only the ones
-Qt knows.
-
- To me, #1 seems to be a better choice, or possibly at least something like
-the attached QTextDrag patch, which simply always tries first "plain" subtype
-if none is specified. With this patch, Mozilla even works (that's irony, of
-course, Mozilla still pastes the text/plain text as HTML, but at least now it
-pastes something where it's easy to point at the offender).
-
-
-================================================================================
--- src/kernel/qdragobject.cpp
+++ src/kernel/qdragobject.cpp
-@@ -890,6 +890,16 @@
+@@ -893,6 +893,16 @@
{
if(!e)
return FALSE;
++++++ 0047-fix-kmenu-width.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -9,17 +9,15 @@
Solution: Respect PanelKMenu::setMaximumSize() as up to Qt 3.2.3
Index: src/widgets/qpopupmenu.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/widgets/qpopupmenu.cpp,v
-retrieving revision 1.60
-diff -u -3 -p -b -r1.60 qpopupmenu.cpp
---- src/widgets/qpopupmenu.cpp 29 Apr 2004 22:31:28 -0000 1.60
-+++ src/widgets/qpopupmenu.cpp 30 Apr 2004 01:11:59 -0000
-@@ -2531,7 +2531,7 @@ QSize QPopupMenu::sizeHint() const
-
+================================================================================
+--- src/widgets/qpopupmenu.cpp
++++ src/widgets/qpopupmenu.cpp
+@@ -2530,7 +2530,7 @@
+ constPolish();
QPopupMenu* that = (QPopupMenu*) this;
//We do not need a resize here, just the sizeHint..
- return that->updateSize(FALSE, FALSE).expandedTo( QApplication::globalStrut() );
+ return that->updateSize(FALSE).expandedTo( QApplication::globalStrut() );
}
-
+
+
++++++ 0048-qclipboard_hack_80072.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -5,9 +5,10 @@
A crude hack for KDE #80072. No good idea how to fix it properly yet :(.
---- src/kernel/qclipboard_x11.cpp.sav 2004-04-30 12:00:06.000000000 +0200
-+++ src/kernel/qclipboard_x11.cpp 2004-05-09 21:18:10.269264304 +0200
-@@ -109,6 +109,7 @@ static int pending_timer_id = 0;
+================================================================================
+--- src/kernel/qclipboard_x11.cpp
++++ src/kernel/qclipboard_x11.cpp
+@@ -109,6 +109,7 @@
static bool pending_clipboard_changed = FALSE;
static bool pending_selection_changed = FALSE;
@@ -15,7 +16,7 @@
// event capture mechanism for qt_xclb_wait_for_event
static bool waiting_for_data = FALSE;
-@@ -453,6 +454,15 @@ static int qt_xclb_event_filter(XEvent *
+@@ -453,6 +454,15 @@
return 0;
}
@@ -31,7 +32,7 @@
bool qt_xclb_wait_for_event( Display *dpy, Window win, int type, XEvent *event,
int timeout )
{
-@@ -504,6 +514,14 @@ bool qt_xclb_wait_for_event( Display *dp
+@@ -504,6 +514,14 @@
do {
if ( XCheckTypedWindowEvent(dpy,win,type,event) )
return TRUE;
++++++ 0055-qtextedit_zoom.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -8,13 +8,10 @@
pointSize() returns 0 in such case.
Index: widgets/qtextedit.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/widgets/qtextedit.cpp,v
-retrieving revision 1.47
-diff -u -p -r1.47 qtextedit.cpp
---- src/widgets/qtextedit.cpp 11 Aug 2004 14:21:18 -0000 1.47
-+++ src/widgets/qtextedit.cpp 14 Oct 2004 14:10:12 -0000
-@@ -5591,7 +5591,11 @@ void QTextEdit::setFont( const QFont &f
+================================================================================
+--- src/widgets/qtextedit.cpp
++++ src/widgets/qtextedit.cpp
+@@ -5767,7 +5767,11 @@
void QTextEdit::zoomIn( int range )
{
QFont f( QScrollView::font() );
@@ -27,7 +24,7 @@
setFont( f );
}
-@@ -5606,7 +5610,11 @@ void QTextEdit::zoomIn( int range )
+@@ -5782,7 +5786,11 @@
void QTextEdit::zoomOut( int range )
{
QFont f( QScrollView::font() );
++++++ 0056-khotkeys_input_84434.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -5,9 +5,10 @@
Fixes keyboard input action in KHotKeys (see bug #84434).
---- src/kernel/qapplication_x11.cpp.sav 2004-10-07 15:38:05.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp 2004-10-12 11:46:32.513137808 +0200
-@@ -5294,8 +5294,10 @@ static Bool qt_keypress_scanner(Display
+================================================================================
+--- src/kernel/qapplication_x11.cpp
++++ src/kernel/qapplication_x11.cpp
+@@ -5401,8 +5401,10 @@
qt_auto_repeat_data *d = (qt_auto_repeat_data *) arg;
if (d->error ||
event->xkey.window != d->window ||
++++++ 0059-qpopup_has_mouse.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -20,9 +20,10 @@
[ ... #74778 ... ]
---- src/widgets/qpopupmenu.cpp.sav 2004-05-25 21:58:23.000000000 +0200
-+++ src/widgets/qpopupmenu.cpp 2004-05-25 22:02:19.520297888 +0200
-@@ -253,6 +253,7 @@ public:
+================================================================================
+--- src/widgets/qpopupmenu.cpp
++++ src/widgets/qpopupmenu.cpp
+@@ -253,6 +253,7 @@
} scroll;
QSize calcSize;
QRegion mouseMoveBuffer;
@@ -30,7 +31,7 @@
};
static QPopupMenu* active_popup_menu = 0;
-@@ -272,6 +273,7 @@ QPopupMenu::QPopupMenu( QWidget *parent,
+@@ -272,6 +273,7 @@
d->scroll.scrollableSize = d->scroll.topScrollableIndex = 0;
d->scroll.scrollable = QPopupMenuPrivate::Scroll::ScrollNone;
d->scroll.scrolltimer = 0;
@@ -38,7 +39,7 @@
isPopupMenu = TRUE;
#ifndef QT_NO_ACCEL
autoaccel = 0;
-@@ -1740,6 +1742,11 @@ void QPopupMenu::mouseMoveEvent( QMouseE
+@@ -1741,6 +1743,11 @@
int item = itemAtPos( e->pos() );
if ( item == -1 ) { // no valid item
@@ -50,7 +51,7 @@
int lastActItem = actItem;
actItem = -1;
if ( lastActItem >= 0 )
-@@ -1751,6 +1758,7 @@ void QPopupMenu::mouseMoveEvent( QMouseE
+@@ -1752,6 +1759,7 @@
}
} else { // mouse on valid item
// but did not register mouse press
@@ -58,7 +59,7 @@
if ( (e->state() & Qt::MouseButtonMask) && !mouseBtDn )
mouseBtDn = TRUE; // so mouseReleaseEvent will pop down
-@@ -2159,6 +2167,7 @@ void QPopupMenu::timerEvent( QTimerEvent
+@@ -2160,6 +2168,7 @@
*/
void QPopupMenu::leaveEvent( QEvent * )
{
++++++ 0060-qpopup_ignore_mousepos.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -27,9 +27,10 @@
events for normal widgets being transformed to mouse move events for the
popup, so I have no better idea how to solve this problem.
---- src/widgets/qpopupmenu.cpp.sav 2004-05-25 17:48:21.000000000 +0200
-+++ src/widgets/qpopupmenu.cpp 2004-05-25 17:57:28.981809096 +0200
-@@ -254,6 +254,7 @@ public:
+================================================================================
+--- src/widgets/qpopupmenu.cpp
++++ src/widgets/qpopupmenu.cpp
+@@ -254,6 +254,7 @@
QSize calcSize;
QRegion mouseMoveBuffer;
uint hasmouse : 1;
@@ -37,7 +38,7 @@
};
static QPopupMenu* active_popup_menu = 0;
-@@ -1354,6 +1355,7 @@ void QPopupMenu::show()
+@@ -1356,6 +1357,7 @@
popupActive = -1;
if(style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this))
d->mouseMoveBuffer = QRegion();
@@ -45,7 +46,7 @@
}
/*!
-@@ -1701,6 +1703,11 @@ void QPopupMenu::mouseReleaseEvent( QMou
+@@ -1703,6 +1705,11 @@
void QPopupMenu::mouseMoveEvent( QMouseEvent *e )
{
++++++ 0070-fix-broken-fonts.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,6 +1,7 @@
---- include/private/qfontengine_p.h 2006-03-08 17:47:45.000000000 +0100
-+++ include/private/qfontengine_p.h 2006-05-31 12:59:58.000000000 +0200
+================================================================================
+--- include/private/qfontengine_p.h
++++ include/private/qfontengine_p.h
@@ -491,7 +491,7 @@
}
void selectScript(unsigned int script, const Features *features = 0);
@@ -10,9 +11,8 @@
bool positionAndAdd(QShaperItem *item, bool doLogClusters = TRUE);
OTL_GlyphItem glyphs() const { return otl_buffer->in_string; }
-
---- src/kernel/qfontengine_p.h 2006-03-08 17:47:45.000000000 +0100
-+++ src/kernel/qfontengine_p.h 2006-05-31 12:59:58.000000000 +0200
+--- src/kernel/qfontengine_p.h
++++ src/kernel/qfontengine_p.h
@@ -491,7 +491,7 @@
}
void selectScript(unsigned int script, const Features *features = 0);
@@ -22,9 +22,8 @@
bool positionAndAdd(QShaperItem *item, bool doLogClusters = TRUE);
OTL_GlyphItem glyphs() const { return otl_buffer->in_string; }
-
---- src/kernel/qfontengine_x11.cpp 2006-03-08 17:47:49.000000000 +0100
-+++ src/kernel/qfontengine_x11.cpp 2006-05-31 12:59:58.000000000 +0200
+--- src/kernel/qfontengine_x11.cpp
++++ src/kernel/qfontengine_x11.cpp
@@ -2544,7 +2544,7 @@
extern void qt_heuristicPosition(QShaperItem *item);
@@ -57,9 +56,8 @@
}
bool QOpenType::positionAndAdd(QShaperItem *item, bool doLogClusters)
-
---- src/kernel/qscriptengine.cpp 2006-03-08 17:47:45.000000000 +0100
-+++ src/kernel/qscriptengine.cpp 2006-05-31 12:59:58.000000000 +0200
+--- src/kernel/qscriptengine.cpp
++++ src/kernel/qscriptengine.cpp
@@ -1504,8 +1504,10 @@
{0, 0}
};
@@ -101,9 +99,8 @@
#endif
QVarLengthArray<ushort> shapedChars(item->length);
-
---- src/kernel/qscriptengine_x11.cpp 2006-03-08 17:47:47.000000000 +0100
-+++ src/kernel/qscriptengine_x11.cpp 2006-05-31 12:59:58.000000000 +0200
+--- src/kernel/qscriptengine_x11.cpp
++++ src/kernel/qscriptengine_x11.cpp
@@ -45,7 +45,12 @@
#ifndef QT_NO_XFTFREETYPE
QOpenType *openType = item->font->openType();
++++++ add_qexport_visibility.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,7 +1,7 @@
Index: src/kernel/qgplugin.h
-===================================================================
---- src/kernel/qgplugin.h (revision 423270)
-+++ src/kernel/qgplugin.h (working copy)
+================================================================================
+--- src/kernel/qgplugin.h
++++ src/kernel/qgplugin.h
@@ -90,35 +90,19 @@
return i->iface(); \
}
@@ -48,11 +48,9 @@
#endif
struct QUnknownInterface;
-Index: src/tools/qglobal.h
-===================================================================
---- src/tools/qglobal.h (revision 423270)
-+++ src/tools/qglobal.h (working copy)
-@@ -865,6 +865,10 @@
+--- src/tools/qglobal.h
++++ src/tools/qglobal.h
+@@ -882,6 +882,10 @@
# define Q_TEMPLATE_EXTERN
# undef Q_DISABLE_COPY /* avoid unresolved externals */
# endif
++++++ fix-key-release-event-with-imm.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,5 +1,5 @@
---- src/kernel/qapplication_x11.cpp 2006-07-04 12:46:07.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp 2006-07-04 12:53:26.000000000 +0200
+--- src/kernel/qapplication_x11.cpp
++++ src/kernel/qapplication_x11.cpp
@@ -3294,11 +3294,7 @@
// filtering opportunity first to ensure all input methods work
// properly regardless of application design.
@@ -27,8 +27,8 @@
ascii = (char)(s-256);
}
}
---- src/kernel/qwidget_x11.cpp 2006-07-04 12:46:07.000000000 +0200
-+++ src/kernel/qwidget_x11.cpp 2006-07-04 12:51:10.000000000 +0200
+--- src/kernel/qwidget_x11.cpp
++++ src/kernel/qwidget_x11.cpp
@@ -2699,11 +2699,10 @@
{
QInputContext *qic = 0;
++++++ fix-qtranslator-crash.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,6 +1,6 @@
---- src/kernel/qtranslator.cpp.sav 2004-08-12 14:32:07.000000000 +0200
-+++ src/kernel/qtranslator.cpp 2005-03-15 18:05:29.620141650 +0100
-@@ -990,7 +990,7 @@ QTranslatorMessage QTranslator::findMess
+--- src/kernel/qtranslator.cpp
++++ src/kernel/qtranslator.cpp
+@@ -1012,7 +1012,7 @@
char con[256];
for ( ;; ) {
t >> len;
++++++ fix-xinerama-dialog-placement.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,6 +1,6 @@
---- src/dialogs/qdialog.cpp.sav 2005-05-05 13:45:20.000000000 +0200
-+++ src/dialogs/qdialog.cpp 2005-08-19 16:35:58.000000000 +0200
-@@ -796,7 +796,9 @@ void QDialog::adjustPositionInternal( QW
+--- src/dialogs/qdialog.cpp
++++ src/dialogs/qdialog.cpp
+@@ -803,7 +803,9 @@
w = w->topLevelWidget();
QRect desk;
if ( w ) {
++++++ kmenu-search-fix.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,6 +1,6 @@
---- src/widgets/qpopupmenu.cpp.sav 2005-08-24 14:22:48.000000000 +0200
-+++ src/widgets/qpopupmenu.cpp 2005-08-29 11:10:28.000000000 +0200
-@@ -1353,6 +1353,7 @@ void QPopupMenu::show()
+--- src/widgets/qpopupmenu.cpp
++++ src/widgets/qpopupmenu.cpp
+@@ -1354,6 +1354,7 @@
performDelayedChanges();
updateSize(TRUE);
QWidget::show();
++++++ limit-image-size.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,12 +1,9 @@
Index: kernel/qasyncimageio.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/kernel/qasyncimageio.cpp,v
-retrieving revision 1.57
-diff -u -p -r1.57 qasyncimageio.cpp
---- src/kernel/qasyncimageio.cpp 11 Aug 2004 14:21:12 -0000 1.57
-+++ src/kernel/qasyncimageio.cpp 30 Sep 2004 11:20:38 -0000
-@@ -900,7 +900,12 @@ int QGIFFormat::decode(QImage& img, QIma
- sheight = newtop + height;
+================================================================================
+--- src/kernel/qasyncimageio.cpp
++++ src/kernel/qasyncimageio.cpp
+@@ -901,7 +901,12 @@
+ sheight = newtop + newheight;
if (img.isNull()) {
- img.create(swidth, sheight, 32);
@@ -19,7 +16,7 @@
memset( img.bits(), 0, img.numBytes() );
if (consumer) consumer->setSize(swidth, sheight);
}
-@@ -969,9 +974,15 @@ int QGIFFormat::decode(QImage& img, QIma
+@@ -956,9 +961,15 @@
if (backingstore.width() < w
|| backingstore.height() < h) {
// We just use the backing store as a byte array
@@ -36,13 +33,8 @@
memset( img.bits(), 0, img.numBytes() );
}
for (int ln=0; lnalpha = enable;
}
@@ -81,7 +73,7 @@
/*!
Sets the image \a width, \a height, \a depth, its number of colors
-@@ -1225,6 +1249,14 @@ bool QImage::create( int width, int heig
+@@ -1230,6 +1254,14 @@
reset(); // reset old data
if ( width <= 0 || height <= 0 || depth <= 0 || numColors < 0 )
return FALSE; // invalid parameter(s)
@@ -96,13 +88,9 @@
if ( depth == 1 && bitOrder == IgnoreEndian ) {
#if defined(QT_CHECK_RANGE)
qWarning( "QImage::create: Bit order is required for 1 bpp images" );
-===================================================================
-RCS file: /home/kde/qt-copy/src/kernel/qimage.h,v
-retrieving revision 1.49
-diff -u -p -r1.49 qimage.h
---- src/kernel/qimage.h 16 May 2003 13:02:41 -0000 1.49
-+++ src/kernel/qimage.h 30 Sep 2004 11:20:41 -0000
-@@ -194,6 +193,10 @@ public:
+--- src/kernel/qimage.h
++++ src/kernel/qimage.h
+@@ -194,6 +194,10 @@
int quality=-1 ) const;
bool save( QIODevice * device, const char* format,
int quality=-1 ) const;
++++++ pedantic-headers.diff ++++++
--- src/kernel/qtextengine_p.h
+++ src/kernel/qtextengine_p.h
@@ -313,7 +313,7 @@
};
enum ShaperFlag {
RightToLeft = 0x0001,
- Mirrored = 0x0001,
+ Mirrored = 0x0001
};
int width( int charFrom, int numChars ) const;
++++++ qt-transparency.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:21.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:21.000000000 +0200
@@ -1,14 +1,14 @@
---- src/kernel/qapplication.cpp.sav 2004-08-12 14:32:06.000000000 +0200
-+++ src/kernel/qapplication.cpp 2004-09-12 21:23:44.215247720 +0200
-@@ -317,6 +317,7 @@ void qt_init( int *, char **, QApplicati
+--- src/kernel/qapplication.cpp
++++ src/kernel/qapplication.cpp
+@@ -317,6 +317,7 @@
void qt_cleanup();
#if defined(Q_WS_X11)
void qt_init( Display* dpy, Qt::HANDLE, Qt::HANDLE );
+void qt_init( int *, char **, Display* dpy, Qt::HANDLE, Qt::HANDLE );
#endif
- bool qt_tryModalHelper( QWidget *widget, QWidget **rettop );
+ Q_EXPORT bool qt_tryModalHelper( QWidget *widget, QWidget **rettop );
-@@ -905,7 +906,7 @@ QApplication::QApplication(Display *dpy,
+@@ -905,7 +906,7 @@
qt_init( &argc, argv, GuiClient );
} else {
++++++ qt-x11-immodule-unified-qt3.3.6-20060318.diff ++++++
++++ 809 lines (skipped)
++++ between KDE/qt3/qt-x11-immodule-unified-qt3.3.6-20060318.diff
++++ and /mounts/work_src_done/STABLE/qt3/qt-x11-immodule-unified-qt3.3.6-20060318.diff
++++++ qt.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:22.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:22.000000000 +0200
@@ -1,5 +1,44 @@
---- src/dialogs/qfiledialog.cpp.sav 2004-12-08 15:39:41.000000000 +0100
-+++ src/dialogs/qfiledialog.cpp 2004-12-13 16:53:40.000000000 +0100
+--- src/dialogs/qcolordialog.cpp
++++ src/dialogs/qcolordialog.cpp
+@@ -60,6 +60,10 @@
+ QColor macGetColor( const QColor& initial, QWidget *parent, const char *name );
+ #endif
+
++#ifdef Q_WS_X11
++#include "private/qtkdeintegration_x11_p.h"
++#endif
++
+ //////////// QWellArray BEGIN
+
+ struct QWellArrayData;
+@@ -1478,7 +1482,10 @@
+ QColor QColorDialog::getColor( const QColor& initial, QWidget *parent,
+ const char *name )
+ {
+-#if defined(Q_WS_MAC)
++#if defined(Q_WS_X11)
++ if( QKDEIntegration::enabled())
++ return QKDEIntegration::getColor( initial, parent, name );
++#elif defined(Q_WS_MAC)
+ return macGetColor(initial, parent, name);
+ #endif
+
+@@ -1516,6 +1523,13 @@
+ QWidget *parent, const char* name )
+ {
+ #if defined(Q_WS_MAC)
++ if( QKDEIntegration::enabled()) {
++ QColor color = QKDEIntegration::getColor( QColor( initial ), parent, name );
++ if( ok )
++ *ok = color.isValid();
++ return color.rgba();
++ }
++#elif defined(Q_WS_MAC)
+ return macGetRgba(initial, ok, parent, name);
+ #endif
+
+--- src/dialogs/qfiledialog.cpp
++++ src/dialogs/qfiledialog.cpp
@@ -92,6 +92,10 @@
#include "qvbox.h"
#include "qwidgetstack.h"
@@ -11,9 +50,9 @@
#ifdef Q_WS_WIN
#ifdef QT_THREAD_SUPPORT
# include
-@@ -3428,7 +3432,11 @@ QString QFileDialog::getOpenFileName( co
+@@ -3464,7 +3468,11 @@
if ( workingDirectory->isNull() )
- *workingDirectory = QDir::currentDirPath();
+ *workingDirectory = ::toRootIfNotExists( QDir::currentDirPath() );
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_X11)
@@ -24,9 +63,9 @@
if ( qt_use_native_dialogs && qApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle )
return winGetOpenFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter );
-@@ -3546,7 +3554,11 @@ QString QFileDialog::getSaveFileName( co
+@@ -3585,7 +3593,11 @@
if ( workingDirectory->isNull() )
- *workingDirectory = QDir::currentDirPath();
+ *workingDirectory = ::toRootIfNotExists( QDir::currentDirPath() );
-#if defined(Q_WS_WIN)
+#if defined(Q_WS_X11)
@@ -37,7 +76,7 @@
if ( qt_use_native_dialogs && qApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle )
return winGetSaveFileName( initialSelection, filter, workingDirectory,
parent, name, caption, selectedFilter );
-@@ -4433,7 +4445,17 @@ QString QFileDialog::getExistingDirector
+@@ -4475,7 +4487,17 @@
if ( workingDirectory )
wd = *workingDirectory;
@@ -56,7 +95,7 @@
QString initialDir;
if ( !dir.isEmpty() ) {
QUrlOperator u( dir );
-@@ -5586,7 +5608,10 @@ QStringList QFileDialog::getOpenFileName
+@@ -5636,7 +5658,10 @@
}
}
@@ -68,8 +107,37 @@
if ( qt_use_native_dialogs && qApp->style().styleHint( QStyle::SH_GUIStyle ) == WindowsStyle )
return winGetOpenFileNames( filter, workingDirectory, parent, name, caption, selectedFilter );
#elif defined(Q_WS_MAC)
---- src/dialogs/qmessagebox.cpp.sav 2003-12-22 12:24:32.000000000 +0100
-+++ src/dialogs/qmessagebox.cpp 2005-01-05 18:05:29.638723917 +0100
+--- src/dialogs/qfontdialog.cpp
++++ src/dialogs/qfontdialog.cpp
+@@ -56,6 +56,10 @@
+ #include
+ #include
+
++#ifdef Q_WS_X11
++#include "private/qtkdeintegration_x11_p.h"
++#endif
++
+ /*!
+ \class QFontDialog qfontdialog.h
+ \ingroup dialogs
+@@ -384,9 +388,15 @@
+ return getFont( ok, 0, parent, name );
+ }
+
++extern bool qt_use_native_dialogs;
++
+ QFont QFontDialog::getFont( bool *ok, const QFont *def,
+ QWidget *parent, const char* name)
+ {
++#if defined(Q_WS_X11)
++ if ( qt_use_native_dialogs && QKDEIntegration::enabled())
++ return QKDEIntegration::getFont( ok, def, parent, name );
++#endif
+ QFont result;
+ if ( def )
+ result = *def;
+--- src/dialogs/qmessagebox.cpp
++++ src/dialogs/qmessagebox.cpp
@@ -54,6 +54,12 @@
#endif
@@ -83,7 +151,7 @@
// Internal class - don't touch
class QMessageBoxLabel : public QLabel
-@@ -1104,6 +1110,10 @@ int QMessageBox::information( QWidget *p
+@@ -1110,6 +1116,10 @@
const QString& caption, const QString& text,
int button0, int button1, int button2 )
{
@@ -94,7 +162,7 @@
QMessageBox *mb = new QMessageBox( caption, text, Information,
button0, button1, button2,
parent, "qt_msgbox_information", TRUE,
-@@ -1151,6 +1161,10 @@ int QMessageBox::question( QWidget *pare
+@@ -1157,6 +1167,10 @@
const QString& caption, const QString& text,
int button0, int button1, int button2 )
{
@@ -105,7 +173,7 @@
QMessageBox *mb = new QMessageBox( caption, text, Question,
button0, button1, button2,
parent, "qt_msgbox_information", TRUE,
-@@ -1199,6 +1213,10 @@ int QMessageBox::warning( QWidget *paren
+@@ -1205,6 +1219,10 @@
const QString& caption, const QString& text,
int button0, int button1, int button2 )
{
@@ -116,7 +184,7 @@
QMessageBox *mb = new QMessageBox( caption, text, Warning,
button0, button1, button2,
parent, "qt_msgbox_warning", TRUE,
-@@ -1247,6 +1265,10 @@ int QMessageBox::critical( QWidget *pare
+@@ -1253,6 +1271,10 @@
const QString& caption, const QString& text,
int button0, int button1, int button2 )
{
@@ -127,7 +195,7 @@
QMessageBox *mb = new QMessageBox( caption, text, Critical,
button0, button1, button2,
parent, "qt_msgbox_critical", TRUE,
-@@ -1394,6 +1416,11 @@ int QMessageBox::information( QWidget *p
+@@ -1400,6 +1422,11 @@
int defaultButtonNumber,
int escapeButtonNumber )
{
@@ -139,7 +207,7 @@
return textBox( parent, Information, caption, text,
button0Text, button1Text, button2Text,
defaultButtonNumber, escapeButtonNumber );
-@@ -1436,6 +1463,11 @@ int QMessageBox::question( QWidget *pare
+@@ -1442,6 +1469,11 @@
int defaultButtonNumber,
int escapeButtonNumber )
{
@@ -151,7 +219,7 @@
return textBox( parent, Question, caption, text,
button0Text, button1Text, button2Text,
defaultButtonNumber, escapeButtonNumber );
-@@ -1480,6 +1512,11 @@ int QMessageBox::warning( QWidget *paren
+@@ -1486,6 +1518,11 @@
int defaultButtonNumber,
int escapeButtonNumber )
{
@@ -163,7 +231,7 @@
return textBox( parent, Warning, caption, text,
button0Text, button1Text, button2Text,
defaultButtonNumber, escapeButtonNumber );
-@@ -1520,6 +1557,11 @@ int QMessageBox::critical( QWidget *pare
+@@ -1526,6 +1563,11 @@
int defaultButtonNumber,
int escapeButtonNumber )
{
@@ -175,77 +243,22 @@
return textBox( parent, Critical, caption, text,
button0Text, button1Text, button2Text,
defaultButtonNumber, escapeButtonNumber );
---- src/dialogs/qfontdialog.cpp.sav 2004-08-12 14:32:06.000000000 +0200
-+++ src/dialogs/qfontdialog.cpp 2004-12-13 19:02:31.000000000 +0100
-@@ -56,6 +56,10 @@
- #include
- #include
-
-+#ifdef Q_WS_X11
-+#include "private/qtkdeintegration_x11_p.h"
-+#endif
-+
- /*!
- \class QFontDialog qfontdialog.h
- \ingroup dialogs
-@@ -384,9 +388,15 @@ QFont QFontDialog::getFont( bool *ok, QW
- return getFont( ok, 0, parent, name );
- }
+--- src/kernel/qt.h
++++ src/kernel/qt.h
+@@ -313,6 +313,10 @@
+ #endif // Private headers
-+extern bool qt_use_native_dialogs;
-+
- QFont QFontDialog::getFont( bool *ok, const QFont *def,
- QWidget *parent, const char* name)
- {
-+#if defined(Q_WS_X11)
-+ if ( qt_use_native_dialogs && QKDEIntegration::enabled())
-+ return QKDEIntegration::getFont( ok, def, parent, name );
-+#endif
- QFont result;
- if ( def )
- result = *def;
---- src/dialogs/qcolordialog.cpp.sav 2004-04-30 12:00:05.000000000 +0200
-+++ src/dialogs/qcolordialog.cpp 2004-12-13 16:53:40.000000000 +0100
-@@ -60,6 +60,10 @@ QRgb macGetRgba( QRgb initial, bool *ok,
- QColor macGetColor( const QColor& initial, QWidget *parent, const char *name );
- #endif
+#ifdef Q_WS_X11
+#include "private/qtkdeintegration_x11_p.h"
+#endif
+
- //////////// QWellArray BEGIN
-
- struct QWellArrayData;
-@@ -1478,7 +1482,10 @@ QColorDialog::QColorDialog(QWidget* pare
- QColor QColorDialog::getColor( const QColor& initial, QWidget *parent,
- const char *name )
- {
--#if defined(Q_WS_MAC)
-+#if defined(Q_WS_X11)
-+ if( QKDEIntegration::enabled())
-+ return QKDEIntegration::getColor( initial, parent, name );
-+#elif defined(Q_WS_MAC)
- return macGetColor(initial, parent, name);
- #endif
-
-@@ -1516,6 +1523,13 @@ QRgb QColorDialog::getRgba( QRgb initial
- QWidget *parent, const char* name )
- {
- #if defined(Q_WS_MAC)
-+ if( QKDEIntegration::enabled()) {
-+ QColor color = QKDEIntegration::getColor( QColor( initial ), parent, name );
-+ if( ok )
-+ *ok = color.isValid();
-+ return color.rgba();
-+ }
-+#elif defined(Q_WS_MAC)
- return macGetRgba(initial, ok, parent, name);
- #endif
-
---- src/kernel/qt_x11.pri.sav 2004-11-15 17:51:45.000000000 +0100
-+++ src/kernel/qt_x11.pri 2004-12-13 16:53:40.000000000 +0100
-@@ -10,6 +10,9 @@ unix {
+ #ifdef Q_WS_MAC
+ #include
+ #include
+--- src/kernel/qt_x11.pri
++++ src/kernel/qt_x11.pri
+@@ -10,6 +10,9 @@
SOURCES += $$KERNEL_CPP/qtaddons_x11.cpp
PRECOMPILED_HEADER = kernel/qt_pch.h
@@ -255,16 +268,3 @@
}
nas {
---- src/kernel/qt.h.sav 2004-02-16 15:05:19.000000000 +0100
-+++ src/kernel/qt.h 2004-12-13 16:53:40.000000000 +0100
-@@ -313,6 +313,10 @@
- #endif // Private headers
-
-
-+#ifdef Q_WS_X11
-+#include "private/qtkdeintegration_x11_p.h"
-+#endif
-+
- #ifdef Q_WS_MAC
- #include
- #include
++++++ qt3-arm-gcc4.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:23.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:23.000000000 +0200
@@ -1,6 +1,6 @@
--- src/tools/qglobal.h
+++ src/tools/qglobal.h
-@@ -300,7 +300,7 @@
+@@ -317,7 +317,7 @@
supposedly know what you are doing.) */
# if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
# define Q_PACKED __attribute__ ((packed))
++++++ qt3-fix-cast.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:23.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:23.000000000 +0200
@@ -1,7 +1,7 @@
Index: tools/qvfb/qvfbview.cpp
-===================================================================
---- tools/qvfb/qvfbview.cpp (Revision 464125)
-+++ tools/qvfb/qvfbview.cpp (Arbeitskopie)
+================================================================================
+--- tools/qvfb/qvfbview.cpp
++++ tools/qvfb/qvfbview.cpp
@@ -115,7 +115,7 @@
data = (unsigned char *)shmat( shmId, 0, 0 );
}
++++++ restore-qtextedit-performance.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:23.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:23.000000000 +0200
@@ -1,8 +1,8 @@
Index: src/kernel/qtextengine.cpp
-===================================================================
---- src/kernel/qtextengine.cpp (revision 544824)
-+++ src/kernel/qtextengine.cpp (working copy)
-@@ -1108,7 +1108,7 @@ void QTextEngine::itemize( int mode )
+================================================================================
+--- src/kernel/qtextengine.cpp
++++ src/kernel/qtextengine.cpp
+@@ -1108,7 +1108,7 @@
if ( string.length() == 0 )
return;
++++++ rubberband.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:23.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:23.000000000 +0200
@@ -8,7 +8,7 @@
QPtrDict<QIconViewItem> selectedItems;
struct ItemContainer {
-@@ -1974,14 +1975,27 @@
+@@ -1975,14 +1976,27 @@
if ( picture() ) {
QPicture *pic = picture();
if ( isSelected() ) {
@@ -40,7 +40,7 @@
int align = view->itemTextPos() == QIconView::Bottom ? AlignHCenter : AlignAuto;
if ( view->d->wordWrapIconText )
-@@ -2039,10 +2053,19 @@
+@@ -2040,10 +2054,19 @@
p->save();
if ( isSelected() ) {
@@ -63,7 +63,7 @@
int align = AlignHCenter;
if ( view->d->wordWrapIconText )
-@@ -2058,31 +2081,13 @@
+@@ -2059,31 +2082,13 @@
/*!
Paints the focus rectangle of the item using the painter \a p and
the color group \a cg.
@@ -99,7 +99,7 @@
}
/*!
-@@ -2780,6 +2785,7 @@
+@@ -2781,6 +2786,7 @@
d->renamingItem = 0;
d->drawActiveSelection = TRUE;
d->drawDragShapes = FALSE;
@@ -107,7 +107,7 @@
connect( d->adjustTimer, SIGNAL( timeout() ),
this, SLOT( adjustItems() ) );
-@@ -3264,7 +3270,7 @@
+@@ -3265,7 +3271,7 @@
void QIconView::doAutoScroll()
{
@@ -116,7 +116,7 @@
QPoint vp = viewport()->mapFromGlobal( QCursor::pos() );
QPoint pos = viewportToContents( vp );
-@@ -3281,7 +3287,6 @@
+@@ -3282,7 +3288,6 @@
bool block = signalsBlocked();
QRect rr;
@@ -124,7 +124,7 @@
blockSignals( TRUE );
viewport()->setUpdatesEnabled( FALSE );
-@@ -3307,9 +3312,6 @@
+@@ -3308,9 +3313,6 @@
item->setSelected( TRUE, TRUE );
changed = TRUE;
rr = rr.unite( item->rect() );
@@ -134,7 +134,7 @@
}
minx = QMIN( minx, item->x() - 1 );
-@@ -3326,42 +3328,77 @@
+@@ -3327,42 +3329,77 @@
viewport()->setUpdatesEnabled( TRUE );
blockSignals( block );
@@ -231,7 +231,7 @@
+ bitBlt( viewport(), allRect.topLeft(), d->backrubber, allRect );
if ( changed ) {
- emit selectionChanged();
+ emit selectionChanged();
- if ( d->selectionMode == Single )
- emit selectionChanged( d->currentItem );
+ if ( d->selectionMode == Single )
@@ -239,7 +239,7 @@
}
if ( !QRect( 50, 50, viewport()->width()-100, viewport()->height()-100 ).contains( vp ) &&
-@@ -3388,9 +3424,7 @@
+@@ -3389,9 +3426,7 @@
void QIconView::drawContents( QPainter *p, int cx, int cy, int cw, int ch )
{
@@ -250,7 +250,7 @@
QRect r = QRect( cx, cy, cw, ch );
QIconViewPrivate::ItemContainer *c = d->firstContainer;
-@@ -3464,8 +3498,16 @@
+@@ -3465,8 +3500,16 @@
d->currentItem->paintFocus( p, colorGroup() );
}
@@ -269,7 +269,7 @@
}
/*!
-@@ -4364,17 +4406,15 @@
+@@ -4365,17 +4408,15 @@
void QIconView::contentsMousePressEventEx( QMouseEvent *e )
{
if ( d->rubber ) {
@@ -295,7 +295,7 @@
if ( d->scrollTimer ) {
disconnect( d->scrollTimer, SIGNAL( timeout() ), this, SLOT( doAutoScroll() ) );
-@@ -4559,21 +4599,17 @@
+@@ -4560,21 +4601,17 @@
d->startDragItem = 0;
if ( d->rubber ) {
@@ -324,7 +324,7 @@
d->currentItem = d->tmpCurrentItem;
d->tmpCurrentItem = 0;
if ( d->currentItem )
-@@ -5333,9 +5369,9 @@
+@@ -5334,9 +5371,9 @@
QPoint pnt( d->rubber->x(), d->rubber->y() );
pnt = contentsToViewport( pnt );
@@ -337,61 +337,3 @@
}
/*!
---- src/widgets/qlistbox.cpp
-+++ src/widgets/qlistbox.cpp
-@@ -2163,7 +2163,7 @@
- }
-
- if ( d->rubber ) {
-- drawRubber();
-+ repaintContents( d->rubber->normalize(), FALSE );
- delete d->rubber;
- d->rubber = 0;
- d->current = d->tmpCurrent;
-@@ -2241,11 +2241,9 @@
- }
-
- if ( d->rubber ) {
-- QRect r = d->rubber->normalize();
-- drawRubber();
-+ QRect r = d->rubber->normalize();
- d->rubber->setCoords( d->rubber->x(), d->rubber->y(), e->x(), e->y() );
- doRubberSelection( r, d->rubber->normalize() );
-- drawRubber();
- return;
- }
-
-@@ -4386,6 +4384,7 @@
- return;
- if ( !d->rubber->width() && !d->rubber->height() )
- return;
-+
- QPainter p( viewport() );
- p.setRasterOp( NotROP );
- style().drawPrimitive( QStyle::PE_RubberBand, &p, d->rubber->normalize(),
-@@ -4418,13 +4417,24 @@
- }
- }
- }
-+
-+ QRect allRect = old;
-+ if ( changed ) {
-+ allRect |= pr;
-+ }
-+ allRect |= rubber;
-+ allRect &= viewport()->rect();
-+ allRect.addCoords( -2, -2, 2, 2 );
-+
-+ repaintContents( QRect( contentsX() + allRect.left(), contentsY() + allRect.top(), allRect.width(), allRect.height() ), FALSE );
-+ drawRubber();
-+
- if ( changed ) {
- emit selectionChanged();
- #if defined(QT_ACCESSIBILITY_SUPPORT)
- QAccessible::updateAccessibility( viewport(), 0, QAccessible::Selection );
- #endif
- }
-- viewport()->repaint( pr, TRUE );
- }
-
-
++++++ xinerama.patch ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:23.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:23.000000000 +0200
@@ -1,24 +1,6 @@
---- src/kernel/qapplication_x11.cpp.sav 2006-06-01 13:31:04.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp 2006-06-01 13:33:07.000000000 +0200
-@@ -271,6 +271,7 @@ Atom qt_net_wm_frame_strut = 0; // KDE
- Atom qt_net_wm_state_stays_on_top = 0; // KDE extension
- Atom qt_net_wm_pid = 0;
- Atom qt_net_wm_user_time = 0;
-+Atom qt_net_wm_full_placement = 0; // KDE extension
- // Enlightenment support
- Atom qt_enlightenment_desktop = 0;
-
-@@ -1922,6 +1923,7 @@ void qt_init_internal( int *argcptr, cha
- &qt_net_wm_state_stays_on_top );
- qt_x11_intern_atom( "_NET_WM_PID", &qt_net_wm_pid );
- qt_x11_intern_atom( "_NET_WM_USER_TIME", &qt_net_wm_user_time );
-+ qt_x11_intern_atom( "_NET_WM_FULL_PLACEMENT", &qt_net_wm_full_placement );
- qt_x11_intern_atom( "ENLIGHTENMENT_DESKTOP", &qt_enlightenment_desktop );
- qt_x11_intern_atom( "_NET_WM_NAME", &qt_net_wm_name );
- qt_x11_intern_atom( "_NET_WM_ICON_NAME", &qt_net_wm_icon_name );
---- src/dialogs/qdialog.cpp.sav 2006-03-17 14:33:44.000000000 +0100
-+++ src/dialogs/qdialog.cpp 2006-06-01 13:38:00.000000000 +0200
-@@ -670,6 +670,11 @@ bool QDialog::event( QEvent *e )
+--- src/dialogs/qdialog.cpp
++++ src/dialogs/qdialog.cpp
+@@ -670,6 +670,11 @@
#if defined(Q_WS_X11)
extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
@@ -30,7 +12,7 @@
#endif // Q_WS_X11
/*!
-@@ -691,10 +696,12 @@ void QDialog::show()
+@@ -691,10 +696,12 @@
if ( !did_resize )
adjustSize();
@@ -47,3 +29,21 @@
}
if (windowState() != state)
+--- src/kernel/qapplication_x11.cpp
++++ src/kernel/qapplication_x11.cpp
+@@ -273,6 +273,7 @@
+ Atom qt_net_wm_state_stays_on_top = 0; // KDE extension
+ Atom qt_net_wm_pid = 0;
+ Atom qt_net_wm_user_time = 0;
++Atom qt_net_wm_full_placement = 0; // KDE extension
+ // Enlightenment support
+ Atom qt_enlightenment_desktop = 0;
+
+@@ -1989,6 +1990,7 @@
+ &qt_net_wm_state_stays_on_top );
+ qt_x11_intern_atom( "_NET_WM_PID", &qt_net_wm_pid );
+ qt_x11_intern_atom( "_NET_WM_USER_TIME", &qt_net_wm_user_time );
++ qt_x11_intern_atom( "_NET_WM_FULL_PLACEMENT", &qt_net_wm_full_placement );
+ qt_x11_intern_atom( "ENLIGHTENMENT_DESKTOP", &qt_enlightenment_desktop );
+ qt_x11_intern_atom( "_NET_WM_NAME", &qt_net_wm_name );
+ qt_x11_intern_atom( "_NET_WM_ICON_NAME", &qt_net_wm_icon_name );
++++++ xpm-handling-fixes.diff ++++++
--- /var/tmp/diff_new_pack.K7vA3x/_old 2006-10-06 17:24:23.000000000 +0200
+++ /var/tmp/diff_new_pack.K7vA3x/_new 2006-10-06 17:24:23.000000000 +0200
@@ -1,8 +1,8 @@
--- src/kernel/qimage.cpp
-+++ src/kernel/qimage.cpp 2004/08/12 09:18:29
-@@ -5681,6 +5681,9 @@
- image.create( w, h, 8, ncols );
- }
++++ src/kernel/qimage.cpp
+@@ -5740,6 +5740,9 @@
+ if (image.isNull())
+ return;
+ if (image.isNull())
+ return;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org