aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits/qt33
diff options
context:
space:
mode:
Diffstat (limited to 'x11-toolkits/qt33')
-rw-r--r--x11-toolkits/qt33/Makefile211
-rw-r--r--x11-toolkits/qt33/distinfo2
-rw-r--r--x11-toolkits/qt33/files/0001-dnd_optimization.patch188
-rw-r--r--x11-toolkits/qt33/files/0002-dnd_active_window_fix.patch189
-rw-r--r--x11-toolkits/qt33/files/0007-qpixmap_constants.patch384
-rw-r--r--x11-toolkits/qt33/files/0015-qiconview-finditem.patch43
-rw-r--r--x11-toolkits/qt33/files/0016-qiconview-rebuildcontainer.patch34
-rw-r--r--x11-toolkits/qt33/files/0017-qiconview-ctrl_rubber.patch90
-rw-r--r--x11-toolkits/qt33/files/0020-designer-deletetabs.patch76
-rw-r--r--x11-toolkits/qt33/files/0032-fix_rotated_randr.diff94
-rw-r--r--x11-toolkits/qt33/files/0035-qvaluelist-streaming-operator.patch27
-rw-r--r--x11-toolkits/qt33/files/0038-dragobject-dont-prefer-unknown.patch57
-rw-r--r--x11-toolkits/qt33/files/0044-qscrollview-windowactivate-fix.diff38
-rw-r--r--x11-toolkits/qt33/files/0046-qiconview-no-useless-scrollbar.diff150
-rw-r--r--x11-toolkits/qt33/files/0047-fix-kmenu-width.diff25
-rw-r--r--x11-toolkits/qt33/files/0048-qclipboard_hack_80072.patch48
-rw-r--r--x11-toolkits/qt33/files/0049-qiconview-rubber_on_move.diff114
-rw-r--r--x11-toolkits/qt33/files/0056-khotkeys_input_84434.patch21
-rw-r--r--x11-toolkits/qt33/files/0059-qpopup_has_mouse.patch68
-rw-r--r--x11-toolkits/qt33/files/0060-qpopup_ignore_mousepos.patch59
-rw-r--r--x11-toolkits/qt33/files/0061-qscrollview-propagate-horizontal-wheelevent.patch23
-rw-r--r--x11-toolkits/qt33/files/0073-xinerama-aware-qpopup.patch113
-rw-r--r--x11-toolkits/qt33/files/0076-fix-qprocess.diff19
-rw-r--r--x11-toolkits/qt33/files/0078-argb-visual-hack.patch71
-rw-r--r--x11-toolkits/qt33/files/0079-compositing-types.patch424
-rw-r--r--x11-toolkits/qt33/files/0080-net-wm-sync-request.patch307
-rw-r--r--x11-toolkits/qt33/files/0081-format-string-fixes.diff197
-rw-r--r--x11-toolkits/qt33/files/patch-configure60
-rw-r--r--x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp64
-rw-r--r--x11-toolkits/qt33/files/patch-src-styles-qstylefactory.cpp12
-rw-r--r--x11-toolkits/qt33/files/patch-src__tools__qtvaluelist.h10
-rw-r--r--x11-toolkits/qt33/files/patch-src_tools-qsettings.cpp25
-rw-r--r--x11-toolkits/qt33/files/patch-src_tools_qlocale.cpp14
-rw-r--r--x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp10
-rw-r--r--x11-toolkits/qt33/files/patch-tools_designer_uic_form.cpp16
-rw-r--r--x11-toolkits/qt33/files/patch-tools_makeqpf_main.cpp20
-rw-r--r--x11-toolkits/qt33/files/patch-tools_qvfb-qvfbview.cpp11
-rw-r--r--x11-toolkits/qt33/files/patch-utf8-bug-qt3105
-rw-r--r--x11-toolkits/qt33/files/patch-visibility65
-rw-r--r--x11-toolkits/qt33/files/xxxx-qt-font-default-subst.patch77
-rw-r--r--x11-toolkits/qt33/pkg-descr10
-rw-r--r--x11-toolkits/qt33/pkg-message12
-rw-r--r--x11-toolkits/qt33/pkg-plist2390
43 files changed, 0 insertions, 5973 deletions
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile
deleted file mode 100644
index fce4e55b82e9..000000000000
--- a/x11-toolkits/qt33/Makefile
+++ /dev/null
@@ -1,211 +0,0 @@
-# Created by: will@cvs.kde.org
-# $FreeBSD$
-
-PORTNAME= qt
-PORTVERSION= 3.3.8
-PORTREVISION= 14
-CATEGORIES?= x11-toolkits ipv6
-MASTER_SITES= ${MASTER_SITE_QT}
-MASTER_SITE_SUBDIR= archive/qt/${PORTVERSION:R:R}
-DISTNAME= qt-x11-free-${PORTVERSION}
-DIST_SUBDIR= KDE
-
-MAINTAINER= ports@FreeBSD.org
-COMMENT= Multiplatform C++ application framework
-
-DEPRECATED= No upstream activity since 2008; unmaintained
-EXPIRATION_DATE= 2013-07-01
-
-BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake
-
-LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng \
- png15:${PORTSDIR}/graphics/png \
- jpeg:${PORTSDIR}/graphics/jpeg
-
-EXTRA_PATCHES= ${PATCHDIR}/0081-format-string-fixes.diff
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
-
-USE_BZIP2= yes
-USE_XORG= xinerama sm inputproto xi
-REINPLACE_ARGS= -i ""
-HAS_CONFIGURE= yes
-USE_LDCONFIG= yes
-
-.if defined(PACKAGE_BUILDING)
-TMPDIR?= /tmp
-.endif
-
-CONFIGURE_ARGS+=-system-libpng -system-libjpeg -system-libmng \
- -qt-imgfmt-png -qt-imgfmt-jpeg -qt-imgfmt-mng \
- -system-zlib -sm -qt-gif -thread \
- -fast -xinerama -no-g++-exceptions -stl -no-nis \
- -I${LOCALBASE}/include/libpng15 \
- ${CUPS} -shared -prefix ${PREFIX} -datadir ${DATADIR} \
- -verbose -docdir ${DOCSDIR} -tablet -ipv6 \
- -DPNG_DEPSTRUCT= \
- -plugindir ${PREFIX}/lib/plugins
-CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
-MAKE_ENV?= TMPDIR=${TMPDIR} \
- QTDIR=${WRKSRC} \
- LD_LIBRARY_PATH=${WRKSRC}/lib:$$LD_LIBRARY_PATH \
- PATH=${WRKSRC}/bin:$$PATH
-ALL_TARGET= sub-tools
-EXTRACT_AFTER_ARGS= \
- --exclude '${DISTNAME}/mkspecs' --exclude '${DISTNAME}/qmake' \
- --exclude '${DISTNAME}/examples' --exclude '${DISTNAME}/tutorial' \
- --exclude '${DISTNAME}/extensions/nsplugin/src/[^q]*' \
- --exclude '${DISTNAME}/include/jri*' \
- --exclude '${DISTNAME}/include/np*' \
- --exclude '${DISTNAME}/doc/html/qmake*'
-
-OPTIONS_DEFINE= CUPS KDE_PATCHES NAS OPENGL XFT
-OPTIONS_DEFAULT= CUPS NAS OPENGL XFT
-KDE_PATCHES_DESC= Apply KDE patches
-
-EXTRACT_COOKIE= ${WRKDIR}/.extract_done.${PORTNAME}.${PREFIX:S/\//_/g}
-CONFIGURE_COOKIE=${WRKDIR}/.configure_done.${PORTNAME}.${PREFIX:S/\//_/g}
-INSTALL_COOKIE= ${WRKDIR}/.install_done.${PORTNAME}.${PREFIX:S/\//_/g}
-BUILD_COOKIE= ${WRKDIR}/.build_done.${PORTNAME}.${PREFIX:S/\//_/g}
-PATCH_COOKIE= ${WRKDIR}/.patch_done.${PORTNAME}.${PREFIX:S/\//_/g}
-PACKAGE_COOKIE= ${WRKDIR}/.package_done.${PORTNAME}.${PREFIX:S/\//_/g}
-
-.include <bsd.port.pre.mk>
-
-# The previous Qt port versions installed qmake and qmake's specs under LOCALBASE
-# The new devel/qmake port installs them under LOCALBASE. We can use
-# either one here, but we prefer the newer:
-.for d in ${LOCALBASE} ${PREFIX}
-. if exists($d/share/qt/mkspecs/freebsd-g++/qplatformdefs.h)
-QTBASE=$d
-PLATFORM=${QTBASE}/share/qt/mkspecs/freebsd-g++
-. endif
-.endfor
-
-.if defined(PLATFORM)
-CONFIGURE_ARGS+=-platform ${PLATFORM}
-.else
-CONFIGURE_ARGS+=-platform ${LOCALBASE}/share/qt/mkspecs/freebsd-g++
-.endif
-
-.if ${PORT_OPTIONS:MXFT}
-LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft
-.elif defined(WITHOUT_XFT)
-CONFIGURE_ARGS+=-no-xft
-.endif
-
-.if defined(WANT_QT_DEBUG)
-CONFIGURE_ARGS+=-debug
-.endif
-
-.if ${PORT_OPTIONS:MOPENGL}
-USE_GL= glu
-CONFIGURE_ARGS+=-dlopen-opengl
-.else
-CONFIGURE_ARGS+=-disable-opengl
-.endif # WITHOUT_OPENGL
-
-.if ${PORT_OPTIONS:MCUPS}
-LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
-CUPS= -cups -L${LOCALBASE}/lib -I${LOCALBASE}/include
-.endif
-
-.if ${PORT_OPTIONS:MNAS}
-LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas
-CONFIGURE_ARGS+=-system-nas-sound -no-pch
-.else
-CONFIGURE_ARGS+=-no-nas-sound -no-pch
-.endif
-
-.if ${PORT_OPTIONS:MKDE_PATCHES}
-EXTRA_PATCHES+= ${PATCHDIR}/0001-dnd_optimization.patch \
- ${PATCHDIR}/0002-dnd_active_window_fix.patch \
- ${PATCHDIR}/0007-qpixmap_constants.patch \
- ${PATCHDIR}/0015-qiconview-finditem.patch \
- ${PATCHDIR}/0016-qiconview-rebuildcontainer.patch \
- ${PATCHDIR}/0017-qiconview-ctrl_rubber.patch \
- ${PATCHDIR}/0020-designer-deletetabs.patch \
- ${PATCHDIR}/0032-fix_rotated_randr.diff \
- ${PATCHDIR}/0035-qvaluelist-streaming-operator.patch \
- ${PATCHDIR}/0038-dragobject-dont-prefer-unknown.patch \
- ${PATCHDIR}/0044-qscrollview-windowactivate-fix.diff \
- ${PATCHDIR}/0046-qiconview-no-useless-scrollbar.diff \
- ${PATCHDIR}/0047-fix-kmenu-width.diff \
- ${PATCHDIR}/0048-qclipboard_hack_80072.patch \
- ${PATCHDIR}/0049-qiconview-rubber_on_move.diff \
- ${PATCHDIR}/0056-khotkeys_input_84434.patch \
- ${PATCHDIR}/0059-qpopup_has_mouse.patch \
- ${PATCHDIR}/0060-qpopup_ignore_mousepos.patch \
- ${PATCHDIR}/0061-qscrollview-propagate-horizontal-wheelevent.patch \
- ${PATCHDIR}/0073-xinerama-aware-qpopup.patch \
- ${PATCHDIR}/0076-fix-qprocess.diff \
- ${PATCHDIR}/0078-argb-visual-hack.patch \
- ${PATCHDIR}/0079-compositing-types.patch \
- ${PATCHDIR}/0080-net-wm-sync-request.patch \
- ${PATCHDIR}/xxxx-qt-font-default-subst.patch
-PKGNAMESUFFIX= -copy
-COMMENT+= (+ KDE patches)
-CONFLICTS+= qt-3.3.*
-.else
-CONFLICTS+= qt-copy-[0-9]*
-.endif
-
-.if exists(${LOCALBASE}/include/qt2/qapp.h)
-BROKEN= You have QT2 headers installed! Installing this port
-BROKEN+=will result in conflicts between QT3 and QT2!
-.endif
-
-post-patch:
-.if defined(PLATFORM)
- @${REINPLACE_CMD} -e 's|$$outpath/bin/qmake|${QTBASE}/bin/qmake|g' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|$$OUTDIR/bin/qmake|${QTBASE}/bin/qmake|g' \
- ${WRKSRC}/config.tests/unix/endian.test \
- ${WRKSRC}/config.tests/unix/largefile.test \
- ${WRKSRC}/config.tests/unix/ptrsize.test
-.else
- @${REINPLACE_CMD} -e 's|$$outpath/bin/qmake|${LOCALBASE}/bin/qmake|g' \
- ${WRKSRC}/configure
- @${REINPLACE_CMD} -e 's|$$OUTDIR/bin/qmake|${LOCALBASE}/bin/qmake|g' \
- ${WRKSRC}/config.tests/unix/endian.test \
- ${WRKSRC}/config.tests/unix/largefile.test \
- ${WRKSRC}/config.tests/unix/ptrsize.test
-.endif
- @${REINPLACE_CMD} -e 's|^ cd qmake.*||' ${WRKSRC}/Makefile
- @${REINPLACE_CMD} -e 's|^CFG_PRECOMPILE=no|CFG_PRECOMPILE=auto|g' \
- ${WRKSRC}/configure
-
-post-configure:
- @${REINPLACE_CMD} -e \
- 's|/lib/pkgconfig/|/libdata/pkgconfig/|g' \
- -e 's|^INCPATH.*=|INCPATH = -I../include|g' \
- ${WRKSRC}/src/Makefile
- @${REINPLACE_CMD} -e \
- 's|^prefix=.*|prefix=${PREFIX}|g' ${WRKSRC}/lib/qt-mt.pc
-
-post-build:
-.for tool in makeqpf mergetr msg2qm qembed qvfb
- @cd ${WRKSRC}/tools/${tool}; ${SETENV} ${MAKE_ENV} ${MAKE}
-.endfor
- @${RM} -f ${WRKSRC}/doc/html/qmake*
-
- PREFIX_REAL=$$(/bin/realpath ${PREFIX}); \
- ${REINPLACE_CMD} -e "s|$${PREFIX_REAL}/include/q.*h||g" \
- -e "s|$${PREFIX_REAL}/include/private/q.*h||g" \
- ${WRKSRC}/src/Makefile
-
-# Work around qmake generated dependencies
-pre-su-install:
- ${MKDIR} ${PREFIX}/lib ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/lib/*.prl ${PREFIX}/lib
- ${INSTALL_SCRIPT} ${WRKSRC}/bin/findtr ${PREFIX}/bin
-.for tool in makeqpf mergetr msg2qm qembed qvfb
- ${INSTALL_PROGRAM} ${WRKSRC}/tools/${tool}/${tool} ${PREFIX}/bin
-.endfor
-
-post-install:
- ${RM} -f ${PREFIX}/lib/libqt-mt.la
- @${CAT} ${PKGMESSAGE}
-
-.include <bsd.port.post.mk>
diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo
deleted file mode 100644
index db96aec99677..000000000000
--- a/x11-toolkits/qt33/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (KDE/qt-x11-free-3.3.8.tar.bz2) = e8c3f703d00a4e2ab9ba63fd474caa8a9d0aa3d7f1d5451dd162bec9d778a449
-SIZE (KDE/qt-x11-free-3.3.8.tar.bz2) = 14360483
diff --git a/x11-toolkits/qt33/files/0001-dnd_optimization.patch b/x11-toolkits/qt33/files/0001-dnd_optimization.patch
deleted file mode 100644
index 69da4ab1f11d..000000000000
--- a/x11-toolkits/qt33/files/0001-dnd_optimization.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-qt-bugs@ issue : 16115
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-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 @@
- #include "qdragobject.h"
- #include "qobjectlist.h"
- #include "qcursor.h"
-+#include "qbitmap.h"
-+#include "qpainter.h"
-
- #include "qt_x11_p.h"
-
- // conflict resolution
-
--// unused, may be used again later: const int XKeyPress = KeyPress;
--// unused, may be used again later: const int XKeyRelease = KeyRelease;
-+const int XKeyPress = KeyPress;
-+const int XKeyRelease = KeyRelease;
- #undef KeyPress
- #undef KeyRelease
-
-@@ -253,20 +255,47 @@ class QShapedPixmapWidget : public QWidg
- public:
- QShapedPixmapWidget(int screen = -1) :
- QWidget(QApplication::desktop()->screen( screen ),
-- 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM )
-+ 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), oldpmser( 0 ), oldbmser( 0 )
- {
- }
-
-- void setPixmap(QPixmap pm)
-+ void setPixmap(QPixmap pm, QPoint hot)
- {
-- if ( pm.mask() ) {
-+ int bmser = pm.mask() ? pm.mask()->serialNumber() : 0;
-+ if( oldpmser == pm.serialNumber() && oldbmser == bmser
-+ && oldhot == hot )
-+ return;
-+ oldpmser = pm.serialNumber();
-+ oldbmser = bmser;
-+ oldhot = hot;
-+ bool hotspot_in = !(hot.x() < 0 || hot.y() < 0 || hot.x() >= pm.width() || hot.y() >= pm.height());
-+// if the pixmap has hotspot in its area, make a "hole" in it at that position
-+// this will allow XTranslateCoordinates() to find directly the window below the cursor instead
-+// of finding this pixmap, and therefore there won't be needed any (slow) search for the window
-+// using findRealWindow()
-+ if( hotspot_in ) {
-+ QBitmap mask = pm.mask() ? *pm.mask() : QBitmap( pm.width(), pm.height());
-+ if( !pm.mask())
-+ mask.fill( Qt::color1 );
-+ QPainter p( &mask );
-+ p.setPen( Qt::color0 );
-+ p.drawPoint( hot.x(), hot.y());
-+ p.end();
-+ pm.setMask( mask );
-+ setMask( mask );
-+ } else if ( pm.mask() ) {
- setMask( *pm.mask() );
- } else {
- clearMask();
- }
- resize(pm.width(),pm.height());
- setErasePixmap(pm);
-+ erase();
- }
-+private:
-+ int oldpmser;
-+ int oldbmser;
-+ QPoint oldhot;
- };
-
- static QShapedPixmapWidget * qt_xdnd_deco = 0;
-@@ -872,6 +901,45 @@ void QDragManager::timerEvent( QTimerEve
- move( QCursor::pos() );
- }
-
-+static bool qt_xdnd_was_move = false;
-+static bool qt_xdnd_found = false;
-+// check whole incoming X queue for move events
-+// checking whole queue is done by always returning False in the predicate
-+// if there's another move event in the queue, and there's not a mouse button
-+// or keyboard or ClientMessage event before it, the current move event
-+// may be safely discarded
-+// this helps avoiding being overloaded by being flooded from many events
-+// from the XServer
-+static
-+Bool qt_xdnd_predicate( Display*, XEvent* ev, XPointer )
-+{
-+ if( qt_xdnd_found )
-+ return False;
-+ if( ev->type == MotionNotify )
-+ {
-+ qt_xdnd_was_move = true;
-+ qt_xdnd_found = true;
-+ }
-+ if( ev->type == ButtonPress || ev->type == ButtonRelease
-+ || ev->type == XKeyPress || ev->type == XKeyRelease
-+ || ev->type == ClientMessage )
-+ {
-+ qt_xdnd_was_move = false;
-+ qt_xdnd_found = true;
-+ }
-+ return False;
-+}
-+
-+static
-+bool qt_xdnd_another_movement()
-+{
-+ qt_xdnd_was_move = false;
-+ qt_xdnd_found = false;
-+ XEvent dummy;
-+ XCheckIfEvent( qt_xdisplay(), &dummy, qt_xdnd_predicate, NULL );
-+ return qt_xdnd_was_move;
-+}
-+
- bool QDragManager::eventFilter( QObject * o, QEvent * e)
- {
- if ( beingCancelled ) {
-@@ -894,8 +962,10 @@ bool QDragManager::eventFilter( QObject
-
- if ( e->type() == QEvent::MouseMove ) {
- QMouseEvent* me = (QMouseEvent *)e;
-- updateMode(me->stateAfter());
-- move( me->globalPos() );
-+ if( !qt_xdnd_another_movement()) {
-+ updateMode(me->stateAfter());
-+ move( me->globalPos() );
-+ }
- return TRUE;
- } else if ( e->type() == QEvent::MouseButtonRelease ) {
- qApp->removeEventFilter( this );
-@@ -1136,7 +1206,7 @@ void QDragManager::move( const QPoint &
- qt_xdnd_deco->grabMouse();
- }
- }
-- updatePixmap();
-+ updatePixmap( globalPos );
-
- if ( qt_xdnd_source_sameanswer.contains( globalPos ) &&
- qt_xdnd_source_sameanswer.isValid() ) {
-@@ -1729,7 +1799,7 @@ bool QDragManager::drag( QDragObject * o
- // qt_xdnd_source_object persists until we get an xdnd_finish message
- }
-
--void QDragManager::updatePixmap()
-+void QDragManager::updatePixmap( const QPoint& cursorPos )
- {
- if ( qt_xdnd_deco ) {
- QPixmap pm;
-@@ -1744,9 +1814,8 @@ void QDragManager::updatePixmap()
- defaultPm = new QPixmap(default_pm);
- pm = *defaultPm;
- }
-- qt_xdnd_deco->setPixmap(pm);
-- qt_xdnd_deco->move(QCursor::pos()-pm_hot);
-- qt_xdnd_deco->repaint(FALSE);
-+ qt_xdnd_deco->setPixmap(pm, pm_hot);
-+ qt_xdnd_deco->move(cursorPos-pm_hot);
- //if ( willDrop ) {
- qt_xdnd_deco->show();
- //} else {
-@@ -1755,4 +1824,9 @@ void QDragManager::updatePixmap()
- }
- }
-
-+void QDragManager::updatePixmap()
-+{
-+ updatePixmap( QCursor::pos());
-+}
-+
- #endif // QT_NO_DRAGANDDROP
---- src/kernel/qdragobject.h
-+++ src/kernel/qdragobject.h
-@@ -245,6 +245,7 @@ private:
- void move( const QPoint & );
- void drop();
- void updatePixmap();
-+ void updatePixmap( const QPoint& cursorPos );
-
- private:
- QDragObject * object;
diff --git a/x11-toolkits/qt33/files/0002-dnd_active_window_fix.patch b/x11-toolkits/qt33/files/0002-dnd_active_window_fix.patch
deleted file mode 100644
index 4b497d64f65f..000000000000
--- a/x11-toolkits/qt33/files/0002-dnd_active_window_fix.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-qt-bugs@ issue : 25122
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
- 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
- entry, Ctrl+Fn to switch to a different virtual desktop, etc.). As soon as
- the app performing DND is not the active application, and the mouse is not
- moving, pressing/releasing Ctrl doesn't do anything, the state only updates
- when the mouse is moved.
-
- This is caused by the fact that Qt has only pointer grab when doing DND, but
- doesn't have keyboard grab. I actually consider this a good thing, because
- the only keys important for DND are modifiers, and they come together with
- pointer events, and not having keyboard grab allows using keyboard shortcuts
- like Alt+Tab while DND. However, when the mouse is not moved, and only a
- modifier key is pressed/released, the app won't get any mouse event, and
- won't also get the keyboard event.
-
- The attached patch changes Qt to explicitly check the modifiers state using
- XQueryPointer() if there's wasn't recently any mouse/keyboard event, which
- ensures the state is updated even in the situation described above.
-
---- src/kernel/qapplication_x11.cpp.sav 2003-06-21 12:31:35.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp 2003-06-21 12:35:44.000000000 +0200
-@@ -4053,7 +4053,7 @@ void QApplication::closePopup( QWidget *
- // Keyboard event translation
- //
-
--static int translateButtonState( int s )
-+int qt_x11_translateButtonState( int s )
- {
- int bst = 0;
- if ( s & Button1Mask )
-@@ -4119,7 +4119,7 @@ bool QETWidget::translateMouseEvent( con
- pos.ry() = lastMotion.y;
- globalPos.rx() = lastMotion.x_root;
- globalPos.ry() = lastMotion.y_root;
-- state = translateButtonState( lastMotion.state );
-+ state = qt_x11_translateButtonState( lastMotion.state );
- if ( qt_button_down && (state & (LeftButton |
- MidButton |
- RightButton ) ) == 0 )
-@@ -4143,7 +4143,7 @@ bool QETWidget::translateMouseEvent( con
- pos.ry() = xevent->xcrossing.y;
- globalPos.rx() = xevent->xcrossing.x_root;
- globalPos.ry() = xevent->xcrossing.y_root;
-- state = translateButtonState( xevent->xcrossing.state );
-+ state = qt_x11_translateButtonState( xevent->xcrossing.state );
- if ( qt_button_down && (state & (LeftButton |
- MidButton |
- RightButton ) ) == 0 )
-@@ -4155,7 +4155,7 @@ bool QETWidget::translateMouseEvent( con
- pos.ry() = event->xbutton.y;
- globalPos.rx() = event->xbutton.x_root;
- globalPos.ry() = event->xbutton.y_root;
-- state = translateButtonState( event->xbutton.state );
-+ state = qt_x11_translateButtonState( event->xbutton.state );
- switch ( event->xbutton.button ) {
- case Button1: button = LeftButton; break;
- case Button2: button = MidButton; break;
-@@ -4950,7 +4950,7 @@ bool QETWidget::translateKeyEventInterna
- XKeyEvent xkeyevent = event->xkey;
-
- // save the modifier state, we will use the keystate uint later by passing
-- // it to translateButtonState
-+ // it to qt_x11_translateButtonState
- uint keystate = event->xkey.state;
- // remove the modifiers where mode_switch exists... HPUX machines seem
- // to have alt *AND* mode_switch both in Mod1Mask, which causes
-@@ -5064,7 +5064,7 @@ bool QETWidget::translateKeyEventInterna
- }
- #endif // !QT_NO_XIM
-
-- state = translateButtonState( keystate );
-+ state = qt_x11_translateButtonState( keystate );
-
- static int directionKeyEvent = 0;
- if ( qt_use_rtl_extensions && type == QEvent::KeyRelease ) {
---- src/kernel/qdnd_x11.cpp.sav 2003-06-30 15:26:42.000000000 +0200
-+++ src/kernel/qdnd_x11.cpp 2003-06-30 15:32:23.000000000 +0200
-@@ -114,6 +114,8 @@ Atom qt_xdnd_finished;
- Atom qt_xdnd_type_list;
- const int qt_xdnd_version = 4;
-
-+extern int qt_x11_translateButtonState( int s );
-+
- // Actions
- //
- // The Xdnd spec allows for user-defined actions. This could be implemented
-@@ -198,6 +200,8 @@ static Atom qt_xdnd_source_current_time;
- static int qt_xdnd_current_screen = -1;
- // state of dragging... true if dragging, false if not
- bool qt_xdnd_dragging = FALSE;
-+// need to check state of keyboard modifiers
-+static bool need_modifiers_check = FALSE;
-
- // dict of payload data, sorted by type atom
- static QIntDict<QByteArray> * qt_xdnd_target_data = 0;
-@@ -879,8 +883,20 @@ void qt_handle_xdnd_finished( QWidget *,
-
- void QDragManager::timerEvent( QTimerEvent* e )
- {
-- if ( e->timerId() == heartbeat && qt_xdnd_source_sameanswer.isNull() )
-- move( QCursor::pos() );
-+ if ( e->timerId() == heartbeat ) {
-+ if( need_modifiers_check ) {
-+ Window root, child;
-+ int root_x, root_y, win_x, win_y;
-+ unsigned int mask;
-+ XQueryPointer( qt_xdisplay(), qt_xrootwin( qt_xdnd_current_screen ),
-+ &root, &child, &root_x, &root_y, &win_x, &win_y, &mask );
-+ if( updateMode( (ButtonState)qt_x11_translateButtonState( mask )))
-+ qt_xdnd_source_sameanswer = QRect(); // force move
-+ }
-+ need_modifiers_check = TRUE;
-+ if( qt_xdnd_source_sameanswer.isNull() )
-+ move( QCursor::pos() );
-+ }
- }
-
- static bool qt_xdnd_was_move = false;
-@@ -948,6 +964,7 @@ bool QDragManager::eventFilter( QObject
- updateMode(me->stateAfter());
- move( me->globalPos() );
- }
-+ need_modifiers_check = FALSE;
- return TRUE;
- } else if ( e->type() == QEvent::MouseButtonRelease ) {
- qApp->removeEventFilter( this );
-@@ -986,9 +1003,11 @@ bool QDragManager::eventFilter( QObject
- beingCancelled = FALSE;
- qApp->exit_loop();
- } else {
-- updateMode(ke->stateAfter());
-- qt_xdnd_source_sameanswer = QRect(); // force move
-- move( QCursor::pos() );
-+ if( updateMode(ke->stateAfter())) {
-+ qt_xdnd_source_sameanswer = QRect(); // force move
-+ move( QCursor::pos() );
-+ }
-+ need_modifiers_check = FALSE;
- }
- return TRUE; // Eat all key events
- }
-@@ -1014,10 +1033,10 @@ bool QDragManager::eventFilter( QObject
-
-
- static Qt::ButtonState oldstate;
--void QDragManager::updateMode( ButtonState newstate )
-+bool QDragManager::updateMode( ButtonState newstate )
- {
- if ( newstate == oldstate )
-- return;
-+ return false;
- const int both = ShiftButton|ControlButton;
- if ( (newstate & both) == both ) {
- global_requested_action = QDropEvent::Link;
-@@ -1041,6 +1060,7 @@ void QDragManager::updateMode( ButtonSta
- }
- }
- oldstate = newstate;
-+ return true;
- }
-
-
-@@ -1707,6 +1727,7 @@ bool QDragManager::drag( QDragObject * o
- qt_xdnd_source_sameanswer = QRect();
- move(QCursor::pos());
- heartbeat = startTimer(200);
-+ need_modifiers_check = FALSE;
-
- #ifndef QT_NO_CURSOR
- qApp->setOverrideCursor( arrowCursor );
---- src/kernel/qdragobject.h.sav 2003-05-19 22:34:43.000000000 +0200
-+++ src/kernel/qdragobject.h 2001-01-01 01:01:00.000000000 +0100
-@@ -248,7 +248,7 @@ private:
-
- private:
- QDragObject * object;
-- void updateMode( ButtonState newstate );
-+ bool updateMode( ButtonState newstate );
- void updateCursor();
-
- QWidget * dragSource;
diff --git a/x11-toolkits/qt33/files/0007-qpixmap_constants.patch b/x11-toolkits/qt33/files/0007-qpixmap_constants.patch
deleted file mode 100644
index 65f9cd64b200..000000000000
--- a/x11-toolkits/qt33/files/0007-qpixmap_constants.patch
+++ /dev/null
@@ -1,384 +0,0 @@
-qt-bugs@ issue : 11790 (part of)
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-See 0005-qpixmap_mitshm.patch for details.
-
-
---- src/kernel/qpixmap_x11.cpp
-+++ src/kernel/qpixmap_x11.cpp
-@@ -1123,9 +1123,6 @@ bool QPixmap::convertFromImage( const QI
- return FALSE;
- int bppc = xi->bits_per_pixel;
-
-- if ( bppc > 8 && xi->byte_order == LSBFirst )
-- bppc++;
--
- bool contig_bits = n_bits(red_mask) == rbits &&
- n_bits(green_mask) == gbits &&
- n_bits(blue_mask) == bbits;
-@@ -1174,32 +1171,70 @@ bool QPixmap::convertFromImage( const QI
- }
- init=TRUE;
- }
-+
-+ enum { BPP8,
-+ BPP16_8_3_M3, BPP16_7_2_M3, BPP16_MSB, BPP16_LSB,
-+ BPP24_MSB, BPP24_LSB,
-+ BPP32_16_8_0, BPP32_MSB, BPP32_LSB
-+ } mode = BPP8;
-
-- for ( uint y=0; y<h; y++ ) {
-- uchar* src = image.scanLine( y );
-- uchar* dst = newbits + xi->bytes_per_line*y;
-- QRgb* p = (QRgb *)src;
-+ if ( bppc > 8 && xi->byte_order == LSBFirst )
-+ bppc++;
-
--#define GET_RGB \
-- int r = qRed ( *p ); \
-- int g = qGreen( *p ); \
-- int b = qBlue ( *p++ ); \
-- r = red_shift > 0 \
-- ? r << red_shift : r >> -red_shift; \
-- g = green_shift > 0 \
-- ? g << green_shift : g >> -green_shift; \
-- b = blue_shift > 0 \
-- ? b << blue_shift : b >> -blue_shift;
-+ int wordsize;
-+ bool bigendian;
-+ qSysInfo( &wordsize, &bigendian );
-+ bool same_msb_lsb = ( xi->byte_order == MSBFirst ) == ( bigendian );
-+
-+ if( bppc == 8 ) // 8 bit
-+ mode = BPP8;
-+ else if( bppc == 16 || bppc == 17 ) { // 16 bit MSB/LSB
-+ if( red_shift == 8 && green_shift == 3 && blue_shift == -3
-+ && !d8 && same_msb_lsb )
-+ mode = BPP16_8_3_M3;
-+ else if( red_shift == 7 && green_shift == 2 && blue_shift == -3
-+ && !d8 && same_msb_lsb )
-+ mode = BPP16_7_2_M3;
-+ else
-+ mode = bppc == 17 ? BPP16_LSB : BPP16_MSB;
-+ } else if( bppc == 24 || bppc == 25 ) { // 24 bit MSB/LSB
-+ mode = bppc == 25 ? BPP24_LSB : BPP24_MSB;
-+ } else if( bppc == 32 || bppc == 33 ) { // 32 bit MSB/LSB
-+ if( red_shift == 16 && green_shift == 8 && blue_shift == 0
-+ && !d8 && same_msb_lsb )
-+ mode = BPP32_16_8_0;
-+ else
-+ mode = bppc == 33 ? BPP32_LSB : BPP32_MSB;
-+ } else
-+ qFatal("Logic error 3");
-
- #define GET_PIXEL \
- int pixel; \
- if ( d8 ) pixel = pix[*src++]; \
- else { \
-- GET_RGB \
-- pixel = (b & blue_mask)|(g & green_mask) | (r & red_mask) \
-+ int r = qRed ( *p ); \
-+ int g = qGreen( *p ); \
-+ int b = qBlue ( *p++ ); \
-+ r = red_shift > 0 \
-+ ? r << red_shift : r >> -red_shift; \
-+ g = green_shift > 0 \
-+ ? g << green_shift : g >> -green_shift; \
-+ b = blue_shift > 0 \
-+ ? b << blue_shift : b >> -blue_shift; \
-+ pixel = (r & red_mask)|(g & green_mask) | (b & blue_mask) \
- | ~(blue_mask | green_mask | red_mask); \
- }
-
-+// optimized case - no d8 case, shift only once instead of twice, mask only once instead of twice,
-+// use direct values instead of variables, and use only one statement
-+// (*p >> 16), (*p >> 8 ) and (*p) are qRed(),qGreen() and qBlue() without masking
-+// shifts have to be passed including the shift operator (e.g. '>>3'), because of the direction
-+#define GET_PIXEL_OPT(red_shift,green_shift,blue_shift,red_mask,green_mask,blue_mask) \
-+ int pixel = ((( *p >> 16 ) red_shift ) & red_mask ) \
-+ | ((( *p >> 8 ) green_shift ) & green_mask ) \
-+ | ((( *p ) blue_shift ) & blue_mask ); \
-+ ++p;
-+
- #define GET_PIXEL_DITHER_TC \
- int r = qRed ( *p ); \
- int g = qGreen( *p ); \
-@@ -1220,91 +1255,177 @@ bool QPixmap::convertFromImage( const QI
- ? g << green_shift : g >> -green_shift; \
- b = blue_shift > 0 \
- ? b << blue_shift : b >> -blue_shift; \
-- int pixel = (b & blue_mask)|(g & green_mask) | (r & red_mask);
-+ int pixel = (r & red_mask)|(g & green_mask) | (b & blue_mask);
-
-- if ( dither_tc ) {
-- uint x;
-- switch ( bppc ) {
-- case 16: // 16 bit MSB
-- for ( x=0; x<w; x++ ) {
-- GET_PIXEL_DITHER_TC
-- *dst++ = (pixel >> 8);
-- *dst++ = pixel;
-- }
-+// again, optimized case
-+// can't be optimized that much :(
-+#define GET_PIXEL_DITHER_TC_OPT(red_shift,green_shift,blue_shift,red_mask,green_mask,blue_mask, \
-+ rbits,gbits,bbits) \
-+ const int thres = D[x%16][y%16]; \
-+ int r = qRed ( *p ); \
-+ if ( r <= (255-(1<<(8-rbits))) && ((r<<rbits) & 255) \
-+ > thres) \
-+ r += (1<<(8-rbits)); \
-+ int g = qGreen( *p ); \
-+ if ( g <= (255-(1<<(8-gbits))) && ((g<<gbits) & 255) \
-+ > thres) \
-+ g += (1<<(8-gbits)); \
-+ int b = qBlue ( *p++ ); \
-+ if ( b <= (255-(1<<(8-bbits))) && ((b<<bbits) & 255) \
-+ > thres) \
-+ b += (1<<(8-bbits)); \
-+ int pixel = (( r red_shift ) & red_mask ) \
-+ | (( g green_shift ) & green_mask ) \
-+ | (( b blue_shift ) & blue_mask );
-+
-+#define CYCLE(body) \
-+ for ( uint y=0; y<h; y++ ) { \
-+ uchar* src = image.scanLine( y ); \
-+ uchar* dst = newbits + xi->bytes_per_line*y; \
-+ QRgb* p = (QRgb *)src; \
-+ body \
-+ }
-+
-+ if ( dither_tc ) {
-+ switch ( mode ) {
-+ case BPP16_8_3_M3:
-+ CYCLE(
-+ Q_INT16* dst16 = (Q_INT16*)dst;
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL_DITHER_TC_OPT(<<8,<<3,>>3,0xf800,0x7e0,0x1f,5,6,5)
-+ *dst16++ = pixel;
-+ }
-+ )
- break;
-- case 17: // 16 bit LSB
-- for ( x=0; x<w; x++ ) {
-- GET_PIXEL_DITHER_TC
-- *dst++ = pixel;
-- *dst++ = pixel >> 8;
-- }
-+ case BPP16_7_2_M3:
-+ CYCLE(
-+ Q_INT16* dst16 = (Q_INT16*)dst;
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL_DITHER_TC_OPT(<<7,<<2,>>3,0x7c00,0x3e0,0x1f,5,5,5)
-+ *dst16++ = pixel;
-+ }
-+ )
-+ break;
-+ case BPP16_MSB: // 16 bit MSB
-+ CYCLE(
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL_DITHER_TC
-+ *dst++ = (pixel >> 8);
-+ *dst++ = pixel;
-+ }
-+ )
-+ break;
-+ case BPP16_LSB: // 16 bit LSB
-+ CYCLE(
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL_DITHER_TC
-+ *dst++ = pixel;
-+ *dst++ = pixel >> 8;
-+ }
-+ )
- break;
- default:
- qFatal("Logic error");
- }
-- } else {
-- uint x;
-- switch ( bppc ) {
-- case 8: // 8 bit
-- for ( x=0; x<w; x++ ) {
-- int pixel = pix[*src++];
-- *dst++ = pixel;
-- }
-+ } else {
-+ switch ( mode ) {
-+ case BPP8: // 8 bit
-+ CYCLE(
-+ Q_UNUSED(p);
-+ for ( uint x=0; x<w; x++ ) {
-+ int pixel = pix[*src++];
-+ *dst++ = pixel;
-+ }
-+ )
- break;
-- case 16: // 16 bit MSB
-- for ( x=0; x<w; x++ ) {
-- GET_PIXEL
-- *dst++ = (pixel >> 8);
-- *dst++ = pixel;
-- }
-+ case BPP16_8_3_M3:
-+ CYCLE(
-+ Q_INT16* dst16 = (Q_INT16*)dst;
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL_OPT(<<8,<<3,>>3,0xf800,0x7e0,0x1f)
-+ *dst16++ = pixel;
-+ }
-+ )
- break;
-- case 17: // 16 bit LSB
-- for ( x=0; x<w; x++ ) {
-- GET_PIXEL
-- *dst++ = pixel;
-- *dst++ = pixel >> 8;
-- }
-+ case BPP16_7_2_M3:
-+ CYCLE(
-+ Q_INT16* dst16 = (Q_INT16*)dst;
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL_OPT(<<7,<<2,>>3,0x7c00,0x3e0,0x1f)
-+ *dst16++ = pixel;
-+ }
-+ )
- break;
-- case 24: // 24 bit MSB
-- for ( x=0; x<w; x++ ) {
-- GET_PIXEL
-- *dst++ = pixel >> 16;
-- *dst++ = pixel >> 8;
-- *dst++ = pixel;
-- }
-+ case BPP16_MSB: // 16 bit MSB
-+ CYCLE(
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL
-+ *dst++ = (pixel >> 8);
-+ *dst++ = pixel;
-+ }
-+ )
- break;
-- case 25: // 24 bit LSB
-- for ( x=0; x<w; x++ ) {
-- GET_PIXEL
-- *dst++ = pixel;
-- *dst++ = pixel >> 8;
-- *dst++ = pixel >> 16;
-- }
-+ case BPP16_LSB: // 16 bit LSB
-+ CYCLE(
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL
-+ *dst++ = pixel;
-+ *dst++ = pixel >> 8;
-+ }
-+ )
- break;
-- case 32: // 32 bit MSB
-- for ( x=0; x<w; x++ ) {
-- GET_PIXEL
-- *dst++ = pixel >> 24;
-- *dst++ = pixel >> 16;
-- *dst++ = pixel >> 8;
-- *dst++ = pixel;
-- }
-+ case BPP24_MSB: // 24 bit MSB
-+ CYCLE(
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL
-+ *dst++ = pixel >> 16;
-+ *dst++ = pixel >> 8;
-+ *dst++ = pixel;
-+ }
-+ )
- break;
-- case 33: // 32 bit LSB
-- for ( x=0; x<w; x++ ) {
-- GET_PIXEL
-- *dst++ = pixel;
-- *dst++ = pixel >> 8;
-- *dst++ = pixel >> 16;
-- *dst++ = pixel >> 24;
-- }
-+ case BPP24_LSB: // 24 bit LSB
-+ CYCLE(
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL
-+ *dst++ = pixel;
-+ *dst++ = pixel >> 8;
-+ *dst++ = pixel >> 16;
-+ }
-+ )
- break;
-- default:
-- qFatal("Logic error 2");
-- }
-- }
-- }
-- xi->data = (char *)newbits;
-+ case BPP32_16_8_0:
-+ CYCLE(
-+ memcpy( dst, p, w * 4 );
-+ )
-+ break;
-+ case BPP32_MSB: // 32 bit MSB
-+ CYCLE(
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL
-+ *dst++ = pixel >> 24;
-+ *dst++ = pixel >> 16;
-+ *dst++ = pixel >> 8;
-+ *dst++ = pixel;
-+ }
-+ )
-+ break;
-+ case BPP32_LSB: // 32 bit LSB
-+ CYCLE(
-+ for ( uint x=0; x<w; x++ ) {
-+ GET_PIXEL
-+ *dst++ = pixel;
-+ *dst++ = pixel >> 8;
-+ *dst++ = pixel >> 16;
-+ *dst++ = pixel >> 24;
-+ }
-+ )
-+ break;
-+ default:
-+ qFatal("Logic error 2");
-+ }
-+ }
-+ xi->data = (char *)newbits;
- }
-
- if ( d == 8 && !trucol ) { // 8 bit pixmap
-@@ -1554,15 +1675,24 @@ bool QPixmap::convertFromImage( const QI
-
- if (image.depth() == 32) {
- const int *iptr = (const int *) image.bits();
-- int max = w * h;
-- while (max--)
-- *aptr++ = *iptr++ >> 24; // squirt
-+ if( axi->bytes_per_line == (int)w ) {
-+ int max = w * h;
-+ while (max--)
-+ *aptr++ = *iptr++ >> 24; // squirt
-+ } else {
-+ for (uint i = 0; i < h; ++i ) {
-+ for (uint j = 0; j < w; ++j )
-+ *aptr++ = *iptr++ >> 24; // squirt
-+ aptr += ( axi->bytes_per_line - w );
-+ }
-+ }
- } else if (image.depth() == 8) {
- const QRgb * const rgb = image.colorTable();
- for (uint y = 0; y < h; ++y) {
- const uchar *iptr = image.scanLine(y);
- for (uint x = 0; x < w; ++x)
- *aptr++ = qAlpha(rgb[*iptr++]);
-+ aptr += ( axi->bytes_per_line - w );
- }
- }
-
diff --git a/x11-toolkits/qt33/files/0015-qiconview-finditem.patch b/x11-toolkits/qt33/files/0015-qiconview-finditem.patch
deleted file mode 100644
index 1c02622972fe..000000000000
--- a/x11-toolkits/qt33/files/0015-qiconview-finditem.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-qt-bugs@ issue : 18886
-applied: no
-author: Pascal Létourneau <pletourn@globetrotter.net>
-
-QIconView::findItem() should always search all ItemContainer to find the best
-match.
-
-Example:
-
------ -----
-| | | | ItemContainer
---------------------------------------
-| | | | boundary
-| | ----- | |
-| | | | | |
------ ----- -----
-item1 item2 item3
-
-Right now, the focus goes from item1 to item3 when you press Key_Right.
-
-[ Since the mail was sent, I added the diff 'contains -> intersects' ]
-
-Index: src/iconview/qiconview.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/iconview/qiconview.cpp,v
-retrieving revision 1.47
-diff -u -3 -p -r1.47 qiconview.cpp
---- src/iconview/qiconview.cpp 16 May 2003 13:02:38 -0000 1.47
-+++ src/iconview/qiconview.cpp 30 May 2003 20:32:34 -0000
-@@ -5200,11 +5201,11 @@ QIconViewItem* QIconView::findItem( Dire
- d->findContainers( dir, relativeTo, searchRect);
-
- cList->first();
-- while ( cList->current() && !centerMatch ) {
-+ while ( cList->current() ) {
- QPtrList<QIconViewItem> &list = (cList->current())->items;
- for ( item = list.first(); item; item = list.next() ) {
- if ( neighbourItem( dir, relativeTo, item ) &&
-- searchRect.contains( item->rect().center() ) &&
-+ searchRect.intersects( item->rect() ) &&
- item != currentItem() ) {
- int ml = (relativeTo - item->rect().center()).manhattanLength();
- if ( centerMatch ) {
diff --git a/x11-toolkits/qt33/files/0016-qiconview-rebuildcontainer.patch b/x11-toolkits/qt33/files/0016-qiconview-rebuildcontainer.patch
deleted file mode 100644
index df1c36ad7117..000000000000
--- a/x11-toolkits/qt33/files/0016-qiconview-rebuildcontainer.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-qt-bugs@ issue : 18598
-applied: no
-author: Pascal Létourneau <pletourn@globetrotter.net>
-
-Sometimes QIconView doesn't paint the top of an icon.
-It's because this part of QIconView::rebuildContainers() is never reached.
-
-...
-if ( d->arrangement == LeftToRight ) {
- if ( item->y() < c->rect.y() && c->p ) {
- c = c->p; <<<<<<<<<<<<<<<<<
- continue;
-...
-
-
-Index: src/iconview/qiconview.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/iconview/qiconview.cpp,v
-retrieving revision 1.47
-diff -u -3 -p -r1.47 qiconview.cpp
---- src/iconview/qiconview.cpp 16 May 2003 13:02:38 -0000 1.47
-+++ src/iconview/qiconview.cpp 30 May 2003 20:32:34 -0000
-@@ -6122,7 +6123,9 @@ void QIconView::rebuildContainers()
- item->d->container2 = 0;
- c->items.append( item );
- item = item->next;
-- } else if ( c->rect.intersects( item->rect() ) ) {
-+ } else if ( c->rect.intersects( item->rect() ) && (
-+ ( d->arrangement == LeftToRight && item->y() >= c->rect.y() ) ||
-+ ( d->arrangement == TopToBottom && item->x() >= c->rect.x() ) ) ) {
- item->d->container1 = c;
- c->items.append( item );
- c = c->n;
-
diff --git a/x11-toolkits/qt33/files/0017-qiconview-ctrl_rubber.patch b/x11-toolkits/qt33/files/0017-qiconview-ctrl_rubber.patch
deleted file mode 100644
index 02611de85f13..000000000000
--- a/x11-toolkits/qt33/files/0017-qiconview-ctrl_rubber.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-qt-bugs@ issue : 23919
-applied: no
-author: Pascal Létourneau <pletourn@globetrotter.net>
-
-This patch modifies the behavior of the rubber selection.
-Now Shift-rubber behaves like the old Ctrl-rubber.
-And now Ctrl-rubber toggles the state of the icons.
-This is more consistant with other iconview (Nautilus, Win Explorer, ...)
-and with Qt itself (Ctrl-click toggle the state of an icon).
-
-Index: src/iconview/qiconview.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/iconview/qiconview.cpp,v
-retrieving revision 1.48
-diff -u -3 -p -r1.48 qiconview.cpp
---- src/iconview/qiconview.cpp 23 Jun 2003 11:48:21 -0000 1.48
-+++ src/iconview/qiconview.cpp 1 Jul 2003 16:36:17 -0000
-@@ -257,7 +257,8 @@ public:
- uint dragging :1;
- uint drawActiveSelection :1;
- uint inMenuMode :1;
--
-+ uint controlPressed :1;
-+
- QIconViewToolTip *toolTip;
- QPixmapCache maskCache;
- QPtrDict<QIconViewItem> selectedItems;
-@@ -2726,6 +2727,7 @@ QIconView::QIconView( QWidget *parent, c
- d->lastItem = 0;
- d->count = 0;
- d->mousePressed = FALSE;
-+ d->controlPressed = FALSE;
- d->selectionMode = Single;
- d->currentItem = 0;
- d->highlightedItem = 0;
-@@ -3288,9 +3290,18 @@ void QIconView::doAutoScroll()
- alreadyIntersected = TRUE;
- QIconViewItem *item = c->items.first();
- for ( ; item; item = c->items.next() ) {
-- if ( d->selectedItems.find( item ) )
-- continue;
-- if ( !item->intersects( nr ) ) {
-+ if ( d->selectedItems.find( item ) ) {
-+ if ( item->intersects( nr ) && item->isSelected() && d->controlPressed ) {
-+ item->setSelected( FALSE );
-+ changed = TRUE;
-+ rr = rr.unite( item->rect() );
-+ } else if ( !item->intersects( nr ) && !item->isSelected() && d->controlPressed ) {
-+ item->setSelected( TRUE, TRUE );
-+ changed = TRUE;
-+ rr = rr.unite( item->rect() );
-+ } else
-+ continue;
-+ } else if ( !item->intersects( nr ) ) {
- if ( item->isSelected() ) {
- item->setSelected( FALSE );
- changed = TRUE;
-@@ -4480,7 +4491,7 @@ void QIconView::contentsMousePressEventE
- }
- }
- } else if ( ( d->selectionMode != Single || e->button() == RightButton )
-- && !( e->state() & ControlButton ) )
-+ && !( e->state() & ControlButton ) && !( e->state() & ShiftButton ) )
- selectAll( FALSE );
-
- setCurrentItem( item );
-@@ -4491,12 +4502,11 @@ void QIconView::contentsMousePressEventE
- d->tmpCurrentItem = d->currentItem;
- d->currentItem = 0;
- repaintItem( d->tmpCurrentItem );
-- if ( d->rubber )
-- delete d->rubber;
-- d->rubber = 0;
-+ delete d->rubber;
- d->rubber = new QRect( e->x(), e->y(), 0, 0 );
- d->selectedItems.clear();
-- if ( ( e->state() & ControlButton ) == ControlButton ) {
-+ if ( ( e->state() & ControlButton ) == ControlButton ||
-+ ( e->state() & ShiftButton ) == ShiftButton ) {
- for ( QIconViewItem *i = firstItem(); i; i = i->nextItem() )
- if ( i->isSelected() )
- d->selectedItems.insert( i, i );
-@@ -4504,6 +4514,7 @@ void QIconView::contentsMousePressEventE
- }
-
- d->mousePressed = TRUE;
-+ d->controlPressed = ( ( e->state() & ControlButton ) == ControlButton );
- }
-
- emit_signals:
diff --git a/x11-toolkits/qt33/files/0020-designer-deletetabs.patch b/x11-toolkits/qt33/files/0020-designer-deletetabs.patch
deleted file mode 100644
index 23b1e1d300a2..000000000000
--- a/x11-toolkits/qt33/files/0020-designer-deletetabs.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-qt-bugs@ issue : N26525
-applied: no
-author: Thomas Zander <zander@kde.org>
-
-it is possible to remove all tabs from a QTabWidget in the 'object explorer'.
-
-After inserting a new tabWidget I normally get 2 tabs. Using
-the popup menu on the widget itself a delete is not present when there
-is just one tab left. In other words; I can't delete all tabs.
-
-The popup menu presented on the 'object explorer' toolbar does not do any
-checking on the amount of tabs present; it is possible to delete all tabs
-from there.
-
-To reproduce;
- - Open new document.
- - Insert QTabWidget.
- - Press with RMB on the just inserted tabWidget and press 'delete page'
- - Open the same popup again; notice the missing 'delete page' entry.
-
- - go to the 'object explorer' toolbar and make sure it is on the
- 'objects' tab.
- - Press with the RMB on the QTabWidget name.
- - Press 'delete page' and the last page is deleted.
-
-Solution; on every show of the popup check if delete is possible and enable
-correctly.
-
-Index: tools/designer/designer/hierarchyview.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/tools/tools/designer/designer/hierarchyview.cpp,v
-retrieving revision 1.20
-diff -u -3 -p -b -r1.20 hierarchyview.cpp
---- tools/designer/designer/hierarchyview.cpp 23 Jun 2003 11:49:05 -0000 1.20
-+++ tools/designer/designer/hierarchyview.cpp 12 Jul 2003 17:09:29 -0000
-@@ -599,6 +599,7 @@ void HierarchyList::showRMBMenu( QListVi
- formWindow->mainWindow()->setupTabWidgetHierarchyMenu(
- this, SLOT( addTabPage() ),
- SLOT( removeTabPage() ) );
-+ tabWidgetMenu->setItemEnabled(MainWindow::POPUP_REMOVE_PAGE_ID, ((QDesignerTabWidget*)w )->count() > 1);
- tabWidgetMenu->popup( p );
- }
- }
-Index: tools/designer/designer/mainwindow.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/tools/tools/designer/designer/mainwindow.cpp,v
-retrieving revision 1.33
-diff -u -3 -p -b -r1.33 mainwindow.cpp
---- tools/designer/designer/mainwindow.cpp 23 Jun 2003 11:49:06 -0000 1.33
-+++ tools/designer/designer/mainwindow.cpp 12 Jul 2003 17:09:31 -0000
-@@ -2419,8 +2419,8 @@ QPopupMenu *MainWindow::setupTabWidgetHi
- {
- QPopupMenu *menu = new QPopupMenu( parent );
-
-- menu->insertItem( tr( "Add Page" ), parent, addSlot );
-- menu->insertItem( tr( "Delete Page" ), parent, removeSlot );
-+ menu->insertItem( tr( "Add Page" ), parent, addSlot, 0, POPUP_REMOVE_PAGE_ID+1 );
-+ menu->insertItem( tr( "Delete Page" ), parent, removeSlot, 0, POPUP_REMOVE_PAGE_ID );
- menu->insertSeparator();
- actionEditCut->addTo( menu );
- actionEditCopy->addTo( menu );
-Index: tools/designer/designer/mainwindow.h
-===================================================================
-RCS file: /home/kde/qt-copy/tools/tools/designer/designer/mainwindow.h,v
-retrieving revision 1.15
-diff -u -3 -p -b -r1.15 mainwindow.h
---- tools/designer/designer/mainwindow.h 16 May 2003 13:03:27 -0000 1.15
-+++ tools/designer/designer/mainwindow.h 12 Jul 2003 17:09:31 -0000
-@@ -107,6 +107,7 @@ public:
-
- QPopupMenu *setupNormalHierarchyMenu( QWidget *parent );
- QPopupMenu *setupTabWidgetHierarchyMenu( QWidget *parent, const char *addSlot, const char *removeSlot );
-+ static const int POPUP_REMOVE_PAGE_ID = 1;
-
- FormWindow *openFormWindow( const QString &fn, bool validFileName = TRUE, FormFile *ff = 0 );
- bool isCustomWidgetUsed( MetaDataBase::CustomWidget *w );
diff --git a/x11-toolkits/qt33/files/0032-fix_rotated_randr.diff b/x11-toolkits/qt33/files/0032-fix_rotated_randr.diff
deleted file mode 100644
index 276e5994cc0b..000000000000
--- a/x11-toolkits/qt33/files/0032-fix_rotated_randr.diff
+++ /dev/null
@@ -1,94 +0,0 @@
-qt-bugs@ issue : N34454
-bugs.kde.org number : 67101
-applied: no
-author: Hamish Rodda <rodda@kde.org>
-
-Qt doesn't take screen rotation into account when determining desktop width
-and height
-
-Qt doesn't detect a change in desktop size when the rotation of the screen
-changes to be at right angles (90 and 270 degrees) to the normal rotation (0
-degrees). The xlib functions DisplayWidth / DisplayHeight and WidthOfScreen /
-HeightOfScreen do not take into account the rotation of the screen.
-
-This causes KDE not to reconfigure itself when the rotation of the screen is
-changed.
-
-This patch switches width and height of the desktop when the screen is rotated
-to 90 or 270 degrees. I've only done this for the non-xinerama case, and only
-for QDesktopWidget. I imagine that xinerama needs to have this change made
-too.
-
-Index: src/kernel/qapplication_x11.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/kernel/qapplication_x11.cpp,v
-retrieving revision 1.95
-diff -u -p -r1.95 qapplication_x11.cpp
---- src/kernel/qapplication_x11.cpp 20 Oct 2003 13:53:50 -0000 1.95
-+++ src/kernel/qapplication_x11.cpp 8 Nov 2003 03:05:57 -0000
-@@ -3493,10 +3493,23 @@ int QApplication::x11ProcessEvent( XEven
-
- // update the size for desktop widget
- int scr = XRRRootToScreen( appDpy, event->xany.window );
-+
-+ // Determine if we're at right-angles & thus DisplayWidth/DisplayHeight should be switched
-+ XRRScreenConfiguration* xrrconfig;
-+ xrrconfig = XRRGetScreenInfo( appDpy, event->xany.window );
-+ Rotation rotation;
-+ XRRConfigCurrentConfiguration( xrrconfig, &rotation );
-+ XRRFreeScreenConfigInfo( xrrconfig );
-+
- QWidget *w = desktop()->screen( scr );
- QSize oldSize( w->size() );
-- w->crect.setWidth( DisplayWidth( appDpy, scr ) );
-- w->crect.setHeight( DisplayHeight( appDpy, scr ) );
-+ if (rotation & (RR_Rotate_90 | RR_Rotate_270)) {
-+ w->crect.setWidth( DisplayHeight( appDpy, scr ) );
-+ w->crect.setHeight( DisplayWidth( appDpy, scr ) );
-+ } else {
-+ w->crect.setWidth( DisplayWidth( appDpy, scr ) );
-+ w->crect.setHeight( DisplayHeight( appDpy, scr ) );
-+ }
- if ( w->size() != oldSize ) {
- QResizeEvent e( w->size(), oldSize );
- QApplication::sendEvent( w, &e );
-Index: src/kernel/qdesktopwidget_x11.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/kernel/qdesktopwidget_x11.cpp,v
-retrieving revision 1.19
-diff -u -p -r1.19 qdesktopwidget_x11.cpp
---- src/kernel/qdesktopwidget_x11.cpp 16 May 2003 13:02:39 -0000 1.19
-+++ src/kernel/qdesktopwidget_x11.cpp 8 Nov 2003 03:05:58 -0000
-@@ -44,6 +44,9 @@ extern int qt_x11_create_desktop_on_scre
- // defined in qapplication_x11.cpp
- extern Atom qt_net_workarea;
- extern bool qt_net_supports(Atom atom);
-+#ifndef QT_NO_XRANDR
-+extern bool qt_use_xrandr;
-+#endif
-
- // function to update the workarea of the screen
- static bool qt_desktopwidget_workarea_dirty = TRUE;
-@@ -154,6 +157,22 @@ void QDesktopWidgetPrivate::init()
- y = 0;
- w = WidthOfScreen(ScreenOfDisplay(QPaintDevice::x11AppDisplay(), i));
- h = HeightOfScreen(ScreenOfDisplay(QPaintDevice::x11AppDisplay(), i));
-+
-+#ifndef QT_NO_XRANDR
-+ if (qt_use_xrandr) {
-+ XRRScreenConfiguration* xrrconfig;
-+ xrrconfig = XRRGetScreenInfo(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppRootWindow( i ));
-+ Rotation rotation;
-+ XRRConfigCurrentConfiguration(xrrconfig, &rotation);
-+ XRRFreeScreenConfigInfo(xrrconfig);
-+
-+ if (rotation & (RR_Rotate_90 | RR_Rotate_270)) {
-+ int tmp = h;
-+ h = w;
-+ w = tmp;
-+ }
-+ }
-+#endif
- }
-
- rects[i].setRect(x, y, w, h);
diff --git a/x11-toolkits/qt33/files/0035-qvaluelist-streaming-operator.patch b/x11-toolkits/qt33/files/0035-qvaluelist-streaming-operator.patch
deleted file mode 100644
index f4c225a85c58..000000000000
--- a/x11-toolkits/qt33/files/0035-qvaluelist-streaming-operator.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-qt-bugs@ issue: 40192
-applied: no
-author: Frerich Raabe <raabe@kde.org>
-
-This patch should fix QValueList's streaming operator>> for cases where
-the stream operates on a byte array smaller than a Q_UINT32 (for instance,
-QByteArray objects which are 0-3 bytes in size). It used to read one bogus
-item because the loop would get executed once even if reading the 'c'
-variable failed.
-
---- src/tools/qvaluelist.h.orig 2004-01-27 21:10:52.000000000 +0000
-+++ src/tools/qvaluelist.h 2004-01-27 21:11:35.000000000 +0000
-@@ -636,13 +636,11 @@
- l.clear();
- Q_UINT32 c;
- s >> c;
-- for( Q_UINT32 i = 0; i < c; ++i )
-+ for( Q_UINT32 i = 0; i < c && !s.atEnd(); ++i )
- {
- T t;
- s >> t;
- l.append( t );
-- if ( s.atEnd() )
-- break;
- }
- return s;
- }
diff --git a/x11-toolkits/qt33/files/0038-dragobject-dont-prefer-unknown.patch b/x11-toolkits/qt33/files/0038-dragobject-dont-prefer-unknown.patch
deleted file mode 100644
index ae4163ae2d29..000000000000
--- a/x11-toolkits/qt33/files/0038-dragobject-dont-prefer-unknown.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-qt-bugs@ issue : 38642
-bugs.kde.org number : 71084
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-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.sav 2004-01-06 19:24:35.000000000 +0100
-+++ src/kernel/qdragobject.cpp 2004-01-06 19:47:01.000000000 +0100
-@@ -844,6 +844,16 @@ bool QTextDrag::decode( const QMimeSourc
- {
- if(!e)
- return FALSE;
-+
-+ // when subtype is not specified, try text/plain first, otherwise this may read
-+ // things like text/x-moz-url even though better targets are available
-+ if( subtype.isNull()) {
-+ QCString subtmp = "plain";
-+ if( decode( e, str, subtmp )) {
-+ subtype = subtmp;
-+ return true;
-+ }
-+ }
-
- if ( e->cacheType == QMimeSource::Text ) {
- str = *e->cache.txt.str;
diff --git a/x11-toolkits/qt33/files/0044-qscrollview-windowactivate-fix.diff b/x11-toolkits/qt33/files/0044-qscrollview-windowactivate-fix.diff
deleted file mode 100644
index 9a6df32a7c4f..000000000000
--- a/x11-toolkits/qt33/files/0044-qscrollview-windowactivate-fix.diff
+++ /dev/null
@@ -1,38 +0,0 @@
-qt-bugs@ issue : N45716
-applied: no
-author: Enrico Ros <eros.kde@email.it>
-
-QScrollView unwanted repaint fix.
-
-This fixes the 'flashing' konqueror window on activation / deactivation by
-saving 1 unwanted repaint (when konqueror window has background).
-I tracked down to the problem to the internal QViewportWidget of the
-QScrollView class.
-
-When a window is activated the activation event is recursively propagated
-to all childs triggering the windowActivationChange() functions in the
-widget it passes by.
-What happens when the event gets to the Viewport?
-At this point the event has already been handled by windowActivationChange()
-of the parent widget (a QIconView for example) and has then been propagated
-to the Viewport that will handle it with the default
-QWidget::windowActivationChange implementation, maybe raising an unwanted
-update(); so here we stop the event.
-As an addition: if the parent reimplements the windowActivationChange()
-function, mainly to block the update, it won't be happy if the child will
-trigger the update. If the parent do not reimplement the function il will
-inherits the default implementation and there is no need for the viewport's
-one.
-
---- src/widgets/qscrollview.cpp.orig 2004-03-29 10:17:04.000000000 +0000
-+++ src/widgets/qscrollview.cpp 2004-03-30 16:40:07.599978320 +0000
-@@ -1551,6 +1551,9 @@
- case QEvent::LayoutHint:
- d->autoResizeHint(this);
- break;
-+ case QEvent::WindowActivate:
-+ case QEvent::WindowDeactivate:
-+ return TRUE;
- default:
- break;
- }
diff --git a/x11-toolkits/qt33/files/0046-qiconview-no-useless-scrollbar.diff b/x11-toolkits/qt33/files/0046-qiconview-no-useless-scrollbar.diff
deleted file mode 100644
index 64daf3874210..000000000000
--- a/x11-toolkits/qt33/files/0046-qiconview-no-useless-scrollbar.diff
+++ /dev/null
@@ -1,150 +0,0 @@
-qt-bugs@ issue: N46490
-bugs.kde.org number: 69589
-applied: no
-author: Benoit Walter <b.walter@free.fr>
-
-Remove unnecessary scrollbar that may appear.
-
-Test case (using konqueror icon view):
-- The first icons are being shown (no scrollbar yet)
-- When there is no space left, a vertical scrollbar is needed
-- The vertical scrollbar may cover the right edge of the icons
-(in the last column) => an horizontal scrollbar is needed :-(
-
-Solution:
-When using ScrollBarMode::Auto, prevent Qt from drawing icons on the
-scrollbar area (before the scrollbar is shown).
-
-Related to KDE bug #69589
-
-Index: qiconview.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/iconview/qiconview.cpp,v
-retrieving revision 1.54
-diff -u -3 -p -r1.54 qiconview.cpp
---- src/iconview/qiconview.cpp 2 Mar 2004 12:50:31 -0000 1.54
-+++ src/iconview/qiconview.cpp 12 Apr 2004 10:07:28 -0000
-@@ -1060,7 +1060,7 @@ void QIconViewItem::setText( const QStri
-
- if ( view ) {
- if ( QRect( view->contentsX(), view->contentsY(),
-- view->visibleWidth(), view->visibleHeight() ).
-+ view->visibleWidthSB(), view->visibleHeightSB() ).
- intersects( oR ) )
- view->repaintContents( oR.x() - 1, oR.y() - 1,
- oR.width() + 2, oR.height() + 2, FALSE );
-@@ -1104,7 +1104,7 @@ void QIconViewItem::setPixmap( const QPi
-
- if ( view ) {
- if ( QRect( view->contentsX(), view->contentsY(),
-- view->visibleWidth(), view->visibleHeight() ).
-+ view->visibleWidthSB(), view->visibleHeightSB() ).
- intersects( oR ) )
- view->repaintContents( oR.x() - 1, oR.y() - 1,
- oR.width() + 2, oR.height() + 2, FALSE );
-@@ -1140,7 +1140,7 @@ void QIconViewItem::setPicture( const QP
-
- if ( view ) {
- if ( QRect( view->contentsX(), view->contentsY(),
-- view->visibleWidth(), view->visibleHeight() ).
-+ view->visibleWidthSB(), view->visibleHeightSB() ).
- intersects( oR ) )
- view->repaintContents( oR.x() - 1, oR.y() - 1,
- oR.width() + 2, oR.height() + 2, FALSE );
-@@ -1200,7 +1200,7 @@ void QIconViewItem::setPixmap( const QPi
-
- if ( view ) {
- if ( QRect( view->contentsX(), view->contentsY(),
-- view->visibleWidth(), view->visibleHeight() ).
-+ view->visibleWidthSB(), view->visibleHeightSB() ).
- intersects( oR ) )
- view->repaintContents( oR.x() - 1, oR.y() - 1,
- oR.width() + 2, oR.height() + 2, FALSE );
-@@ -5448,8 +5448,8 @@ void QIconView::insertInGrid( QIconViewI
- }
- item->dirty = FALSE;
- } else {
-- QRegion r( QRect( 0, 0, QMAX( contentsWidth(), visibleWidth() ),
-- QMAX( contentsHeight(), visibleHeight() ) ) );
-+ QRegion r( QRect( 0, 0, QMAX( contentsWidth(), visibleWidthSB() ),
-+ QMAX( contentsHeight(), visibleHeightSB() ) ) );
-
- QIconViewItem *i = d->firstItem;
- int y = -1;
-@@ -5707,7 +5707,7 @@ QIconViewItem *QIconView::makeRowLayout(
- QIconViewItem *item = begin;
- for (;;) {
- x += d->spacing + item->width();
-- if ( x > visibleWidth() && item != begin ) {
-+ if ( x > visibleWidthSB() && item != begin ) {
- item = item->prev;
- break;
- }
-@@ -5732,7 +5732,7 @@ QIconViewItem *QIconView::makeRowLayout(
- int x;
- if ( item == begin ) {
- if ( reverse )
-- x = visibleWidth() - d->spacing - item->width();
-+ x = visibleWidthSB() - d->spacing - item->width();
- else
- x = d->spacing;
- } else {
-@@ -5768,7 +5768,7 @@ QIconViewItem *QIconView::makeRowLayout(
- i += r;
- x = i * d->rastX + sp * d->spacing;
- }
-- if ( x > visibleWidth() && item != begin ) {
-+ if ( x > visibleWidthSB() && item != begin ) {
- item = item->prev;
- break;
- }
-@@ -5831,7 +5831,7 @@ QIconViewItem *QIconView::makeRowLayout(
- QIconViewItem *item = begin;
- for (;;) {
- y += d->spacing + item->height();
-- if ( y > visibleHeight() && item != begin ) {
-+ if ( y > visibleHeightSB() && item != begin ) {
- item = item->prev;
- break;
- }
-@@ -6378,4 +6378,24 @@ bool QIconView::isRenaming() const
- #endif
- }
-
-+int QIconView::visibleWidthSB() const
-+{
-+ if ( vScrollBarMode() != Auto )
-+ return visibleWidth();
-+
-+ int offset = verticalScrollBar()->isVisible() ? 0
-+ : style().pixelMetric( QStyle::PM_ScrollBarExtent, verticalScrollBar() );
-+ return QMAX( 0, visibleWidth() - offset );
-+}
-+
-+int QIconView::visibleHeightSB() const
-+{
-+ if ( hScrollBarMode() != Auto )
-+ return visibleHeight();
-+
-+ int offset = horizontalScrollBar()->isVisible() ? 0
-+ : style().pixelMetric( QStyle::PM_ScrollBarExtent, horizontalScrollBar() );
-+ return QMAX( 0, visibleHeight() - offset );
-+}
-+
- #endif // QT_NO_ICONVIEW
-Index: qiconview.h
-===================================================================
-RCS file: /home/kde/qt-copy/src/iconview/qiconview.h,v
-retrieving revision 1.35
-diff -u -3 -p -r1.35 qiconview.h
---- src/iconview/qiconview.h 16 May 2003 13:02:38 -0000 1.35
-+++ src/iconview/qiconview.h 12 Apr 2004 10:07:58 -0000
-@@ -496,6 +496,8 @@ private:
- const QPoint &relativeTo,
- const QIconViewItem *item ) const;
- QBitmap mask( QPixmap *pix ) const;
-+ int visibleWidthSB() const;
-+ int visibleHeightSB() const;
-
- QIconViewPrivate *d;
-
diff --git a/x11-toolkits/qt33/files/0047-fix-kmenu-width.diff b/x11-toolkits/qt33/files/0047-fix-kmenu-width.diff
deleted file mode 100644
index fb0bb1678de2..000000000000
--- a/x11-toolkits/qt33/files/0047-fix-kmenu-width.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-qt-bugs@ issue: N46882
-bugs.kde.org number: 77545
-applied: no
-author: Stephan Binner <binner@kde.org>
-
-Fix wrong K menu width for the case of enabled side pixmap and a menu title
-(like "Recently Used Applications") being longer than every other entry.
-
-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
-
- 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() );
- }
-
diff --git a/x11-toolkits/qt33/files/0048-qclipboard_hack_80072.patch b/x11-toolkits/qt33/files/0048-qclipboard_hack_80072.patch
deleted file mode 100644
index 74c60fb25588..000000000000
--- a/x11-toolkits/qt33/files/0048-qclipboard_hack_80072.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-qt-bugs@ issue : none, probably even won't be
-bugs.kde.org number : 80072
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-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;
- static bool pending_clipboard_changed = FALSE;
- static bool pending_selection_changed = FALSE;
-
-+Q_EXPORT bool qt_qclipboard_bailout_hack = false;
-
- // 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 *
- return 0;
- }
-
-+static bool selection_request_pending = false;
-+
-+static Bool check_selection_request_pending( Display*, XEvent* e, XPointer )
-+ {
-+ if( e->type == SelectionRequest && e->xselectionrequest.owner == owner->winId())
-+ selection_request_pending = true;
-+ return False;
-+ }
-+
- 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
- do {
- if ( XCheckTypedWindowEvent(dpy,win,type,event) )
- return TRUE;
-+ if( qt_qclipboard_bailout_hack ) {
-+ XEvent dummy;
-+ selection_request_pending = false;
-+ if ( owner != NULL )
-+ XCheckIfEvent(dpy,&dummy,check_selection_request_pending,NULL);
-+ if( selection_request_pending )
-+ return TRUE;
-+ }
-
- now = QTime::currentTime();
- if ( started > now ) // crossed midnight
diff --git a/x11-toolkits/qt33/files/0049-qiconview-rubber_on_move.diff b/x11-toolkits/qt33/files/0049-qiconview-rubber_on_move.diff
deleted file mode 100644
index 9ada7f9748ad..000000000000
--- a/x11-toolkits/qt33/files/0049-qiconview-rubber_on_move.diff
+++ /dev/null
@@ -1,114 +0,0 @@
-qt-bugs@ issue : none
-applied: no
-author: Enrico Ros <eros.kde@email.it>
-
-Unwanted toggling QIconViewItem focus on click.
-
-This fixes the 'flashing' icon when clicking repeatedly on a QIconView or
-derivates (ie KIconView, KonqIconViewWidget, the KDesktop and so on..).
-The current behavior considers that if not over an icon, the user is
-clicking down to perform icons selection (with the rubberband).
-This is not always true, since a click might be used to give focus to a
-window or unselect some icons.
-
-How this is fixed: when clicking down the mouse a flag is set. If the pointer
-is moved on the iconview with the button held down, then (and only at that
-moment) the rubber is created. Now a selection operation (the one done with
-the rubber) begins when moving the mouse and not only when clicking on the
-empty space.
-
---- src.orig/iconview/qiconview.cpp 2004-05-05 18:55:55.471057880 +0000
-+++ src/iconview/qiconview.cpp 2004-05-30 18:24:16.311014024 +0000
-@@ -236,6 +236,7 @@
- QPoint dragStartPos;
- QFontMetrics *fm;
- int minLeftBearing, minRightBearing;
-+ int rubberStartX, rubberStartY;
-
- uint mousePressed :1;
- uint cleared :1;
-@@ -255,6 +256,7 @@
- uint firstSizeHint : 1;
- uint showTips :1;
- uint pressedSelected :1;
-+ uint canStartRubber :1;
- uint dragging :1;
- uint drawActiveSelection :1;
- uint inMenuMode :1;
-@@ -2733,6 +2735,7 @@
- d->currentItem = 0;
- d->highlightedItem = 0;
- d->rubber = 0;
-+ d->canStartRubber = FALSE;
- d->scrollTimer = 0;
- d->startDragItem = 0;
- d->tmpCurrentItem = 0;
-@@ -4501,29 +4504,20 @@
-
- setCurrentItem( item );
-
-+ d->canStartRubber = FALSE;
- if ( e->button() == LeftButton ) {
-- if ( !item && ( d->selectionMode == Multi ||
-- d->selectionMode == Extended ) ) {
-- d->tmpCurrentItem = d->currentItem;
-- d->currentItem = 0;
-- repaintItem( d->tmpCurrentItem );
-- delete d->rubber;
-- d->rubber = new QRect( e->x(), e->y(), 0, 0 );
-- d->selectedItems.clear();
-- if ( ( e->state() & ControlButton ) == ControlButton ||
-- ( e->state() & ShiftButton ) == ShiftButton ) {
-- for ( QIconViewItem *i = firstItem(); i; i = i->nextItem() )
-- if ( i->isSelected() )
-- d->selectedItems.insert( i, i );
-- }
-+ if ( !item && ( d->selectionMode == Multi || d->selectionMode == Extended ) )
-+ {
-+ d->canStartRubber = TRUE;
-+ d->rubberStartX = e->x();
-+ d->rubberStartY = e->y();
- }
--
- d->mousePressed = TRUE;
- d->controlPressed = ( ( e->state() & ControlButton ) == ControlButton );
- }
-
- emit_signals:
-- if ( !d->rubber ) {
-+ if ( !d->canStartRubber ) {
- emit mouseButtonPressed( e->button(), item, e->globalPos() );
- emit pressed( item );
- emit pressed( item, e->globalPos() );
-@@ -4567,6 +4561,7 @@
- d->mousePressed = FALSE;
- d->startDragItem = 0;
-
-+ d->canStartRubber = FALSE;
- if ( d->rubber ) {
- QPainter p;
- p.begin( viewport() );
-@@ -4656,7 +4651,22 @@
- if ( d->tmpCurrentItem )
- repaintItem( d->tmpCurrentItem );
- }
-- } else if ( d->mousePressed && !d->currentItem && d->rubber ) {
-+ } else if ( d->mousePressed && ((!d->currentItem && d->rubber) || d->canStartRubber) ) {
-+ if ( d->canStartRubber ) {
-+ d->canStartRubber = FALSE;
-+ d->tmpCurrentItem = d->currentItem;
-+ d->currentItem = 0;
-+ repaintItem( d->tmpCurrentItem );
-+ delete d->rubber;
-+ d->rubber = new QRect( d->rubberStartX, d->rubberStartY, 0, 0 );
-+ d->selectedItems.clear();
-+ if ( ( e->state() & ControlButton ) == ControlButton ||
-+ ( e->state() & ShiftButton ) == ShiftButton ) {
-+ for ( QIconViewItem *i = firstItem(); i; i = i->nextItem() )
-+ if ( i->isSelected() )
-+ d->selectedItems.insert( i, i );
-+ }
-+ }
- doAutoScroll();
- }
- }
diff --git a/x11-toolkits/qt33/files/0056-khotkeys_input_84434.patch b/x11-toolkits/qt33/files/0056-khotkeys_input_84434.patch
deleted file mode 100644
index f94bb8162de0..000000000000
--- a/x11-toolkits/qt33/files/0056-khotkeys_input_84434.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-qt-bugs@ issue : 58251
-bugs.kde.org number : 84434
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-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
- qt_auto_repeat_data *d = (qt_auto_repeat_data *) arg;
- if (d->error ||
- event->xkey.window != d->window ||
-- event->xkey.keycode != d->keycode)
-+ event->xkey.keycode != d->keycode) {
-+ d->error = TRUE;
- return FALSE;
-+ }
-
- if (event->type == XKeyPress) {
- d->error = (! d->release || event->xkey.time - d->timestamp > 10);
diff --git a/x11-toolkits/qt33/files/0059-qpopup_has_mouse.patch b/x11-toolkits/qt33/files/0059-qpopup_has_mouse.patch
deleted file mode 100644
index 620f8e7ad0c0..000000000000
--- a/x11-toolkits/qt33/files/0059-qpopup_has_mouse.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-qt-bugs@ issue : 49417
-bugs.kde.org number : 58719
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-Hello,
-
- please consider applying the two attached QPopupMenu patches fixing KDE bugs
- #58719 and #74778 (http://bugs.kde.org/show_bug.cgi?id=58719,
- http://bugs.kde.org/show_bug.cgi?id=74778), which complain about keyboard
- navigation in popup menus being very uncomfortable because of being affected
- by mouse position despite mouse not being used at all.
-
- - hasmouse.patch - (#58719) - use keyboard to open and navigate in any popup
- menu and "accidentally" hit your mouse. Depending on the mouse cursor
- position either no popup entry is selected or the random popup entry
- happening to be at the cursor position becomes highlighted. The patch
- basically copies the 'hasmouse' code from QMenuBar which prevents the mouse
- having any effect on the popup if it's outside the popup geometry.
-
- [ ... #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:
- } scroll;
- QSize calcSize;
- QRegion mouseMoveBuffer;
-+ uint hasmouse : 1;
- };
-
- static QPopupMenu* active_popup_menu = 0;
-@@ -272,6 +273,7 @@ QPopupMenu::QPopupMenu( QWidget *parent,
- d->scroll.scrollableSize = d->scroll.topScrollableIndex = 0;
- d->scroll.scrollable = QPopupMenuPrivate::Scroll::ScrollNone;
- d->scroll.scrolltimer = 0;
-+ d->hasmouse = 0;
- isPopupMenu = TRUE;
- #ifndef QT_NO_ACCEL
- autoaccel = 0;
-@@ -1740,6 +1742,11 @@ void QPopupMenu::mouseMoveEvent( QMouseE
-
- int item = itemAtPos( e->pos() );
- if ( item == -1 ) { // no valid item
-+ if( !d->hasmouse ) {
-+ tryMenuBar( e );
-+ return;
-+ }
-+ d->hasmouse = 0;
- int lastActItem = actItem;
- actItem = -1;
- if ( lastActItem >= 0 )
-@@ -1751,6 +1758,7 @@ void QPopupMenu::mouseMoveEvent( QMouseE
- }
- } else { // mouse on valid item
- // but did not register mouse press
-+ d->hasmouse = 1;
- if ( (e->state() & Qt::MouseButtonMask) && !mouseBtDn )
- mouseBtDn = TRUE; // so mouseReleaseEvent will pop down
-
-@@ -2159,6 +2167,7 @@ void QPopupMenu::timerEvent( QTimerEvent
- */
- void QPopupMenu::leaveEvent( QEvent * )
- {
-+ d->hasmouse = 0;
- if ( testWFlags( WStyle_Tool ) && style().styleHint(QStyle::SH_PopupMenu_MouseTracking, this) ) {
- int lastActItem = actItem;
- actItem = -1;
diff --git a/x11-toolkits/qt33/files/0060-qpopup_ignore_mousepos.patch b/x11-toolkits/qt33/files/0060-qpopup_ignore_mousepos.patch
deleted file mode 100644
index d26279a3f19c..000000000000
--- a/x11-toolkits/qt33/files/0060-qpopup_ignore_mousepos.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-qt-bugs@ issue : 49417
-bugs.kde.org number : 74778
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
- Hello,
-
- please consider applying the two attached QPopupMenu patches fixing KDE bugs
- #58719 and #74778 (http://bugs.kde.org/show_bug.cgi?id=58719,
- http://bugs.kde.org/show_bug.cgi?id=74778), which complain about keyboard
- navigation in popup menus being very uncomfortable because of being affected
- by mouse position despite mouse not being used at all.
-
- [... #58719 ... ]
-
- - ignoremousepos.patch - (#74778) - use keyboard to open some popup which
- doesn't show up at mouse position (e.g. Alt+F3 with KWin or the context menu
- key with some file selected in Konqueror). If the mouse is positioned in the
- area where the popup shows, the random entry happening to be at the cursor
- position becomes highlighted.
- The patch fixes this by ignoring mouse events that happen at mouse position
- which was current when the popup was shown, i.e. all mouse move events that
- actually aren't triggered by mouse move are ignored. I first wanted to ignore
- only the very first mouse move event (which should be caused by EnterNotify
- for the popup) but I realized that Qt's event handling causes the popup to
- possibly get more than just one initial move event, caused by LeaveNotify
- 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:
- QSize calcSize;
- QRegion mouseMoveBuffer;
- uint hasmouse : 1;
-+ QPoint ignoremousepos;
- };
-
- static QPopupMenu* active_popup_menu = 0;
-@@ -1354,6 +1355,7 @@ void QPopupMenu::show()
- popupActive = -1;
- if(style().styleHint(QStyle::SH_PopupMenu_SubMenuPopupDelay, this))
- d->mouseMoveBuffer = QRegion();
-+ d->ignoremousepos = QCursor::pos();
- }
-
- /*!
-@@ -1701,6 +1703,11 @@ void QPopupMenu::mouseReleaseEvent( QMou
-
- void QPopupMenu::mouseMoveEvent( QMouseEvent *e )
- {
-+ if( e->globalPos() == d->ignoremousepos ) {
-+ return;
-+ }
-+ d->ignoremousepos = QPoint();
-+
- motion++;
-
- if ( parentMenu && parentMenu->isPopupMenu ) {
diff --git a/x11-toolkits/qt33/files/0061-qscrollview-propagate-horizontal-wheelevent.patch b/x11-toolkits/qt33/files/0061-qscrollview-propagate-horizontal-wheelevent.patch
deleted file mode 100644
index 73ba70894f58..000000000000
--- a/x11-toolkits/qt33/files/0061-qscrollview-propagate-horizontal-wheelevent.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-qt-bugs@ issue : N64978
-applied: no
-author: Germain Garand <germain@ebooksfrance.org>
-
-In QScrollView, wheel events are forwarded to (viewport|contents)WheelEvent, but
-the horizontal/vertical status of the wheel event is not.
-
-Index: src/widgets/qscrollview.cpp
-===================================================================
-RCS file: /home/kde/qt-copy/src/widgets/qscrollview.cpp,v
-retrieving revision 1.65
-diff -u -3 -p -r1.65 qscrollview.cpp
---- src/widgets/qscrollview.cpp 29 Apr 2004 22:31:28 -0000 1.65
-+++ src/widgets/qscrollview.cpp 25 Jan 2005 12:07:04 -0000
-@@ -1863,7 +1863,7 @@ void QScrollView::viewportWheelEvent( QW
- the event itself.
- */
- QWheelEvent ce( viewportToContents(e->pos()),
-- e->globalPos(), e->delta(), e->state());
-+ e->globalPos(), e->delta(), e->state(), e->orientation());
- contentsWheelEvent(&ce);
- if ( ce.isAccepted() )
- e->accept();
diff --git a/x11-toolkits/qt33/files/0073-xinerama-aware-qpopup.patch b/x11-toolkits/qt33/files/0073-xinerama-aware-qpopup.patch
deleted file mode 100644
index e90e1c86dd8a..000000000000
--- a/x11-toolkits/qt33/files/0073-xinerama-aware-qpopup.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-qt-bugs@ issue : none
-bugs.kde.org number : none
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-Makes QPopupMenu aware of Xinerama (see e.g. https://bugzilla.novell.com/show_bug.cgi?id=216235).
-
-
---- src/widgets/qpopupmenu.cpp
-+++ src/widgets/qpopupmenu.cpp
-@@ -454,6 +454,15 @@ void QPopupMenu::frameChanged()
- menuContentsChanged();
- }
-
-+QRect QPopupMenu::screenRect( const QPoint& pos )
-+{
-+ int screen_num = QApplication::desktop()->screenNumber( pos );
-+#ifdef Q_WS_MAC
-+ return QApplication::desktop()->availableGeometry( screen_num );
-+#else
-+ return QApplication::desktop()->screenGeometry( screen_num );
-+#endif
-+}
- /*!
- Displays the popup menu so that the item number \a indexAtPoint
- will be at the specified \e global position \a pos. To translate a
-@@ -498,6 +507,15 @@ void QPopupMenu::popup( const QPoint &po
- // point.
- #endif
-
-+ QRect screen = screenRect( geometry().center());
-+ QRect screen2 = screenRect( QApplication::reverseLayout()
-+ ? pos+QPoint(width(),0) : pos );
-+ // if the widget is not in the screen given by the position, move it
-+ // there, so that updateSize() uses the right size of the screen
-+ if( screen != screen2 ) {
-+ screen = screen2;
-+ move( screen.x(), screen.y());
-+ }
- if(d->scroll.scrollable) {
- d->scroll.scrollable = QPopupMenuPrivate::Scroll::ScrollNone;
- d->scroll.topScrollableIndex = d->scroll.scrollableSize = 0;
-@@ -517,18 +535,6 @@ void QPopupMenu::popup( const QPoint &po
- updateSize(TRUE);
- }
-
-- int screen_num;
-- if (QApplication::desktop()->isVirtualDesktop())
-- screen_num =
-- QApplication::desktop()->screenNumber( QApplication::reverseLayout() ?
-- pos+QPoint(width(),0) : pos );
-- else
-- screen_num = QApplication::desktop()->screenNumber( this );
--#ifdef Q_WS_MAC
-- QRect screen = QApplication::desktop()->availableGeometry( screen_num );
--#else
-- QRect screen = QApplication::desktop()->screenGeometry( screen_num );
--#endif
- int sw = screen.width(); // screen width
- int sh = screen.height(); // screen height
- int sx = screen.x(); // screen pos
-@@ -1056,7 +1062,7 @@ QSize QPopupMenu::updateSize(bool force_
- mi->iconSet()->pixmap( QIconSet::Small, QIconSet::Normal ).width() + 4 );
- }
-
-- int dh = QApplication::desktop()->height();
-+ int dh = screenRect( geometry().center()).height();
- ncols = 1;
-
- for ( QMenuItemListIt it2( *mitems ); it2.current(); ++it2 ) {
-@@ -2297,9 +2303,9 @@ void QPopupMenu::subMenuTimer() {
- bool right = FALSE;
- if ( ( parentMenu && parentMenu->isPopupMenu &&
- ((QPopupMenu*)parentMenu)->geometry().x() < geometry().x() ) ||
-- p.x() < 0 )
-+ p.x() < screenRect( p ).left())
- right = TRUE;
-- if ( right && (ps.width() > QApplication::desktop()->width() - mapToGlobal( r.topRight() ).x() ) )
-+ if ( right && (ps.width() > screenRect( p ).right() - mapToGlobal( r.topRight() ).x() ) )
- right = FALSE;
- if ( right )
- p.setX( mapToGlobal( r.topRight() ).x() );
-@@ -2310,7 +2316,7 @@ void QPopupMenu::subMenuTimer() {
- bool left = FALSE;
- if ( ( parentMenu && parentMenu->isPopupMenu &&
- ((QPopupMenu*)parentMenu)->geometry().x() > geometry().x() ) ||
-- p.x() + ps.width() > QApplication::desktop()->width() )
-+ p.x() + ps.width() > screenRect( p ).right() )
- left = TRUE;
- if ( left && (ps.width() > mapToGlobal( r.topLeft() ).x() ) )
- left = FALSE;
-@@ -2318,8 +2324,8 @@ void QPopupMenu::subMenuTimer() {
- p.setX( mapToGlobal( r.topLeft() ).x() - ps.width() );
- }
- QRect pr = popup->itemGeometry(popup->count() - 1);
-- if (p.y() + ps.height() > QApplication::desktop()->height() &&
-- p.y() - ps.height() + (QCOORD) pr.height() >= 0)
-+ if (p.y() + ps.height() > screenRect( p ).bottom() &&
-+ p.y() - ps.height() + (QCOORD) pr.height() >= screenRect( p ).top())
- p.setY( p.y() - ps.height() + (QCOORD) pr.height());
-
- if ( style().styleHint(QStyle::SH_PopupMenu_SloppySubMenus, this )) {
-Index: src/widgets/qpopupmenu.h
-===================================================================
---- src/widgets/qpopupmenu.h (revision 636368)
-+++ src/widgets/qpopupmenu.h (working copy)
-@@ -152,6 +152,7 @@ private:
-
- QSize updateSize(bool force_recalc=FALSE, bool do_resize=TRUE);
- void updateRow( int row );
-+ QRect screenRect(const QPoint& pos);
- #ifndef QT_NO_ACCEL
- void updateAccel( QWidget * );
- void enableAccel( bool );
diff --git a/x11-toolkits/qt33/files/0076-fix-qprocess.diff b/x11-toolkits/qt33/files/0076-fix-qprocess.diff
deleted file mode 100644
index 78716ee34bdf..000000000000
--- a/x11-toolkits/qt33/files/0076-fix-qprocess.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-qt-bugs@ issue : none
-bugs.kde.org number : none
-applied: no
-author: from trolltech
-
-Fixes a regression in QProgress::writeToStdin()
-
-
---- src/kernel/qprocess.cpp
-+++ src/kernel/qprocess.cpp
-@@ -727,7 +727,7 @@ void QProcess::closeStdinLaunch()
- void QProcess::writeToStdin( const QString& buf )
- {
- QByteArray tmp = buf.local8Bit();
-- tmp.resize( tmp.size() - 1 ); // drop the implicit \0
-+ tmp.resize( qstrlen( tmp.data() ) );
- writeToStdin( tmp );
- }
-
diff --git a/x11-toolkits/qt33/files/0078-argb-visual-hack.patch b/x11-toolkits/qt33/files/0078-argb-visual-hack.patch
deleted file mode 100644
index f7b2cbc79e9a..000000000000
--- a/x11-toolkits/qt33/files/0078-argb-visual-hack.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-qt-bugs@ issue : none
-bugs.kde.org number : 83974
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-An ugly hack to get real transparency in Konsole working somehow, with Qt not having
-any support for the ARGB visual. QApplication has one ctor that allows passing
-any X connection and X visual, but that has some side effects, so this patch
-adds a magic flag to turn the side effects off.
-
-
---- src/kernel/qapplication.cpp.sav 2007-02-23 14:01:19.000000000 +0100
-+++ src/kernel/qapplication.cpp 2007-05-29 15:42:39.000000000 +0200
-@@ -317,6 +317,7 @@ void qt_init( int *, char **, QApplicati
- 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
- Q_EXPORT bool qt_tryModalHelper( QWidget *widget, QWidget **rettop );
-
-@@ -905,7 +906,7 @@ QApplication::QApplication(Display *dpy,
-
- qt_init( &argc, argv, GuiClient );
- } else {
-- qt_init(dpy, visual, colormap);
-+ qt_init( &argc, argv, dpy, visual, colormap);
- }
-
- process_cmdline( &argc, argv );
---- src/kernel/qapplication_x11.cpp.sav 2007-05-25 18:56:23.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp 2007-05-29 16:24:58.000000000 +0200
-@@ -196,6 +196,7 @@ static bool noxim = FALSE; // connect t
- static Display *appDpy = 0; // X11 application display
- static char *appDpyName = 0; // X11 display name
- static bool appForeignDpy = FALSE; // we didn't create display
-+Q_EXPORT bool qt_no_foreign_hack = false;
- static bool appSync = FALSE; // X11 synchronization
- #if defined(QT_DEBUG)
- static bool appNoGrab = FALSE; // X11 grabbing enabled
-@@ -1541,7 +1542,7 @@ void qt_init_internal( int *argcptr, cha
- setlocale( LC_ALL, "" ); // use correct char set mapping
- setlocale( LC_NUMERIC, "C" ); // make sprintf()/scanf() work
-
-- if ( display ) {
-+ if ( display && !qt_no_foreign_hack ) {
- // Qt part of other application
-
- appForeignDpy = TRUE;
-@@ -1698,7 +1699,9 @@ void qt_init_internal( int *argcptr, cha
- // Connect to X server
-
- if( qt_is_gui_used ) {
-- if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) {
-+ if( display != NULL && qt_no_foreign_hack )
-+ appDpy = display;
-+ else if ( ( appDpy = XOpenDisplay(appDpyName) ) == 0 ) {
- qWarning( "%s: cannot connect to X server %s", appName,
- XDisplayName(appDpyName) );
- qApp = 0;
-@@ -2345,6 +2348,10 @@ void qt_init( Display *display, Qt::HAND
- qt_init_internal( 0, 0, display, visual, colormap );
- }
-
-+void qt_init( int *argcptr, char **argv, Display *display, Qt::HANDLE visual, Qt::HANDLE colormap )
-+{
-+ qt_init_internal( argcptr, argv, display, visual, colormap );
-+}
-
- /*****************************************************************************
- qt_cleanup() - cleans up when the application is finished
diff --git a/x11-toolkits/qt33/files/0079-compositing-types.patch b/x11-toolkits/qt33/files/0079-compositing-types.patch
deleted file mode 100644
index 3c3649c73080..000000000000
--- a/x11-toolkits/qt33/files/0079-compositing-types.patch
+++ /dev/null
@@ -1,424 +0,0 @@
-qt-bugs@ issue : none
-bugs.kde.org number : none
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-This patch adds support for window types used for compositing (popup menu, dropdown menu,
-tooltip, combobox, dnd).
-
---- src/kernel/qdnd_x11.cpp.sav 2007-05-25 18:56:23.000000000 +0200
-+++ src/kernel/qdnd_x11.cpp 2007-05-31 10:30:58.000000000 +0200
-@@ -261,6 +261,7 @@ public:
- QWidget(QApplication::desktop()->screen( screen ),
- 0, WStyle_Customize | WStyle_Tool | WStyle_NoBorder | WX11BypassWM ), oldpmser( 0 ), oldbmser( 0 )
- {
-+ x11SetWindowType( X11WindowTypeDND );
- }
-
- void setPixmap(QPixmap pm, QPoint hot)
-@@ -1221,6 +1222,7 @@ void QDragManager::move( const QPoint &
- // recreate the pixmap on the new screen...
- delete qt_xdnd_deco;
- qt_xdnd_deco = new QShapedPixmapWidget( screen );
-+ qt_xdnd_deco->x11SetWindowTransient( dragSource->topLevelWidget());
- if (!QWidget::mouseGrabber()) {
- updatePixmap();
- qt_xdnd_deco->grabMouse();
-@@ -1774,6 +1776,7 @@ bool QDragManager::drag( QDragObject * o
-
- dragSource = (QWidget *)(object->parent());
-
-+ qt_xdnd_deco->x11SetWindowTransient( dragSource->topLevelWidget());
- qApp->installEventFilter( this );
- qt_xdnd_source_current_time = qt_x_time;
- XSetSelectionOwner( QPaintDevice::x11AppDisplay(), qt_xdnd_selection,
---- src/kernel/qapplication_x11.cpp.sav 2007-05-29 16:24:58.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp 2007-05-31 10:30:58.000000000 +0200
-@@ -268,6 +268,11 @@ Atom qt_net_wm_window_type_menu = 0;
- Atom qt_net_wm_window_type_utility = 0;
- Atom qt_net_wm_window_type_splash = 0;
- Atom qt_net_wm_window_type_override = 0; // KDE extension
-+Atom qt_net_wm_window_type_dropdown_menu = 0;
-+Atom qt_net_wm_window_type_popup_menu = 0;
-+Atom qt_net_wm_window_type_tooltip = 0;
-+Atom qt_net_wm_window_type_combo = 0;
-+Atom qt_net_wm_window_type_dnd = 0;
- Atom qt_net_wm_frame_strut = 0; // KDE extension
- Atom qt_net_wm_state_stays_on_top = 0; // KDE extension
- Atom qt_net_wm_pid = 0;
-@@ -1920,6 +1925,11 @@ void qt_init_internal( int *argcptr, cha
- qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_UTILITY", &qt_net_wm_window_type_utility );
- qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_SPLASH", &qt_net_wm_window_type_splash );
- qt_x11_intern_atom( "_KDE_NET_WM_WINDOW_TYPE_OVERRIDE", &qt_net_wm_window_type_override );
-+ qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_DROPDOWN_MENU", &qt_net_wm_window_type_dropdown_menu );
-+ qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_POPUP_MENU", &qt_net_wm_window_type_popup_menu );
-+ qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_TOOLTIP", &qt_net_wm_window_type_tooltip );
-+ qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_COMBO", &qt_net_wm_window_type_combo );
-+ qt_x11_intern_atom( "_NET_WM_WINDOW_TYPE_DND", &qt_net_wm_window_type_dnd );
- qt_x11_intern_atom( "_KDE_NET_WM_FRAME_STRUT", &qt_net_wm_frame_strut );
- qt_x11_intern_atom( "_NET_WM_STATE_STAYS_ON_TOP",
- &qt_net_wm_state_stays_on_top );
---- src/kernel/qwidget_x11.cpp.sav 2007-05-25 18:56:23.000000000 +0200
-+++ src/kernel/qwidget_x11.cpp 2007-05-31 10:30:58.000000000 +0200
-@@ -125,6 +125,11 @@ extern Atom qt_net_wm_window_type_menu;
- extern Atom qt_net_wm_window_type_utility;
- extern Atom qt_net_wm_window_type_splash;
- extern Atom qt_net_wm_window_type_override;
-+extern Atom qt_net_wm_window_type_dropdown_menu;
-+extern Atom qt_net_wm_window_type_popup_menu;
-+extern Atom qt_net_wm_window_type_combo;
-+extern Atom qt_net_wm_window_type_dnd;
-+extern Atom qt_net_wm_window_type_tooltip;
- extern Atom qt_net_wm_pid;
- extern Atom qt_net_wm_user_time;
- extern Atom qt_enlightenment_desktop;
-@@ -448,10 +453,6 @@ void QWidget::create( WId window, bool i
- x11Colormap() );
- #endif // QT_NO_XFTFREETYPE
-
-- // NET window types
-- long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 };
-- int curr_wintype = 0;
--
- // NET window states
- long net_winstates[6] = { 0, 0, 0, 0, 0, 0 };
- int curr_winstate = 0;
-@@ -473,7 +474,6 @@ void QWidget::create( WId window, bool i
- if ( testWFlags(WStyle_Splash) ) {
- if (qt_net_supports(qt_net_wm_window_type_splash)) {
- clearWFlags( WX11BypassWM );
-- net_wintypes[curr_wintype++] = qt_net_wm_window_type_splash;
- } else {
- setWFlags( WX11BypassWM | WStyle_Tool | WStyle_NoBorder );
- }
-@@ -482,27 +482,22 @@ void QWidget::create( WId window, bool i
- mwmhints.decorations = 0L;
- mwmhints.flags |= (1L << 1); // MWM_HINTS_DECORATIONS
-
-- if ( testWFlags( WStyle_NoBorder ) ) {
-- // override netwm type - quick and easy for KDE noborder
-- net_wintypes[curr_wintype++] = qt_net_wm_window_type_override;
-- } else {
-- if ( testWFlags( WStyle_NormalBorder | WStyle_DialogBorder ) ) {
-- mwmhints.decorations |= (1L << 1); // MWM_DECOR_BORDER
-- mwmhints.decorations |= (1L << 2); // MWM_DECOR_RESIZEH
-- }
-+ if ( testWFlags( WStyle_NormalBorder | WStyle_DialogBorder ) ) {
-+ mwmhints.decorations |= (1L << 1); // MWM_DECOR_BORDER
-+ mwmhints.decorations |= (1L << 2); // MWM_DECOR_RESIZEH
-+ }
-
-- if ( testWFlags( WStyle_Title ) )
-- mwmhints.decorations |= (1L << 3); // MWM_DECOR_TITLE
-+ if ( testWFlags( WStyle_Title ) )
-+ mwmhints.decorations |= (1L << 3); // MWM_DECOR_TITLE
-
-- if ( testWFlags( WStyle_SysMenu ) )
-- mwmhints.decorations |= (1L << 4); // MWM_DECOR_MENU
-+ if ( testWFlags( WStyle_SysMenu ) )
-+ mwmhints.decorations |= (1L << 4); // MWM_DECOR_MENU
-
-- if ( testWFlags( WStyle_Minimize ) )
-- mwmhints.decorations |= (1L << 5); // MWM_DECOR_MINIMIZE
-+ if ( testWFlags( WStyle_Minimize ) )
-+ mwmhints.decorations |= (1L << 5); // MWM_DECOR_MINIMIZE
-
-- if ( testWFlags( WStyle_Maximize ) )
-- mwmhints.decorations |= (1L << 6); // MWM_DECOR_MAXIMIZE
-- }
-+ if ( testWFlags( WStyle_Maximize ) )
-+ mwmhints.decorations |= (1L << 6); // MWM_DECOR_MAXIMIZE
-
- if (testWFlags(WStyle_Tool)) {
- wsa.save_under = True;
-@@ -522,23 +517,6 @@ void QWidget::create( WId window, bool i
- }
- }
-
-- // ### need a better way to do this
-- if (inherits("QPopupMenu")) {
-- // menu netwm type
-- net_wintypes[curr_wintype++] = qt_net_wm_window_type_menu;
-- } else if (inherits("QToolBar")) {
-- // toolbar netwm type
-- net_wintypes[curr_wintype++] = qt_net_wm_window_type_toolbar;
-- } else if (testWFlags(WStyle_Customize) && testWFlags(WStyle_Tool)) {
-- // utility netwm type
-- net_wintypes[curr_wintype++] = qt_net_wm_window_type_utility;
-- }
--
-- if (dialog) // dialog netwm type
-- net_wintypes[curr_wintype++] = qt_net_wm_window_type_dialog;
-- // normal netwm type - default
-- net_wintypes[curr_wintype++] = qt_net_wm_window_type_normal;
--
- // stays on top
- if (testWFlags(WStyle_StaysOnTop)) {
- net_winstates[curr_winstate++] = qt_net_wm_state_above;
-@@ -573,6 +551,7 @@ void QWidget::create( WId window, bool i
- wsa.save_under = True;
- XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder,
- &wsa );
-+ x11SetWindowType();
- } else if ( topLevel && !desktop ) { // top-level widget
- QWidget *p = parentWidget(); // real parent
- if (p)
-@@ -632,12 +611,7 @@ void QWidget::create( WId window, bool i
- else
- XDeleteProperty(dpy, id, qt_xa_motif_wm_hints);
-
-- // set _NET_WM_WINDOW_TYPE
-- if (curr_wintype > 0)
-- XChangeProperty(dpy, id, qt_net_wm_window_type, XA_ATOM, 32, PropModeReplace,
-- (unsigned char *) net_wintypes, curr_wintype);
-- else
-- XDeleteProperty(dpy, id, qt_net_wm_window_type);
-+ x11SetWindowType();
-
- // set _NET_WM_WINDOW_STATE
- if (curr_winstate > 0)
-@@ -896,6 +870,64 @@ void QWidget::reparentSys( QWidget *pare
- setMouseTracking(mouse_tracking);
- }
-
-+// Sets the EWMH (netwm) window type. Needed as a separate function
-+// because create() may be too soon in some cases.
-+void QWidget::x11SetWindowType( X11WindowType type )
-+{
-+ // NET window types
-+ long net_wintypes[7] = { 0, 0, 0, 0, 0, 0, 0 };
-+ int curr_wintype = 0;
-+ if( testWFlags(WType_Desktop))
-+ return;
-+ if( type == X11WindowTypeSelect ) {
-+ if ( testWFlags(WStyle_Splash)) {
-+ if (qt_net_supports(qt_net_wm_window_type_splash)) {
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_splash;
-+ }
-+ } else if (inherits("QToolBar")) {
-+ // toolbar netwm type
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_toolbar;
-+ } else if (testWFlags(WStyle_Customize) && testWFlags(WStyle_Tool)) {
-+ // utility netwm type
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_utility;
-+ } else if (testWFlags(WType_Dialog)) {
-+ // dialog netwm type
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_dialog;
-+ }
-+ } else if( type == X11WindowTypeCombo ) {
-+ // combo netwm type
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_combo;
-+ } else if( type == X11WindowTypeDND ) {
-+ // dnd netwm type
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_dnd;
-+ } else if( type == X11WindowTypeDropdown ) {
-+ // dropdown netwm type
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_dropdown_menu;
-+ } else if( type == X11WindowTypePopup ) {
-+ // popup netwm type
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_popup_menu;
-+ } else if( type == X11WindowTypeMenu ) {
-+ // menu netwm type
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_menu;
-+ } else if( type == X11WindowTypeTooltip ) {
-+ // tooltip netwm type
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_tooltip;
-+ }
-+
-+ // normal netwm type - default
-+ net_wintypes[curr_wintype++] = qt_net_wm_window_type_normal;
-+ // set _NET_WM_WINDOW_TYPE
-+ if (curr_wintype > 0)
-+ XChangeProperty(x11Display(), winId(), qt_net_wm_window_type, XA_ATOM, 32, PropModeReplace,
-+ (unsigned char *) net_wintypes, curr_wintype);
-+ else
-+ XDeleteProperty(x11Display(), winId(), qt_net_wm_window_type);
-+}
-+
-+void QWidget::x11SetWindowTransient( QWidget* parent )
-+{
-+ XSetTransientForHint( x11Display(), winId(), parent->winId());
-+}
-
- /*!
- Translates the widget coordinate \a pos to global screen
---- src/kernel/qwidget.h.sav 2007-05-25 18:56:23.000000000 +0200
-+++ src/kernel/qwidget.h 2007-05-31 10:30:58.000000000 +0200
-@@ -464,7 +464,19 @@ public:
- CGContextRef macCGContext(bool clipped=TRUE) const;
- #endif
- #endif
--
-+#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
- void setWindowOpacity(double level);
- double windowOpacity() const;
-
---- src/dialogs/qdialog.cpp.sav 2007-05-25 18:56:23.000000000 +0200
-+++ src/dialogs/qdialog.cpp 2007-05-31 10:30:58.000000000 +0200
-@@ -668,10 +668,6 @@ bool QDialog::event( QEvent *e )
- Geometry management.
- *****************************************************************************/
-
--#if defined(Q_WS_X11)
--extern "C" { int XSetTransientForHint( Display *, unsigned long, unsigned long ); }
--#endif // Q_WS_X11
--
- /*!
- Shows the dialog as a \link #modeless modeless \endlink dialog.
- Control returns immediately to the calling code.
-@@ -705,7 +701,7 @@ void QDialog::show()
- && qApp->mainWidget() && qApp->mainWidget()->isVisible()
- && !qApp->mainWidget()->isMinimized()) {
- // make sure the transient for hint is set properly for modal dialogs
-- XSetTransientForHint( x11Display(), winId(), qApp->mainWidget()->winId() );
-+ x11SetWindowTransient( qApp->mainWidget());
- }
- #endif // Q_WS_X11
-
---- src/widgets/qtooltip.cpp.sav 2007-05-25 18:56:23.000000000 +0200
-+++ src/widgets/qtooltip.cpp 2007-05-31 10:30:58.000000000 +0200
-@@ -72,6 +72,7 @@ public:
- polish();
- setText(text);
- adjustSize();
-+ x11SetWindowType( X11WindowTypeTooltip );
- }
- void setWidth( int w ) { resize( sizeForWidth( w ) ); }
- };
-@@ -528,6 +529,10 @@ void QTipManager::showTip()
- if (!widget)
- return;
-
-+#ifdef Q_WS_X11
-+ label->x11SetWindowTransient( widget->topLevelWidget());
-+#endif
-+
- #ifdef Q_WS_MAC
- QRect screen = QApplication::desktop()->availableGeometry( scr );
- #else
---- src/widgets/qcombobox.cpp.sav 2007-05-25 18:56:23.000000000 +0200
-+++ src/widgets/qcombobox.cpp 2007-05-31 10:49:13.000000000 +0200
-@@ -389,12 +389,8 @@ public:
- inline QListBox * listBox() { return lBox; }
- inline QComboBoxPopup * popup() { return pop; }
- void updateLinedGeometry();
--
-- void setListBox( QListBox *l ) { lBox = l ; usingLBox = TRUE;
-- l->setMouseTracking( TRUE );}
--
-- void setPopupMenu( QComboBoxPopup * pm, bool isPopup=TRUE )
-- { pop = pm; if(isPopup) usingLBox = FALSE; }
-+ void setListBox( QListBox *l );
-+ void setPopupMenu( QComboBoxPopup * pm, bool isPopup=TRUE );
-
- int current;
- int maxCount;
-@@ -440,6 +436,30 @@ void QComboBoxData::updateLinedGeometry(
- ed->setGeometry( r );
- }
-
-+void QComboBoxData::setListBox( QListBox *l )
-+{
-+ lBox = l;
-+ usingLBox = TRUE;
-+ l->setMouseTracking( TRUE );
-+#ifdef Q_WS_X11
-+ l->x11SetWindowType( QWidget::X11WindowTypeCombo );
-+ l->x11SetWindowTransient( combo->topLevelWidget());
-+#endif
-+}
-+
-+void QComboBoxData::setPopupMenu( QComboBoxPopup * pm, bool isPopup )
-+{
-+ pop = pm;
-+ if(isPopup)
-+ usingLBox = FALSE;
-+#ifdef Q_WS_X11
-+ if( pm ) {
-+ pm->x11SetWindowType( QWidget::X11WindowTypeCombo );
-+ pm->x11SetWindowTransient( combo->topLevelWidget());
-+ }
-+#endif
-+}
-+
- static inline bool checkInsertIndex( const char *method, const char * name,
- int count, int *index)
- {
---- src/widgets/qpopupmenu.cpp.sav 2007-05-25 18:56:23.000000000 +0200
-+++ src/widgets/qpopupmenu.cpp 2007-05-31 11:09:22.000000000 +0200
-@@ -298,6 +298,9 @@ QPopupMenu::QPopupMenu( QWidget *parent,
- connectModalRecursionSafety = 0;
-
- setFocusPolicy( StrongFocus );
-+#ifdef Q_WS_X11
-+ x11SetWindowType( X11WindowTypePopup );
-+#endif
- }
-
- /*!
-@@ -537,6 +540,29 @@ void QPopupMenu::popup( const QPoint &po
- emit aboutToShow();
- updateSize(TRUE);
- }
-+#ifdef Q_WS_X11
-+#ifndef QT_NO_MENUBAR
-+ QMenuData *top = this; // find top level
-+ while ( top->parentMenu )
-+ top = top->parentMenu;
-+ if( top->isMenuBar )
-+ x11SetWindowType( X11WindowTypeDropdown );
-+ if( parentMenu && parentMenu->isMenuBar )
-+ x11SetWindowTransient( static_cast< QMenuBar* >( parentMenu )->topLevelWidget());
-+#endif
-+ if( parentMenu && !parentMenu->isMenuBar )
-+ x11SetWindowTransient( static_cast< QPopupMenu* >( parentMenu ));
-+ if( !parentMenu ) {
-+ // hackish ... try to find the main window related to this popup
-+ QWidget* parent = parentWidget() ? parentWidget()->topLevelWidget() : NULL;
-+ if( parent == NULL )
-+ parent = QApplication::widgetAt( pos );
-+ if( parent == NULL )
-+ parent = qApp->activeWindow();
-+ if( parent != NULL )
-+ x11SetWindowTransient( parent );
-+ }
-+#endif
-
- int sw = screen.width(); // screen width
- int sh = screen.height(); // screen height
-@@ -1390,6 +1416,13 @@ void QPopupMenu::hide()
- #if defined(QT_ACCESSIBILITY_SUPPORT)
- QAccessible::updateAccessibility( this, 0, QAccessible::PopupMenuEnd );
- #endif
-+#ifndef QT_NO_MENUBAR
-+ QMenuData *top = this; // find top level
-+ while ( top->parentMenu )
-+ top = top->parentMenu;
-+ if( top->isMenuBar )
-+ x11SetWindowType( X11WindowTypePopup ); // reset
-+#endif
- parentMenu = 0;
- hidePopups();
- QWidget::hide();
-@@ -2713,6 +2746,9 @@ void QPopupMenu::toggleTearOff()
- geometry().topLeft(), FALSE );
- p->mitems->setAutoDelete( FALSE );
- p->tornOff = TRUE;
-+#ifdef Q_WS_X11
-+ p->x11SetWindowType( X11WindowTypeMenu );
-+#endif
- for ( QMenuItemListIt it( *mitems ); it.current(); ++it ) {
- if ( it.current()->id() != QMenuData::d->aInt && !it.current()->widget() )
- p->mitems->append( it.current() );
diff --git a/x11-toolkits/qt33/files/0080-net-wm-sync-request.patch b/x11-toolkits/qt33/files/0080-net-wm-sync-request.patch
deleted file mode 100644
index f08de4eccef9..000000000000
--- a/x11-toolkits/qt33/files/0080-net-wm-sync-request.patch
+++ /dev/null
@@ -1,307 +0,0 @@
-qt-bugs@ issue : none
-bugs.kde.org number : none
-applied: no
-author: Lubos Lunak <l.lunak@kde.org>
-
-Support for _NET_WM_SYNC_REQUEST - allows the WM to find out when the app
-finished one redraw - less flicker during resize and with compositing
-also when opening a window.
-
---- src/kernel/qwidget.h.sav 2007-06-22 14:14:05.000000000 +0200
-+++ src/kernel/qwidget.h 2007-06-23 11:53:39.000000000 +0200
-@@ -586,6 +586,14 @@ private:
- void destroyInputContext();
- void focusInputContext();
- void checkChildrenDnd();
-+
-+#ifndef QT_NO_XSYNC
-+ void createSyncCounter();
-+ void destroySyncCounter();
-+ void incrementSyncCounter();
-+ void handleSyncRequest( void* ev );
-+#endif
-+
- #elif defined(Q_WS_MAC)
- uint own_id : 1, macDropEnabled : 1;
- EventHandlerRef window_event;
-@@ -962,6 +970,10 @@ struct Q_EXPORT QTLWExtra {
- uint uspos : 1; // User defined position
- uint ussize : 1; // User defined size
- void *xic; // XIM Input Context
-+#ifndef QT_NO_XSYNC
-+ ulong syncCounter;
-+ uint syncRequestValue[2];
-+#endif
- #endif
- #if defined(Q_WS_MAC)
- WindowGroupRef group;
---- src/kernel/qt_x11_p.h.sav 2007-02-23 14:01:18.000000000 +0100
-+++ src/kernel/qt_x11_p.h 2007-06-23 11:53:39.000000000 +0200
-@@ -174,6 +174,11 @@ extern "C" {
- #endif // QT_NO_XRENDER
-
-
-+#ifndef QT_NO_XSYNC
-+# include <X11/extensions/sync.h>
-+#endif // QT_NO_XSYNC
-+
-+
- #ifndef QT_NO_XKB
- # include <X11/XKBlib.h>
- #endif // QT_NO_XKB
---- src/kernel/qwidget_x11.cpp.sav 2007-04-16 13:47:26.000000000 +0200
-+++ src/kernel/qwidget_x11.cpp 2007-06-23 19:48:44.000000000 +0200
-@@ -87,6 +87,12 @@ static QWidget *keyboardGrb = 0;
- extern Time qt_x_time;
- extern Time qt_x_user_time;
-
-+#ifndef QT_NO_XSYNC
-+extern Atom qt_net_wm_sync_request_counter;
-+extern Atom qt_net_wm_sync_request;
-+extern bool qt_use_xsync;
-+#endif
-+
- // defined in qfont_x11.cpp
- extern bool qt_has_xft;
-
-@@ -595,11 +601,14 @@ void QWidget::create( WId window, bool i
-
- XResizeWindow( dpy, id, crect.width(), crect.height() );
- XStoreName( dpy, id, qAppName() );
-- Atom protocols[4];
-+ Atom protocols[5];
- int n = 0;
- protocols[n++] = qt_wm_delete_window; // support del window protocol
- protocols[n++] = qt_wm_take_focus; // support take focus window protocol
- protocols[n++] = qt_net_wm_ping; // support _NET_WM_PING protocol
-+#ifndef QT_NO_XSYNC
-+ protocols[n++] = qt_net_wm_sync_request;// support the _NET_WM_SYNC_REQUEST protocol
-+#endif
- if ( testWFlags( WStyle_ContextHelp ) )
- protocols[n++] = qt_net_wm_context_help;
- XSetWMProtocols( dpy, id, protocols, n );
-@@ -625,6 +634,14 @@ void QWidget::create( WId window, bool i
- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace,
- (unsigned char *) &curr_pid, 1);
-
-+#ifndef QT_NO_XSYNC
-+ // set _NET_WM_SYNC_COUNTER
-+ createSyncCounter();
-+ long counterVal = topData()->syncCounter;
-+ XChangeProperty( dpy, id, qt_net_wm_sync_request_counter, XA_CARDINAL, 32, PropModeReplace,
-+ (unsigned char*) &counterVal, 1);
-+#endif
-+
- // when we create a toplevel widget, the frame strut should be dirty
- fstrut_dirty = 1;
-
-@@ -720,6 +737,9 @@ void QWidget::destroy( bool destroyWindo
- if ( destroyWindow )
- qt_XDestroyWindow( this, x11Display(), winid );
- }
-+#ifndef QT_NO_XSYNC
-+ destroySyncCounter();
-+#endif
- setWinId( 0 );
-
- extern void qPRCleanup( QWidget *widget ); // from qapplication_x11.cpp
-@@ -769,6 +789,10 @@ void QWidget::reparentSys( QWidget *pare
- destroyInputContext();
- }
-
-+#ifndef QT_NO_XSYNC
-+ destroySyncCounter();
-+#endif
-+
- if ( isTopLevel() || !parent ) // we are toplevel, or reparenting to toplevel
- topData()->parentWinId = 0;
-
-@@ -2456,6 +2480,11 @@ void QWidget::createTLSysExtra()
- {
- // created lazily
- extra->topextra->xic = 0;
-+#ifndef QT_NO_XSYNC
-+ extra->topextra->syncCounter = 0;
-+ extra->topextra->syncRequestValue[0] = 0;
-+ extra->topextra->syncRequestValue[1] = 0;
-+#endif
- }
-
- void QWidget::deleteTLSysExtra()
-@@ -2501,6 +2530,51 @@ void QWidget::checkChildrenDnd()
- }
- }
-
-+
-+#ifndef QT_NO_XSYNC
-+// create a window's XSyncCounter
-+void QWidget::createSyncCounter()
-+{
-+ if( !qt_use_xsync || !isTopLevel() || topData()->syncCounter )
-+ return;
-+ XSyncValue zero;
-+ XSyncIntToValue( &zero, 0 );
-+ topData()->syncCounter = XSyncCreateCounter( x11Display(), zero );
-+}
-+
-+// destroy a window's XSyncCounter
-+void QWidget::destroySyncCounter()
-+{
-+ if( !qt_use_xsync || !extra || !extra->topextra
-+ || !extra->topextra->syncCounter )
-+ return;
-+ XSyncDestroyCounter( x11Display(), extra->topextra->syncCounter );
-+ extra->topextra->syncCounter = 0;
-+}
-+
-+// increment a window's XSyncCounter
-+void QWidget::incrementSyncCounter()
-+{
-+ if( qt_use_xsync && topData()->syncCounter &&
-+ !(topData()->syncRequestValue[0] == 0 &&
-+ topData()->syncRequestValue[1] == 0) ) {
-+ XSyncValue val;
-+ XSyncIntsToValue( &val, topData()->syncRequestValue[ 0 ], topData()->syncRequestValue[ 1 ] );
-+ XSyncSetCounter( x11Display(), topData()->syncCounter, val );
-+ topData()->syncRequestValue[0] = topData()->syncRequestValue[1] = 0;
-+ }
-+}
-+
-+// handle _NET_WM_SYNC_REQUEST
-+void QWidget::handleSyncRequest( void* ev )
-+{
-+ XEvent* xev = (XEvent*)ev;
-+ topData()->syncRequestValue[ 0 ] = xev->xclient.data.l[ 2 ];
-+ topData()->syncRequestValue[ 1 ] = xev->xclient.data.l[ 3 ];
-+}
-+#endif // QT_NO_XSYNC
-+
-+
- /*!
- \property QWidget::acceptDrops
- \brief whether drop events are enabled for this widget
---- src/kernel/qapplication_x11.cpp.sav 2007-04-16 13:47:26.000000000 +0200
-+++ src/kernel/qapplication_x11.cpp 2007-06-23 19:49:15.000000000 +0200
-@@ -285,6 +285,11 @@ Atom *qt_net_supported_list = 0;
- Window *qt_net_virtual_root_list = 0;
-
-
-+// X11 SYNC support
-+#ifndef QT_NO_XSYNC
-+Atom qt_net_wm_sync_request_counter = 0;
-+Atom qt_net_wm_sync_request = 0;
-+#endif
-
- // client leader window
- Window qt_x11_wm_client_leader = 0;
-@@ -309,6 +314,13 @@ static int xrandr_eventbase;
- // Display
- Q_EXPORT bool qt_use_xrender = FALSE;
-
-+#ifndef QT_NO_XSYNC
-+// True if SYNC extension exists on the connected display
-+bool qt_use_xsync = FALSE;
-+static int xsync_eventbase;
-+static int xsync_errorbase;
-+#endif
-+
- // modifier masks for alt/meta - detected when the application starts
- static long qt_alt_mask = 0;
- static long qt_meta_mask = 0;
-@@ -1938,6 +1950,11 @@ void qt_init_internal( int *argcptr, cha
- qt_x11_intern_atom( "UTF8_STRING", &qt_utf8_string );
- qt_x11_intern_atom( "_SGI_DESKS_MANAGER", &qt_sgi_desks_manager );
-
-+#ifndef QT_NO_XSYNC
-+ qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST_COUNTER", &qt_net_wm_sync_request_counter );
-+ qt_x11_intern_atom( "_NET_WM_SYNC_REQUEST", &qt_net_wm_sync_request );
-+#endif
-+
- qt_xdnd_setup();
- qt_x11_motifdnd_init();
-
-@@ -1974,6 +1991,15 @@ void qt_init_internal( int *argcptr, cha
- }
- #endif // QT_NO_XRENDER
-
-+#ifndef QT_NO_XSYNC
-+ // Try to initialize SYNC extension on the connected display
-+ int xsync_major, xsync_minor;
-+ if ( XSyncQueryExtension( appDpy, &xsync_eventbase, &xsync_errorbase ) &&
-+ XSyncInitialize( appDpy, &xsync_major, &xsync_minor ) ) {
-+ qt_use_xsync = TRUE;
-+ }
-+#endif
-+
- #ifndef QT_NO_XKB
- // If XKB is detected, set the GrabsUseXKBState option so input method
- // compositions continue to work (ie. deadkeys)
-@@ -3141,6 +3167,10 @@ int QApplication::x11ClientMessage(QWidg
- XSendEvent( event->xclient.display, event->xclient.window,
- False, SubstructureNotifyMask|SubstructureRedirectMask, event );
- }
-+#ifndef QT_NO_XSYNC
-+ } else if (a == qt_net_wm_sync_request ) {
-+ widget->handleSyncRequest( event );
-+#endif
- }
- } else if ( event->xclient.message_type == qt_qt_scrolldone ) {
- widget->translateScrollDoneEvent(event);
-@@ -5681,6 +5711,21 @@ bool QETWidget::translateScrollDoneEvent
- return FALSE;
- }
-
-+#if defined(Q_C_CALLBACKS)
-+extern "C" {
-+#endif
-+#ifndef QT_NO_XSYNC
-+static Bool qt_net_wm_sync_request_scanner(Display*, XEvent* event, XPointer arg)
-+{
-+ return (event->type == ClientMessage && event->xclient.window == *(Window*)arg
-+ && event->xclient.message_type == qt_wm_protocols
-+ && event->xclient.data.l[ 0 ] == qt_net_wm_sync_request );
-+}
-+#endif
-+
-+#if defined(Q_C_CALLBACKS)
-+}
-+#endif
-
- //
- // ConfigureNotify (window move and resize) event translation
-@@ -5712,6 +5757,7 @@ bool QETWidget::translateConfigEvent( co
- if (! extra || extra->compress_events) {
- // ConfigureNotify compression for faster opaque resizing
- XEvent otherEvent;
-+ int compressed_configs = 0;
- while ( XCheckTypedWindowEvent( x11Display(), winId(), ConfigureNotify,
- &otherEvent ) ) {
- if ( qt_x11EventFilter( &otherEvent ) )
-@@ -5732,7 +5778,18 @@ bool QETWidget::translateConfigEvent( co
- newCPos.ry() = otherEvent.xconfigure.y +
- otherEvent.xconfigure.border_width;
- }
-+ ++compressed_configs;
-+ }
-+#ifndef QT_NO_XSYNC
-+ // _NET_WM_SYNC_REQUEST compression
-+ Window wid = winId();
-+ while ( compressed_configs &&
-+ XCheckIfEvent( x11Display(), &otherEvent,
-+ qt_net_wm_sync_request_scanner, (XPointer)&wid ) ) {
-+ handleSyncRequest( (void*)&otherEvent );
-+ --compressed_configs;
- }
-+#endif
- }
-
- QRect cr ( geometry() );
-@@ -5786,6 +5843,8 @@ bool QETWidget::translateConfigEvent( co
- repaint( !testWFlags(WResizeNoErase) || transbg );
- }
-
-+ incrementSyncCounter();
-+
- return TRUE;
- }
-
diff --git a/x11-toolkits/qt33/files/0081-format-string-fixes.diff b/x11-toolkits/qt33/files/0081-format-string-fixes.diff
deleted file mode 100644
index d647874f6c4d..000000000000
--- a/x11-toolkits/qt33/files/0081-format-string-fixes.diff
+++ /dev/null
@@ -1,197 +0,0 @@
-qt-bugs@ issue : none
-bugs.kde.org number : none
-applied: no
-author: Dirk Mueller/TT
-
-Fixes various, partially exploitable format string errors on Qt 3.x code base.
-
-
---- src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007
-+++ src/widgets/qtextedit.cpp Mon Jul 16 10:44:40 CEST 2007
-
-@@ -6349,7 +6349,7 @@
- cur = tag->prev;
- if ( !cur ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QTextEdit::optimParseTags: no left-tag for '<" + tag->tag + ">' in line %d.", tag->line + 1 );
-+ qWarning( "QTextEdit::optimParseTags: no left-tag for '<%s>' in line %d.", tag->tag.ascii(), tag->line + 1 );
- #endif
- return; // something is wrong - give up
- }
-@@ -6372,7 +6372,7 @@
- break;
- } else if ( !cur->leftTag ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<" + cur->tag + ">' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->line + 1 );
-+ qWarning( "QTextEdit::optimParseTags: mismatching %s-tag for '<%s>' in line %d.", cur->tag[0] == '/' ? "left" : "right", cur->tag.ascii(), cur->line + 1 );
- #endif
- return; // something is amiss - give up
- }
---- src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ src/sql/qdatatable.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -1043,8 +1043,8 @@
- return FALSE;
- if ( !sqlCursor()->canInsert() ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::insertCurrent: insert not allowed for " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::insertCurrent: insert not allowed for %s",
-+ sqlCursor()->name().latin1() );
- #endif
- endInsert();
- return FALSE;
-@@ -1117,16 +1117,16 @@
- return FALSE;
- if ( sqlCursor()->primaryIndex().count() == 0 ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::updateCurrent: no primary index for " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::updateCurrent: no primary index for %s",
-+ sqlCursor()->name().latin1() );
- #endif
- endUpdate();
- return FALSE;
- }
- if ( !sqlCursor()->canUpdate() ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::updateCurrent: updates not allowed for " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::updateCurrent: updates not allowed for %s",
-+ sqlCursor()->name().latin1() );
- #endif
- endUpdate();
- return FALSE;
-@@ -1191,8 +1191,8 @@
- return FALSE;
- if ( sqlCursor()->primaryIndex().count() == 0 ) {
- #ifdef QT_CHECK_RANGE
-- qWarning("QDataTable::deleteCurrent: no primary index " +
-- sqlCursor()->name() );
-+ qWarning("QDataTable::deleteCurrent: no primary index %s",
-+ sqlCursor()->name().latin1() );
- #endif
- return FALSE;
- }
-
---- src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ src/sql/qsqldatabase.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -234,7 +234,8 @@
- db->open();
- #ifdef QT_CHECK_RANGE
- if ( !db->isOpen() )
-- qWarning("QSqlDatabaseManager::database: unable to open database: " + db->lastError().databaseText() + ": " + db->lastError().driverText() );
-+ qWarning("QSqlDatabaseManager::database: unable to open database: %s: %s",
-+ db->lastError().databaseText().latin1(), db->lastError().driverText().latin1() );
- #endif
- }
- return db;
-@@ -686,7 +687,7 @@
- if ( !d->driver ) {
- #ifdef QT_CHECK_RANGE
- qWarning( "QSqlDatabase: %s driver not loaded", type.latin1() );
-- qWarning( "QSqlDatabase: available drivers: " + drivers().join(" ") );
-+ qWarning( "QSqlDatabase: available drivers: %s", drivers().join(" ").latin1() );
- #endif
- d->driver = new QNullDriver();
- d->driver->setLastError( QSqlError( "Driver not loaded", "Driver not loaded" ) );
-
---- src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ src/sql/qsqlindex.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -273,7 +273,7 @@
- if ( field )
- newSort.append( *field, desc );
- else
-- qWarning( "QSqlIndex::fromStringList: unknown field: '" + f + "'" );
-+ qWarning( "QSqlIndex::fromStringList: unknown field: '%s'", f.latin1());
- }
- return newSort;
- }
-
---- src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ src/sql/qsqlrecord.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -298,7 +298,7 @@
- return i;
- }
- #ifdef QT_CHECK_RANGE
-- qWarning( "QSqlRecord::position: unable to find field " + name );
-+ qWarning( "QSqlRecord::position: unable to find field %s", name.latin1() );
- #endif
- return -1;
- }
-@@ -313,7 +313,7 @@
- checkDetach();
- if ( !sh->d->contains( i ) ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
-+ qWarning( "QSqlRecord::field: index out of range: %d", i );
- #endif
- return 0;
- }
-@@ -344,7 +344,7 @@
- {
- if ( !sh->d->contains( i ) ) {
- #ifdef QT_CHECK_RANGE
-- qWarning( "QSqlRecord::field: index out of range: " + QString::number( i ) );
-+ qWarning( "QSqlRecord::field: index out of range: %d", i );
- #endif // QT_CHECK_RANGE
- return 0;
- }
-
---- src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ src/tools/qglobal.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -680,7 +680,7 @@
- if ( code != -1 )
- qWarning( "%s\n\tError code %d - %s", msg, code, strerror( code ) );
- else
-- qWarning( msg );
-+ qWarning( "%s", msg );
- #endif
- #else
- Q_UNUSED( msg );
-
---- src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007
-+++ src/xml/qsvgdevice.cpp Mon Jul 16 10:45:03 CEST 2007
-
-@@ -978,7 +978,7 @@
- // ### catch references to embedded .svg files
- QPixmap pix;
- if ( !pix.load( href ) ) {
-- qWarning( "QSvgDevice::play: Couldn't load image "+href );
-+ qWarning( "QSvgDevice::play: Couldn't load image %s", href.latin1() );
- break;
- }
- pt->drawPixmap( QRect( x1, y1, w, h ), pix );
-@@ -1024,8 +1024,8 @@
- break;
- }
- case InvalidElement:
-- qWarning( "QSvgDevice::play: unknown element type " +
-- node.nodeName() );
-+ qWarning( "QSvgDevice::play: unknown element type %s",
-+ node.nodeName().latin1() );
- break;
- };
-
-@@ -1111,7 +1111,7 @@
- {
- QRegExp reg( QString::fromLatin1("([+-]?\\d*\\.*\\d*[Ee]?[+-]?\\d*)(em|ex|px|%|pt|pc|cm|mm|in|)$") );
- if ( reg.search( str ) == -1 ) {
-- qWarning( "QSvgDevice::parseLen: couldn't parse " + str );
-+ qWarning( "QSvgDevice::parseLen: couldn't parse %s ", str.latin1() );
- if ( ok )
- *ok = FALSE;
- return 0.0;
-@@ -1140,7 +1140,7 @@
- else if ( u == "pc" )
- dbl *= m.logicalDpiX() / 6.0;
- else
-- qWarning( "QSvgDevice::parseLen: Unknown unit " + u );
-+ qWarning( "QSvgDevice::parseLen: Unknown unit %s", u.latin1() );
- }
- if ( ok )
- *ok = TRUE;
diff --git a/x11-toolkits/qt33/files/patch-configure b/x11-toolkits/qt33/files/patch-configure
deleted file mode 100644
index 8c5938d8db68..000000000000
--- a/x11-toolkits/qt33/files/patch-configure
+++ /dev/null
@@ -1,60 +0,0 @@
---- configure Mon Aug 18 09:23:53 2003
-+++ configure Wed Sep 3 13:12:20 2003
-@@ -1130,10 +1130,4 @@
- done
-
-- # symlink the mkspecs directory
-- mkdir -p $outpath/mkspecs
-- rm -f $outpath/mkspecs/*
-- ln -s $relpath/mkspecs/* $outpath/mkspecs
-- rm -f $outpath/mkspecs/default
--
- # symlink the linguist/doc directory (to make the assistant happy)
- mkdir -p $outpath/tools/linguist
-@@ -1196,5 +1190,5 @@
- # find a make command
- MAKE=
--for mk in gmake make; do
-+for mk in make; do
- if $WHICH $mk >/dev/null 2>&1; then
- MAKE=`$WHICH $mk`
-@@ -1422,12 +1416,4 @@
- fi
-
--if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QNX" = "yes" ]; then
-- CFG_SM=no
-- MODULES=`echo $MODULES | sed -e 's/opengl//'`
-- PLATFORMS=`find $relpath/mkspecs/qws | sed "s,$relpath/mkspecs/qws/,,"`
--else
-- PLATFORMS=`find $relpath/mkspecs/ -type f | grep -v qws | sed "s,$relpath/mkspecs/qws/,,"`
--fi
--
- ##if [ "$OPT_CONCURRENT" = "0" ] && echo $MAKEFLAGS | grep '.* *-j[0-9]* *.*' >/dev/null 2>&1; then
- # OPT_CONCURRENT=`echo $MAKEFLAGS | sed "s,.* *-j\([0-9]*\) *.*,\1,"`
-@@ -2334,6 +2320,5 @@
- fi
-
--# build qmake
--if true; then ###[ '!' -f "$outpath/bin/qmake" ];
-+if false; then
- echo "Creating qmake. Please wait..."
- rm -f mkspecs/default
-@@ -2713,6 +2698,5 @@
-
- if [ '!' -z "$I_FLAGS" ]; then
-- QMAKE_VARS="$QMAKE_VARS \"QMAKE_CFLAGS+=$I_FLAGS\""
-- QMAKE_VARS="$QMAKE_VARS \"QMAKE_CXXFLAGS+=$I_FLAGS\""
-+ QMAKE_VARS="$QMAKE_VARS \"INCPATH+=`echo $I_FLAGS | sed s,-I,,g`\""
- fi
-
---- configure.orig Tue May 25 17:07:32 2004
-+++ configure Tue May 25 17:12:24 2004
-@@ -2305,7 +2305,7 @@
- else
- echo "Do you accept the terms of $affix license? \c"
- fi
-- read acceptance
-+ acceptance=yes
- echo
- if [ "$acceptance" = "yes" ]; then
- break
diff --git a/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp b/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp
deleted file mode 100644
index 11917c55197b..000000000000
--- a/x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
---- src/kernel/qpngio.cpp.orig 2007-02-02 15:01:15.000000000 +0100
-+++ src/kernel/qpngio.cpp 2012-04-27 10:52:06.000000000 +0200
-@@ -43,6 +43,7 @@
- #include "qiodevice.h"
-
- #include <png.h>
-+#include <pngpriv.h>
-
-
- #ifdef Q_OS_TEMP
-@@ -159,7 +160,7 @@
- image.setColor( i, qRgba(c,c,c,0xff) );
- }
- if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
-- const int g = info_ptr->trans_values.gray;
-+ const int g = info_ptr->trans_color.gray;
- if (g < ncols) {
- image.setAlphaBuffer(TRUE);
- image.setColor(g, image.color(g) & RGB_MASK);
-@@ -187,7 +188,7 @@
- info_ptr->palette[i].red,
- info_ptr->palette[i].green,
- info_ptr->palette[i].blue,
-- info_ptr->trans[i]
-+ info_ptr->trans_alpha[i]
- )
- );
- i++;
-@@ -284,7 +285,7 @@
- return;
- }
-
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_read_struct(&png_ptr, &info_ptr, &end_info);
- iio->setStatus(-4);
- return;
-@@ -469,7 +470,7 @@
- return FALSE;
- }
-
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_write_struct(&png_ptr, &info_ptr);
- return FALSE;
- }
-@@ -1030,7 +1031,7 @@
- return -1;
- }
-
-- if (setjmp((png_ptr)->jmpbuf)) {
-+ if (setjmp(png_jmpbuf((png_ptr)))) {
- png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- image = 0;
- return -1;
-@@ -1057,7 +1058,7 @@
-
- if ( !png_ptr ) return 0;
-
-- if (setjmp(png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(png_ptr))) {
- png_destroy_read_struct(&png_ptr, &info_ptr, 0);
- image = 0;
- state = MovieStart;
diff --git a/x11-toolkits/qt33/files/patch-src-styles-qstylefactory.cpp b/x11-toolkits/qt33/files/patch-src-styles-qstylefactory.cpp
deleted file mode 100644
index 9adb9bc5c589..000000000000
--- a/x11-toolkits/qt33/files/patch-src-styles-qstylefactory.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/styles/qstylefactory.cpp.orig Sun Sep 21 19:27:51 2003
-+++ src/styles/qstylefactory.cpp Sun Sep 21 19:28:07 2003
-@@ -48,9 +48,6 @@
- #include "qplatinumstyle.h"
- #include "qsgistyle.h"
- #include "qcompactstyle.h"
--#ifndef QT_NO_STYLE_WINDOWSXP
--#include "qwindowsxpstyle.h"
--#endif
- #ifndef QT_NO_STYLE_AQUA
- #include "qaquastyle.h"
- #endif
diff --git a/x11-toolkits/qt33/files/patch-src__tools__qtvaluelist.h b/x11-toolkits/qt33/files/patch-src__tools__qtvaluelist.h
deleted file mode 100644
index bcb338f428c3..000000000000
--- a/x11-toolkits/qt33/files/patch-src__tools__qtvaluelist.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/tools/qvaluelist.h.orig 2007-02-02 09:01:04.000000000 -0500
-+++ src/tools/qvaluelist.h 2011-08-12 02:41:45.000000000 -0400
-@@ -45,6 +45,7 @@
- #endif // QT_H
-
- #ifndef QT_NO_STL
-+#include <cstddef>
- #include <iterator>
- #include <list>
- #endif
diff --git a/x11-toolkits/qt33/files/patch-src_tools-qsettings.cpp b/x11-toolkits/qt33/files/patch-src_tools-qsettings.cpp
deleted file mode 100644
index c5e0852485bb..000000000000
--- a/x11-toolkits/qt33/files/patch-src_tools-qsettings.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/tools/qsettings.cpp.orig 2007-02-02 09:01:03.000000000 -0500
-+++ src/tools/qsettings.cpp 2011-08-12 03:41:18.000000000 -0400
-@@ -34,6 +34,9 @@
- ** not clear to you.
- **
- **********************************************************************/
-+#ifndef Q_WS_WIN
-+#include <stdlib.h>
-+#endif
-
- #include "qplatformdefs.h"
-
-@@ -500,7 +503,12 @@
- } );
- #endif // Q_OS_TEMP
- #else
-+ if (getenv( "TMPDIR" ) != 0) {
-+ defPath = QString( getenv( "TMPDIR" ) );
-+ }
-+ else {
- defPath = qInstallPathSysconf();
-+ }
- #endif
- QDir dir(appSettings);
- if (! dir.exists()) {
diff --git a/x11-toolkits/qt33/files/patch-src_tools_qlocale.cpp b/x11-toolkits/qt33/files/patch-src_tools_qlocale.cpp
deleted file mode 100644
index 1dac9dc1c3d5..000000000000
--- a/x11-toolkits/qt33/files/patch-src_tools_qlocale.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/tools/qlocale.cpp.orig2 Sat May 15 14:59:00 2004
-+++ src/tools/qlocale.cpp Sat May 15 15:10:21 2004
-@@ -83,6 +83,11 @@
- static const bool ByteOrder = ((*((unsigned char *) &one) == 0) ? BigEndian : LittleEndian);
- #endif
-
-+#if !defined(INFINITY) && defined(Q_OS_FREEBSD)
-+# define HUGE_VALF (float)HUGE_VAL
-+# define INFINITY HUGE_VALF
-+#endif
-+
- #if !defined(INFINITY)
- static const unsigned char be_inf_bytes[] = { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 };
- static const unsigned char le_inf_bytes[] = { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f };
diff --git a/x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp b/x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp
deleted file mode 100644
index 18993718fbbc..000000000000
--- a/x11-toolkits/qt33/files/patch-tools-qvfb-qanimationwriter.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- tools/qvfb/qanimationwriter.cpp.orig 2007-01-11 14:39:56.000000000 +0100
-+++ tools/qvfb/qanimationwriter.cpp 2012-04-27 11:57:18.000000000 +0200
-@@ -24,6 +24,7 @@
- #include <qfile.h>
-
- #include <png.h>
-+#include <pngpriv.h>
- #include <netinet/in.h> // for htonl
-
- class QAnimationWriterData {
diff --git a/x11-toolkits/qt33/files/patch-tools_designer_uic_form.cpp b/x11-toolkits/qt33/files/patch-tools_designer_uic_form.cpp
deleted file mode 100644
index a9985d5ab9ff..000000000000
--- a/x11-toolkits/qt33/files/patch-tools_designer_uic_form.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- tools/designer/uic/form.cpp
-+++ tools/designer/uic/form.cpp
-@@ -731,6 +731,13 @@
- while ( !n2.isNull() ) {
- if ( n2.tagName() == "includehint" ) {
- QString file = n2.firstChild().toText().data();
-+ int colons = file.find("::");
-+
-+ if (colons != -1)
-+ {
-+ file = file.right(file.length() - colons - 2);
-+ }
-+
- localIncludes += file;
- }
- n2 = n2.nextSibling().toElement();
diff --git a/x11-toolkits/qt33/files/patch-tools_makeqpf_main.cpp b/x11-toolkits/qt33/files/patch-tools_makeqpf_main.cpp
deleted file mode 100644
index 7a2df67c8551..000000000000
--- a/x11-toolkits/qt33/files/patch-tools_makeqpf_main.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- tools/makeqpf/main.cpp.orig Wed Jun 23 14:13:52 2004
-+++ tools/makeqpf/main.cpp Wed Aug 11 21:32:48 2004
-@@ -124,8 +124,6 @@
- }
- };
-
--extern QString qws_topdir();
--
- class MakeQPF : public QMainWindow
- {
- Q_OBJECT
-@@ -139,7 +137,7 @@
- view->addColumn("Weight");
- view->addColumn("Style");
- setCentralWidget(view);
-- QString fontdir = qws_topdir() + "/lib/fonts";
-+ QString fontdir = QString(getenv("QTDIR")) + "/lib/fonts";
- readFontDir(fontdir);
-
- connect(view,SIGNAL(selectionChanged(QListViewItem*)),
diff --git a/x11-toolkits/qt33/files/patch-tools_qvfb-qvfbview.cpp b/x11-toolkits/qt33/files/patch-tools_qvfb-qvfbview.cpp
deleted file mode 100644
index 954d37595efb..000000000000
--- a/x11-toolkits/qt33/files/patch-tools_qvfb-qvfbview.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/qvfb/qvfbview.cpp.orig Wed Mar 21 08:48:22 2007
-+++ tools/qvfb/qvfbview.cpp Wed Mar 21 08:48:33 2007
-@@ -115,7 +115,7 @@
- data = (unsigned char *)shmat( shmId, 0, 0 );
- }
-
-- if ( (int)data == -1 )
-+ if ( (long)data == -1 )
- qFatal( "Cannot attach to shared memory" );
-
- hdr = (QVFbHeader *)data;
diff --git a/x11-toolkits/qt33/files/patch-utf8-bug-qt3 b/x11-toolkits/qt33/files/patch-utf8-bug-qt3
deleted file mode 100644
index 3657e8e92236..000000000000
--- a/x11-toolkits/qt33/files/patch-utf8-bug-qt3
+++ /dev/null
@@ -1,105 +0,0 @@
---- src/codecs/qutfcodec.cpp
-+++ src/codecs/qutfcodec.cpp
-@@ -154,6 +154,7 @@
-
- class QUtf8Decoder : public QTextDecoder {
- uint uc;
-+ uint min_uc;
- int need;
- bool headerDone;
- public:
-@@ -164,11 +165,12 @@
- QString toUnicode(const char* chars, int len)
- {
- QString result;
-- result.setLength( len ); // worst case
-+ result.setLength( len + 1 ); // worst case
- QChar *qch = (QChar *)result.unicode();
- uchar ch;
-+ int error = -1;
- for (int i=0; i<len; i++) {
-- ch = *chars++;
-+ ch = chars[i];
- if (need) {
- if ( (ch&0xc0) == 0x80 ) {
- uc = (uc << 6) | (ch & 0x3f);
-@@ -182,6 +184,8 @@
- *qch++ = QChar(high);
- *qch++ = QChar(low);
- headerDone = TRUE;
-+ } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+ *qch++ = QChar::replacement;
- } else {
- if (headerDone || QChar(uc) != QChar::byteOrderMark)
- *qch++ = uc;
-@@ -190,6 +194,7 @@
- }
- } else {
- // error
-+ i = error;
- *qch++ = QChar::replacement;
- need = 0;
- }
-@@ -200,12 +205,21 @@
- } else if ((ch & 0xe0) == 0xc0) {
- uc = ch & 0x1f;
- need = 1;
-+ error = i;
-+ min_uc = 0x80;
- } else if ((ch & 0xf0) == 0xe0) {
- uc = ch & 0x0f;
- need = 2;
-+ error = i;
-+ min_uc = 0x800;
- } else if ((ch&0xf8) == 0xf0) {
- uc = ch & 0x07;
- need = 3;
-+ error = i;
-+ min_uc = 0x10000;
-+ } else {
-+ // error
-+ *qch++ = QChar::replacement;
- }
- }
- }
---- src/tools/qstring.cpp
-+++ src/tools/qstring.cpp
-@@ -5805,6 +5805,7 @@
- result.setLength( len ); // worst case
- QChar *qch = (QChar *)result.unicode();
- uint uc = 0;
-+ uint min_uc = 0;
- int need = 0;
- int error = -1;
- uchar ch;
-@@ -5822,6 +5823,12 @@
- unsigned short low = uc%0x400 + 0xdc00;
- *qch++ = QChar(high);
- *qch++ = QChar(low);
-+ } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-+ // overlong seqence, UTF16 surrogate or BOM
-+ i = error;
-+ qch = addOne(qch, result);
-+ *qch++ = QChar(0xdbff);
-+ *qch++ = QChar(0xde00+((uchar)utf8[i]));
- } else {
- *qch++ = uc;
- }
-@@ -5844,14 +5851,17 @@
- uc = ch & 0x1f;
- need = 1;
- error = i;
-+ min_uc = 0x80;
- } else if ((ch & 0xf0) == 0xe0) {
- uc = ch & 0x0f;
- need = 2;
- error = i;
-+ min_uc = 0x800;
- } else if ((ch&0xf8) == 0xf0) {
- uc = ch & 0x07;
- need = 3;
- error = i;
-+ min_uc = 0x10000;
- } else {
- // Error
- qch = addOne(qch, result);
diff --git a/x11-toolkits/qt33/files/patch-visibility b/x11-toolkits/qt33/files/patch-visibility
deleted file mode 100644
index df4828e4c6e7..000000000000
--- a/x11-toolkits/qt33/files/patch-visibility
+++ /dev/null
@@ -1,65 +0,0 @@
-Index: src/kernel/qgplugin.h
-===================================================================
---- src/kernel/qgplugin.h (revision 423270)
-+++ src/kernel/qgplugin.h (working copy)
-@@ -90,35 +90,19 @@
- return i->iface(); \
- }
-
--# ifdef Q_WS_WIN
--# ifdef Q_CC_BOR
--# define Q_EXPORT_PLUGIN(PLUGIN) \
-- Q_PLUGIN_VERIFICATION_DATA \
-- Q_EXTERN_C __declspec(dllexport) \
-- const char * __stdcall qt_ucm_query_verification_data() \
-- { return qt_ucm_verification_data; } \
-- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* \
-- __stdcall ucm_instantiate() \
-- Q_PLUGIN_INSTANTIATE( PLUGIN )
--# else
--# define Q_EXPORT_PLUGIN(PLUGIN) \
-- Q_PLUGIN_VERIFICATION_DATA \
-- Q_EXTERN_C __declspec(dllexport) \
-- const char *qt_ucm_query_verification_data() \
-- { return qt_ucm_verification_data; } \
-- Q_EXTERN_C __declspec(dllexport) QUnknownInterface* ucm_instantiate() \
-- Q_PLUGIN_INSTANTIATE( PLUGIN )
--# endif
--# else
--# define Q_EXPORT_PLUGIN(PLUGIN) \
-+#if defined(Q_WS_WIN) && defined(Q_CC_BOR)
-+# define Q_STDCALL __stdcall
-+#else
-+# define Q_STDCALL
-+#endif
-+
-+#define Q_EXPORT_PLUGIN(PLUGIN) \
- Q_PLUGIN_VERIFICATION_DATA \
-- Q_EXTERN_C \
-- const char *qt_ucm_query_verification_data() \
-+ Q_EXTERN_C Q_EXPORT \
-+ const char * Q_STDCALL qt_ucm_query_verification_data() \
- { return qt_ucm_verification_data; } \
-- Q_EXTERN_C QUnknownInterface* ucm_instantiate() \
-+ Q_EXTERN_C Q_EXPORT QUnknownInterface* Q_STDCALL ucm_instantiate() \
- Q_PLUGIN_INSTANTIATE( PLUGIN )
--# endif
--
- #endif
-
- struct QUnknownInterface;
-Index: src/tools/qglobal.h
-===================================================================
---- src/tools/qglobal.h (revision 423270)
-+++ src/tools/qglobal.h (working copy)
-@@ -865,6 +865,10 @@
- # define Q_TEMPLATE_EXTERN
- # undef Q_DISABLE_COPY /* avoid unresolved externals */
- # endif
-+#elif defined(Q_CC_GNU) && __GNUC__ - 0 >= 4
-+# define Q_EXPORT __attribute__((visibility("default")))
-+# undef QT_MAKEDLL /* ignore these for other platforms */
-+# undef QT_DLL
- #else
- # undef QT_MAKEDLL /* ignore these for other platforms */
- # undef QT_DLL
diff --git a/x11-toolkits/qt33/files/xxxx-qt-font-default-subst.patch b/x11-toolkits/qt33/files/xxxx-qt-font-default-subst.patch
deleted file mode 100644
index 3e286f74ee24..000000000000
--- a/x11-toolkits/qt33/files/xxxx-qt-font-default-subst.patch
+++ /dev/null
@@ -1,77 +0,0 @@
---- src/kernel/qfontdatabase_x11.cpp
-+++ src/kernel/qfontdatabase_x11.cpp
-@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
- if (script == QFont::Latin)
- // add Euro character
- FcCharSetAddChar(cs, 0x20ac);
-- if (script == QFont::Han_SimplifiedChinese)
-- FcCharSetAddChar(cs, 0x3400);
-- if (script == QFont::Han_TraditionalChinese){
-- FcCharSetAddChar(cs, 0x3435);
-- FcCharSetAddChar(cs, 0xE000);
-- FcCharSetAddChar(cs, 0xF6B1);
-- }
-- if (script == QFont::MiscellaneousSymbols)
-- FcCharSetAddChar(cs, 0x2714);
- FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- FcCharSetDestroy(cs);
- }
-@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
- FcPatternPrint(pattern);
- #endif
-
-+ // XftFontMatch calls the right ConfigSubstitute variants, but as we use
-+ // FcFontMatch/Sort here we have to do it manually.
- FcConfigSubstitute(0, pattern, FcMatchPattern);
-+ XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
-+
- // qDebug("1: pattern contains:");
- // FcPatternPrint(pattern);
-
-@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
- value.u.s = (const FcChar8 *)cs.data();
- FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
- }
--#ifdef FONT_MATCH_DEBUG
-- printf("final pattern contains:\n");
-- FcPatternPrint(pattern);
--#endif
- }
-
- if (script != QFont::Unicode) {
-@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
- if (script == QFont::Latin)
- // add Euro character
- FcCharSetAddChar(cs, 0x20ac);
-- if (script == QFont::Han_SimplifiedChinese)
-- FcCharSetAddChar(cs, 0x3400);
-- if (script == QFont::Han_TraditionalChinese) {
-- FcCharSetAddChar(cs, 0x3435);
-- FcCharSetAddChar(cs, 0xE000);
-- FcCharSetAddChar(cs, 0xF6B1);
-- }
-- if (script == QFont::MiscellaneousSymbols)
-- FcCharSetAddChar(cs, 0x2714);
- FcPatternAddCharSet(pattern, FC_CHARSET, cs);
- FcCharSetDestroy(cs);
- }
-
-+#ifdef FONT_MATCH_DEBUG
-+ printf("final pattern contains:\n");
-+ FcPatternPrint(pattern);
-+#endif
-+
- QFontEngine *fe = 0;
-
- for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
---- src/kernel/qfontdatabase.cpp
-+++ src/kernel/qfontdatabase.cpp
-@@ -554,7 +554,7 @@ static const unsigned short sample_chars
- // GeometricSymbols,
- { 0x2500, 0x0 },
- // MiscellaneousSymbols,
-- { 0x2640, 0x0 },
-+ { 0x2640, 0x2714, 0x0 },
- // EnclosedAndSquare,
- { 0x2460, 0x0 },
- // Braille,
diff --git a/x11-toolkits/qt33/pkg-descr b/x11-toolkits/qt33/pkg-descr
deleted file mode 100644
index ef07d3c8675f..000000000000
--- a/x11-toolkits/qt33/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Qt is a C++ toolkit for application development. It lets application
-developers target all major operating systems with a single application
-source code.
-
-Qt provides a platform-independent API to all central platform functionality:
-GUI, database access, networking, file handling, etc. The Qt library
-encapsulates the different APIs of different operating systems, providing
-the application programmer with a single, common API for all operating systems.
-The native C APIs are encapsulated in a set of well-designed, fully
-object-oriented C++ classes.
diff --git a/x11-toolkits/qt33/pkg-message b/x11-toolkits/qt33/pkg-message
deleted file mode 100644
index 7a49e3e09d98..000000000000
--- a/x11-toolkits/qt33/pkg-message
+++ /dev/null
@@ -1,12 +0,0 @@
-*******************************************************************************
-
- To enable QT's database support, install the database plugin ports.
- The following plugin ports are available:
-
- IBase/Firebird - databases/qt-ibase-plugin
- MySQL - databases/qt-mysql-plugin
- ODBC - databases/qt-odbc-plugin
- PostgreSQL - databases/qt-pgsql-plugin
- SQLite - databases/qt-sqlite-plugin
-
-*******************************************************************************
diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist
deleted file mode 100644
index 66a963ae7777..000000000000
--- a/x11-toolkits/qt33/pkg-plist
+++ /dev/null
@@ -1,2390 +0,0 @@
-bin/assistant
-bin/designer
-bin/findtr
-bin/linguist
-bin/lrelease
-bin/lupdate
-bin/makeqpf
-bin/mergetr
-bin/moc
-bin/msg2qm
-bin/qembed
-bin/qm2ts
-bin/qtconfig
-bin/qvfb
-bin/uic
-include/private/qapplication_p.h
-include/private/qcolor_p.h
-include/private/qcom_p.h
-include/private/qcomlibrary_p.h
-include/private/qcomponentfactory_p.h
-include/private/qcriticalsection_p.h
-include/private/qdialogbuttons_p.h
-include/private/qdir_p.h
-include/private/qeffects_p.h
-include/private/qeventloop_p.h
-include/private/qfiledefs_p.h
-include/private/qfontcodecs_p.h
-include/private/qfontdata_p.h
-include/private/qfontengine_p.h
-include/private/qgfxdriverinterface_p.h
-include/private/qgl_x11_p.h
-include/private/qgpluginmanager_p.h
-include/private/qimageformatinterface_p.h
-include/private/qinputcontext_p.h
-include/private/qinternal_p.h
-include/private/qisciicodec_p.h
-include/private/qkbddriverinterface_p.h
-include/private/qlayoutengine_p.h
-include/private/qlibrary_p.h
-include/private/qlocale_p.h
-include/private/qlock_p.h
-include/private/qmousedriverinterface_p.h
-include/private/qmutex_p.h
-include/private/qmutexpool_p.h
-include/private/qpainter_p.h
-include/private/qpluginmanager_p.h
-include/private/qprinter_p.h
-include/private/qpsprinter_p.h
-include/private/qrichtext_p.h
-include/private/qscriptengine_p.h
-include/private/qsettings_p.h
-include/private/qsharedmemory_p.h
-include/private/qsqldriverinterface_p.h
-include/private/qsqlextension_p.h
-include/private/qsqlmanager_p.h
-include/private/qstyleinterface_p.h
-include/private/qsvgdevice_p.h
-include/private/qsyntaxhighlighter_p.h
-include/private/qt_x11_p.h
-include/private/qtextcodecinterface_p.h
-include/private/qtextengine_p.h
-include/private/qtextlayout_p.h
-include/private/qthreadinstance_p.h
-include/private/qtitlebar_p.h
-include/private/qucom_p.h
-include/private/qucomextra_p.h
-include/private/qunicodetables_p.h
-include/private/qwidget_p.h
-include/private/qwidgetinterface_p.h
-include/private/qwidgetresizehandler_p.h
-include/q1xcompatibility.h
-include/qabstractlayout.h
-include/qaccel.h
-include/qaccessible.h
-include/qaction.h
-include/qapp.h
-include/qapplication.h
-include/qarray.h
-include/qasciicache.h
-include/qasciidict.h
-include/qassistantclient.h
-include/qasyncimageio.h
-include/qasyncio.h
-include/qbig5codec.h
-include/qbitarray.h
-include/qbitarry.h
-include/qbitmap.h
-include/qbrush.h
-include/qbttngrp.h
-include/qbuffer.h
-include/qbutton.h
-include/qbuttongroup.h
-include/qcache.h
-include/qcanvas.h
-include/qcdestyle.h
-include/qcheckbox.h
-include/qchkbox.h
-include/qcleanuphandler.h
-include/qclipboard.h
-include/qclipbrd.h
-include/qcollect.h
-include/qcollection.h
-include/qcolor.h
-include/qcolordialog.h
-include/qcombo.h
-include/qcombobox.h
-include/qcommonstyle.h
-include/qcompactstyle.h
-include/qconfig-dist.h
-include/qconfig-large.h
-include/qconfig-medium.h
-include/qconfig-minimal.h
-include/qconfig-small.h
-include/qconfig.h
-include/qconnect.h
-include/qconnection.h
-include/qcstring.h
-include/qcursor.h
-include/qdatabrowser.h
-include/qdatastream.h
-include/qdatatable.h
-include/qdataview.h
-include/qdatetime.h
-include/qdatetimeedit.h
-include/qdatetm.h
-include/qdeepcopy.h
-include/qdesktopwidget.h
-include/qdial.h
-include/qdialog.h
-include/qdict.h
-include/qdir.h
-include/qdns.h
-include/qdockarea.h
-include/qdockwindow.h
-include/qdom.h
-include/qdragobject.h
-include/qdrawutil.h
-include/qdrawutl.h
-include/qdropsite.h
-include/qdstream.h
-include/qeditorfactory.h
-include/qerrormessage.h
-include/qeucjpcodec.h
-include/qeuckrcodec.h
-include/qevent.h
-include/qeventloop.h
-include/qfeatures.h
-include/qfile.h
-include/qfiledef.h
-include/qfiledialog.h
-include/qfiledlg.h
-include/qfileinf.h
-include/qfileinfo.h
-include/qfocusdata.h
-include/qfont.h
-include/qfontdatabase.h
-include/qfontdialog.h
-include/qfontinf.h
-include/qfontinfo.h
-include/qfontmet.h
-include/qfontmetrics.h
-include/qframe.h
-include/qftp.h
-include/qgarray.h
-include/qgb18030codec.h
-include/qgbkcodec.h
-include/qgcache.h
-include/qgdict.h
-include/qgeneric.h
-include/qgif.h
-include/qgl.h
-include/qglcolormap.h
-include/qglist.h
-include/qglobal.h
-include/qgplugin.h
-include/qgrid.h
-include/qgridview.h
-include/qgroupbox.h
-include/qgrpbox.h
-include/qguardedptr.h
-include/qgvector.h
-include/qhbox.h
-include/qhbuttongroup.h
-include/qheader.h
-include/qhgroupbox.h
-include/qhostaddress.h
-include/qhttp.h
-include/qiconset.h
-include/qiconview.h
-include/qimage.h
-include/qimageformatplugin.h
-include/qinputdialog.h
-include/qintcach.h
-include/qintcache.h
-include/qintdict.h
-include/qinterlacestyle.h
-include/qiodev.h
-include/qiodevice.h
-include/qjiscodec.h
-include/qjpegio.h
-include/qjpunicode.h
-include/qkeycode.h
-include/qkeysequence.h
-include/qlabel.h
-include/qlayout.h
-include/qlcdnum.h
-include/qlcdnumber.h
-include/qlibrary.h
-include/qlined.h
-include/qlineedit.h
-include/qlist.h
-include/qlistbox.h
-include/qlistview.h
-include/qlocale.h
-include/qlocalfs.h
-include/qmainwindow.h
-include/qmap.h
-include/qmemarray.h
-include/qmenubar.h
-include/qmenudata.h
-include/qmenudta.h
-include/qmessagebox.h
-include/qmetaobj.h
-include/qmetaobject.h
-include/qmime.h
-include/qmlined.h
-include/qmngio.h
-include/qmodules.h
-include/qmotifplusstyle.h
-include/qmotifstyle.h
-include/qmovie.h
-include/qmsgbox.h
-include/qmultilinedit.h
-include/qmultilineedit.h
-include/qmutex.h
-include/qnamespace.h
-include/qnetwork.h
-include/qnetworkprotocol.h
-include/qnp.h
-include/qobjcoll.h
-include/qobjdefs.h
-include/qobject.h
-include/qobjectcleanuphandler.h
-include/qobjectdefs.h
-include/qobjectdict.h
-include/qobjectlist.h
-include/qpaintd.h
-include/qpaintdc.h
-include/qpaintdevice.h
-include/qpaintdevicedefs.h
-include/qpaintdevicemetrics.h
-include/qpainter.h
-include/qpair.h
-include/qpalette.h
-include/qpdevmet.h
-include/qpen.h
-include/qpicture.h
-include/qpixmap.h
-include/qpixmapcache.h
-include/qplatinumstyle.h
-include/qpmcache.h
-include/qpngio.h
-include/qpntarry.h
-include/qpoint.h
-include/qpointarray.h
-include/qpolygonscanner.h
-include/qpopmenu.h
-include/qpopupmenu.h
-include/qprintdialog.h
-include/qprinter.h
-include/qprndlg.h
-include/qprocess.h
-include/qprogbar.h
-include/qprogdlg.h
-include/qprogressbar.h
-include/qprogressdialog.h
-include/qpsprn.h
-include/qptrcollection.h
-include/qptrdict.h
-include/qptrlist.h
-include/qptrqueue.h
-include/qptrstack.h
-include/qptrvector.h
-include/qpushbt.h
-include/qpushbutton.h
-include/qqueue.h
-include/qradiobt.h
-include/qradiobutton.h
-include/qrangecontrol.h
-include/qrangect.h
-include/qrect.h
-include/qregexp.h
-include/qregion.h
-include/qrtlcodec.h
-include/qscrbar.h
-include/qscrollbar.h
-include/qscrollview.h
-include/qsemaphore.h
-include/qsemimodal.h
-include/qserversocket.h
-include/qsession.h
-include/qsessionmanager.h
-include/qsettings.h
-include/qsgistyle.h
-include/qshared.h
-include/qsignal.h
-include/qsignalmapper.h
-include/qsignalslotimp.h
-include/qsimplerichtext.h
-include/qsize.h
-include/qsizegrip.h
-include/qsizepolicy.h
-include/qsjiscodec.h
-include/qslider.h
-include/qsocket.h
-include/qsocketdevice.h
-include/qsocketnotifier.h
-include/qsocknot.h
-include/qsortedlist.h
-include/qsound.h
-include/qspinbox.h
-include/qsplashscreen.h
-include/qsplitter.h
-include/qsql.h
-include/qsqlcursor.h
-include/qsqldatabase.h
-include/qsqldriver.h
-include/qsqldriverplugin.h
-include/qsqleditorfactory.h
-include/qsqlerror.h
-include/qsqlfield.h
-include/qsqlform.h
-include/qsqlindex.h
-include/qsqlpropertymap.h
-include/qsqlquery.h
-include/qsqlrecord.h
-include/qsqlresult.h
-include/qsqlselectcursor.h
-include/qstack.h
-include/qstatusbar.h
-include/qstring.h
-include/qstringlist.h
-include/qstrlist.h
-include/qstrvec.h
-include/qstyle.h
-include/qstylefactory.h
-include/qstyleplugin.h
-include/qstylesheet.h
-include/qsyntaxhighlighter.h
-include/qt.h
-include/qtabbar.h
-include/qtabdialog.h
-include/qtabdlg.h
-include/qtable.h
-include/qtabwidget.h
-include/qtextbrowser.h
-include/qtextcodec.h
-include/qtextcodecfactory.h
-include/qtextcodecplugin.h
-include/qtextedit.h
-include/qtextstream.h
-include/qtextview.h
-include/qthread.h
-include/qthreadstorage.h
-include/qtimer.h
-include/qtl.h
-include/qtoolbar.h
-include/qtoolbox.h
-include/qtoolbutton.h
-include/qtooltip.h
-include/qtranslator.h
-include/qtsciicodec.h
-include/qtstream.h
-include/qurl.h
-include/qurlinfo.h
-include/qurloperator.h
-include/qutfcodec.h
-include/quuid.h
-include/qvalidator.h
-include/qvaluelist.h
-include/qvaluestack.h
-include/qvaluevector.h
-include/qvariant.h
-include/qvbox.h
-include/qvbuttongroup.h
-include/qvector.h
-include/qvfbhdr.h
-include/qvgroupbox.h
-include/qwaitcondition.h
-include/qwhatsthis.h
-include/qwidcoll.h
-include/qwidget.h
-include/qwidgetfactory.h
-include/qwidgetintdict.h
-include/qwidgetlist.h
-include/qwidgetplugin.h
-include/qwidgetstack.h
-include/qwindefs.h
-include/qwindow.h
-include/qwindowdefs.h
-include/qwindowsstyle.h
-include/qwinexport.h
-include/qwizard.h
-include/qwmatrix.h
-include/qworkspace.h
-include/qxml.h
-lib/libdesignercore.a
-lib/libdesignercore.prl
-lib/libeditor.a
-lib/libeditor.prl
-lib/libqassistantclient.a
-lib/libqassistantclient.prl
-lib/libqnp.prl
-lib/libqt-mt.prl
-lib/libqt-mt.so
-lib/libqt-mt.so.3
-lib/libqt-mt.so.3.3
-lib/libqt-mt.so.3.3.8
-lib/libqui.prl
-lib/libqui.so
-lib/libqui.so.1
-lib/libqui.so.1.0
-lib/libqui.so.1.0.0
-lib/plugins/designer/libcppeditor.so
-lib/plugins/designer/libdlgplugin.so
-lib/plugins/designer/libgladeplugin.so
-lib/plugins/designer/libkdevdlgplugin.so
-lib/plugins/designer/librcplugin.so
-lib/plugins/designer/libwizards.so
-libdata/pkgconfig/qt-mt.pc
-share/doc/qt/html/3rdparty.html
-share/doc/qt/html/aboutqt.html
-share/doc/qt/html/abstract-connections.png
-share/doc/qt/html/abstractwidgets.html
-share/doc/qt/html/accelerators.html
-share/doc/qt/html/aclock-example.html
-share/doc/qt/html/activeqt-dotnet.html
-share/doc/qt/html/activeqt-examples.html
-share/doc/qt/html/activeqt-tools-dumpdoc.html
-share/doc/qt/html/activeqt-tools-idc.html
-share/doc/qt/html/activeqt-tools-testcon.html
-share/doc/qt/html/activeqt-tools.html
-share/doc/qt/html/activeqt.html
-share/doc/qt/html/addressbook-example.html
-share/doc/qt/html/advanced.html
-share/doc/qt/html/annotated.html
-share/doc/qt/html/appearance.html
-share/doc/qt/html/appicon.html
-share/doc/qt/html/application.html
-share/doc/qt/html/archivesearch-example.html
-share/doc/qt/html/assistant-1.html
-share/doc/qt/html/assistant-2.html
-share/doc/qt/html/assistant-3.html
-share/doc/qt/html/assistant-4.html
-share/doc/qt/html/assistant-5.html
-share/doc/qt/html/assistant-6.html
-share/doc/qt/html/assistant.dcf
-share/doc/qt/html/assistant.html
-share/doc/qt/html/assistant.png
-share/doc/qt/html/basic.html
-share/doc/qt/html/bearings.png
-share/doc/qt/html/biff-example.html
-share/doc/qt/html/bigtable-example.html
-share/doc/qt/html/book-dialog.png
-share/doc/qt/html/book-main.png
-share/doc/qt/html/brush-styles.png
-share/doc/qt/html/bughowto.html
-share/doc/qt/html/buttongroup-w.png
-share/doc/qt/html/buttongroups-example.html
-share/doc/qt/html/canvas-chart-example.html
-share/doc/qt/html/canvas-example.html
-share/doc/qt/html/canvas.html
-share/doc/qt/html/chart-canvastext-h.html
-share/doc/qt/html/chart-canvasview-cpp.html
-share/doc/qt/html/chart-canvasview-h.html
-share/doc/qt/html/chart-chart-pro.html
-share/doc/qt/html/chart-chartform-cpp.html
-share/doc/qt/html/chart-chartform-h.html
-share/doc/qt/html/chart-chartform_canvas-cpp.html
-share/doc/qt/html/chart-chartform_files-cpp.html
-share/doc/qt/html/chart-element-cpp.html
-share/doc/qt/html/chart-element-h.html
-share/doc/qt/html/chart-forms.png
-share/doc/qt/html/chart-main-cpp.html
-share/doc/qt/html/chart-main.png
-share/doc/qt/html/chart-main2.png
-share/doc/qt/html/chart-options.png
-share/doc/qt/html/chart-optionsform-cpp.html
-share/doc/qt/html/chart-optionsform-h.html
-share/doc/qt/html/chart-setdata.png
-share/doc/qt/html/chart-setdataform-cpp.html
-share/doc/qt/html/chart-setdataform-h.html
-share/doc/qt/html/checklists-example.html
-share/doc/qt/html/classchart.html
-share/doc/qt/html/classes.html
-share/doc/qt/html/clientserver-example.html
-share/doc/qt/html/collection.html
-share/doc/qt/html/commercialeditions.html
-share/doc/qt/html/commonproblems.html
-share/doc/qt/html/concrete-connections.png
-share/doc/qt/html/coordsys.html
-share/doc/qt/html/coordsys.png
-share/doc/qt/html/credits.html
-share/doc/qt/html/cursor-example.html
-share/doc/qt/html/cursors.png
-share/doc/qt/html/customlayout-example.html
-share/doc/qt/html/customlayout.html
-share/doc/qt/html/customstyles.html
-share/doc/qt/html/database.html
-share/doc/qt/html/databaseconnections.png
-share/doc/qt/html/datastreamformat.html
-share/doc/qt/html/datetimewidgets.png
-share/doc/qt/html/dclock-example.html
-share/doc/qt/html/debug.html
-share/doc/qt/html/demo-example.html
-share/doc/qt/html/dependencies.png
-share/doc/qt/html/designer-manual-1.html
-share/doc/qt/html/designer-manual-10.html
-share/doc/qt/html/designer-manual-11.html
-share/doc/qt/html/designer-manual-12.html
-share/doc/qt/html/designer-manual-13.html
-share/doc/qt/html/designer-manual-14.html
-share/doc/qt/html/designer-manual-15.html
-share/doc/qt/html/designer-manual-16.html
-share/doc/qt/html/designer-manual-2.html
-share/doc/qt/html/designer-manual-3.html
-share/doc/qt/html/designer-manual-4.html
-share/doc/qt/html/designer-manual-5.html
-share/doc/qt/html/designer-manual-6.html
-share/doc/qt/html/designer-manual-7.html
-share/doc/qt/html/designer-manual-8.html
-share/doc/qt/html/designer-manual-9.html
-share/doc/qt/html/designer-manual.html
-share/doc/qt/html/designer.dcf
-share/doc/qt/html/designer1.jpg
-share/doc/qt/html/designer2.jpg
-share/doc/qt/html/designer3.jpg
-share/doc/qt/html/desktop-example.html
-share/doc/qt/html/dialog1addwidg.png
-share/doc/qt/html/dialog1layout1.png
-share/doc/qt/html/dialog1layout2.png
-share/doc/qt/html/dialog1selewidg.png
-share/doc/qt/html/dialog1selewidg1.png
-share/doc/qt/html/dialog1tab.png
-share/doc/qt/html/dialog2laywidg.png
-share/doc/qt/html/dialog2sample.png
-share/doc/qt/html/dialog2setwidg.png
-share/doc/qt/html/dialog3buttons.png
-share/doc/qt/html/dialog3clipgrp.png
-share/doc/qt/html/dialog3grpbox.png
-share/doc/qt/html/dialog3layclip.png
-share/doc/qt/html/dialog3layout.png
-share/doc/qt/html/dialog3sample.png
-share/doc/qt/html/dialogs.html
-share/doc/qt/html/dirview-example.html
-share/doc/qt/html/distributingqt.html
-share/doc/qt/html/distributor-example.html
-share/doc/qt/html/dnd.html
-share/doc/qt/html/docwindow.png
-share/doc/qt/html/doneandnext.png
-share/doc/qt/html/draganddrop.html
-share/doc/qt/html/dragdrop-example.html
-share/doc/qt/html/drawdemo-example.html
-share/doc/qt/html/drawlines-example.html
-share/doc/qt/html/edit-dbtable-dialog.png
-share/doc/qt/html/editcopy.png
-share/doc/qt/html/editcut.png
-share/doc/qt/html/editfind.png
-share/doc/qt/html/editions.html
-share/doc/qt/html/editpaste.png
-share/doc/qt/html/editredo.png
-share/doc/qt/html/editundo.png
-share/doc/qt/html/emb-accel.html
-share/doc/qt/html/emb-charinput.html
-share/doc/qt/html/emb-classes.html
-share/doc/qt/html/emb-envvars.html
-share/doc/qt/html/emb-features.html
-share/doc/qt/html/emb-fonts.html
-share/doc/qt/html/emb-framebuffer-howto.html
-share/doc/qt/html/emb-install.html
-share/doc/qt/html/emb-performance.html
-share/doc/qt/html/emb-pointer.html
-share/doc/qt/html/emb-porting.html
-share/doc/qt/html/emb-qvfb.html
-share/doc/qt/html/emb-running.html
-share/doc/qt/html/emb-vnc.html
-share/doc/qt/html/embedporting.html
-share/doc/qt/html/environment.html
-share/doc/qt/html/events.html
-share/doc/qt/html/eventsandfilters.html
-share/doc/qt/html/examples.html
-share/doc/qt/html/extension-dialog-example.html
-share/doc/qt/html/faq.html
-share/doc/qt/html/filechooser.png
-share/doc/qt/html/fileiconview-example.html
-share/doc/qt/html/fileopen.png
-share/doc/qt/html/fileprint.png
-share/doc/qt/html/filesave.png
-share/doc/qt/html/finddialog.png
-share/doc/qt/html/focus.html
-share/doc/qt/html/forever-example.html
-share/doc/qt/html/frames.png
-share/doc/qt/html/ftpclient-example.html
-share/doc/qt/html/functions.html
-share/doc/qt/html/general.png
-share/doc/qt/html/geomanagement.html
-share/doc/qt/html/geometry.html
-share/doc/qt/html/geometry.png
-share/doc/qt/html/gpl.html
-share/doc/qt/html/graph.g1n
-share/doc/qt/html/grapher-nsplugin-example.html
-share/doc/qt/html/graphics.html
-share/doc/qt/html/gridlayout.png
-share/doc/qt/html/groupbox-w.png
-share/doc/qt/html/groups.html
-share/doc/qt/html/guibooks.html
-share/doc/qt/html/headerfilesynonyms
-share/doc/qt/html/headers.html
-share/doc/qt/html/hello-example.html
-share/doc/qt/html/helpsystem-example.html
-share/doc/qt/html/helpsystem.html
-share/doc/qt/html/helpviewer-example.html
-share/doc/qt/html/hierarchy.html
-share/doc/qt/html/how-to-learn-qt.html
-share/doc/qt/html/httpd-example.html
-share/doc/qt/html/i18n-example.html
-share/doc/qt/html/i18n.html
-share/doc/qt/html/iconset.png
-share/doc/qt/html/iconview-example.html
-share/doc/qt/html/iconview-simple_dd-main-cpp.html
-share/doc/qt/html/iconview-simple_dd-main-h.html
-share/doc/qt/html/iconview.html
-share/doc/qt/html/images.html
-share/doc/qt/html/index
-share/doc/qt/html/index.html
-share/doc/qt/html/inputdialogs.png
-share/doc/qt/html/install-mac.html
-share/doc/qt/html/install-win.html
-share/doc/qt/html/install-x11.html
-share/doc/qt/html/installation.html
-share/doc/qt/html/integration.html
-share/doc/qt/html/io.html
-share/doc/qt/html/keyfeatures30.html
-share/doc/qt/html/layout-example.html
-share/doc/qt/html/layout.html
-share/doc/qt/html/layout1.png
-share/doc/qt/html/layout2.png
-share/doc/qt/html/license.html
-share/doc/qt/html/licenses.html
-share/doc/qt/html/life-example.html
-share/doc/qt/html/lineedits-example.html
-share/doc/qt/html/linguist-manual-1.html
-share/doc/qt/html/linguist-manual-2.html
-share/doc/qt/html/linguist-manual-3.html
-share/doc/qt/html/linguist-manual-4.html
-share/doc/qt/html/linguist-manual.html
-share/doc/qt/html/linguist.dcf
-share/doc/qt/html/linguist.png
-share/doc/qt/html/listbox-example.html
-share/doc/qt/html/listboxcombo-example.html
-share/doc/qt/html/listviews-example.html
-share/doc/qt/html/logo32.png
-share/doc/qt/html/mac-differences.html
-share/doc/qt/html/mail-example.html
-share/doc/qt/html/mainclasses.html
-share/doc/qt/html/mainwindow-w.png
-share/doc/qt/html/makeqpf.html
-share/doc/qt/html/mdi-example.html
-share/doc/qt/html/menu-example.html
-share/doc/qt/html/menubar.png
-share/doc/qt/html/metaobjects.html
-share/doc/qt/html/misc.html
-share/doc/qt/html/moc.html
-share/doc/qt/html/modules.html
-share/doc/qt/html/motif-customwidget-example.html
-share/doc/qt/html/motif-dialog-example.html
-share/doc/qt/html/motif-examples.html
-share/doc/qt/html/motif-extension.html
-share/doc/qt/html/motif-todo.png
-share/doc/qt/html/motif-walkthrough-1.html
-share/doc/qt/html/motif-walkthrough-10.html
-share/doc/qt/html/motif-walkthrough-2.html
-share/doc/qt/html/motif-walkthrough-3.html
-share/doc/qt/html/motif-walkthrough-4.html
-share/doc/qt/html/motif-walkthrough-5.html
-share/doc/qt/html/motif-walkthrough-6.html
-share/doc/qt/html/motif-walkthrough-7.html
-share/doc/qt/html/motif-walkthrough-8.html
-share/doc/qt/html/motif-walkthrough-9.html
-share/doc/qt/html/motif-walkthrough.html
-share/doc/qt/html/movies-example.html
-share/doc/qt/html/multimedia.html
-share/doc/qt/html/mw-addmainwidg.png
-share/doc/qt/html/mw-coloriconv.png
-share/doc/qt/html/mw-colortable.png
-share/doc/qt/html/mw-colortool1.png
-share/doc/qt/html/mw-colortool2.png
-share/doc/qt/html/mw-conn1.png
-share/doc/qt/html/mw-conn2.png
-share/doc/qt/html/mw-conn3.png
-share/doc/qt/html/mw-conn4.png
-share/doc/qt/html/mw-dragaction.png
-share/doc/qt/html/mw-dragviewitem.png
-share/doc/qt/html/mw-editforw.png
-share/doc/qt/html/mw-editfunc.png
-share/doc/qt/html/mw-editincimp.png
-share/doc/qt/html/mw-editvar.png
-share/doc/qt/html/mw-laycoloriconv.png
-share/doc/qt/html/mw-laycolortable.png
-share/doc/qt/html/mw-laymainwidg.png
-share/doc/qt/html/mw-menuwiz.png
-share/doc/qt/html/mw-newfile.png
-share/doc/qt/html/mw-newmenuitem.png
-share/doc/qt/html/mw-objexplor.png
-share/doc/qt/html/mw-previewform.png
-share/doc/qt/html/mw-projset.png
-share/doc/qt/html/mw-propedit.png
-share/doc/qt/html/mw-separator.png
-share/doc/qt/html/mw-settoolwiz.png
-share/doc/qt/html/mw-startdesign.png
-share/doc/qt/html/mw-toolbarpits.png
-share/doc/qt/html/netscape-plugin.html
-share/doc/qt/html/network-examples.html
-share/doc/qt/html/network.html
-share/doc/qt/html/networkprotocol-example.html
-share/doc/qt/html/next.png
-share/doc/qt/html/nextunfinished.png
-share/doc/qt/html/nsplugin-examples.html
-share/doc/qt/html/object.html
-share/doc/qt/html/objectmodel.html
-share/doc/qt/html/objecttrees.html
-share/doc/qt/html/opengl-box-example.html
-share/doc/qt/html/opengl-examples.html
-share/doc/qt/html/opengl-gear-example.html
-share/doc/qt/html/opengl-overlay-example.html
-share/doc/qt/html/opengl-overlay-x11-example.html
-share/doc/qt/html/opengl-pixmap-example.html
-share/doc/qt/html/opengl-sharedbox-example.html
-share/doc/qt/html/opengl-texture-example.html
-share/doc/qt/html/opengl-x11-overlays.html
-share/doc/qt/html/opengl.html
-share/doc/qt/html/opensourceedition.html
-share/doc/qt/html/organizers.html
-share/doc/qt/html/outliner-example.html
-share/doc/qt/html/overviews-list.html
-share/doc/qt/html/palette.png
-share/doc/qt/html/pdf1.png
-share/doc/qt/html/pen-cap-styles.png
-share/doc/qt/html/pen-join-styles.png
-share/doc/qt/html/pen-styles.png
-share/doc/qt/html/penstyles.png
-share/doc/qt/html/phrasebookdialog.png
-share/doc/qt/html/phrasebookopen.png
-share/doc/qt/html/picture-example.html
-share/doc/qt/html/pictures.html
-share/doc/qt/html/plugins-howto.html
-share/doc/qt/html/plugins.html
-share/doc/qt/html/popup-example.html
-share/doc/qt/html/porting.html
-share/doc/qt/html/porting2.html
-share/doc/qt/html/prev.png
-share/doc/qt/html/prevunfinished.png
-share/doc/qt/html/primes.html
-share/doc/qt/html/process-example.html
-share/doc/qt/html/progress-example.html
-share/doc/qt/html/progressbar-example.html
-share/doc/qt/html/properties.html
-share/doc/qt/html/propertydocs
-share/doc/qt/html/propertyindex
-share/doc/qt/html/qaccel-h.html
-share/doc/qt/html/qaccel-members.html
-share/doc/qt/html/qaccel.html
-share/doc/qt/html/qaccessible-h.html
-share/doc/qt/html/qaccessible-members.html
-share/doc/qt/html/qaccessible.html
-share/doc/qt/html/qaccessibleinterface-members.html
-share/doc/qt/html/qaccessibleinterface.html
-share/doc/qt/html/qaccessibleobject-members.html
-share/doc/qt/html/qaccessibleobject.html
-share/doc/qt/html/qaction-application-example.html
-share/doc/qt/html/qaction-examples.html
-share/doc/qt/html/qaction-h.html
-share/doc/qt/html/qaction-members.html
-share/doc/qt/html/qaction.html
-share/doc/qt/html/qactiongroup-members.html
-share/doc/qt/html/qactiongroup.html
-share/doc/qt/html/qactiongroup_menu.png
-share/doc/qt/html/qactiongroup_menu_subwidget.png
-share/doc/qt/html/qactiongroup_toolbar.png
-share/doc/qt/html/qactiongroup_toolbar_exclusive_subwidget.png
-share/doc/qt/html/qactiongroup_toolbar_nonexclusive_subwidget.png
-share/doc/qt/html/qapplication-h.html
-share/doc/qt/html/qapplication-members.html
-share/doc/qt/html/qapplication.html
-share/doc/qt/html/qarray.html
-share/doc/qt/html/qasciicache-h.html
-share/doc/qt/html/qasciicache-members.html
-share/doc/qt/html/qasciicache.html
-share/doc/qt/html/qasciicacheiterator-members.html
-share/doc/qt/html/qasciicacheiterator.html
-share/doc/qt/html/qasciidict-h.html
-share/doc/qt/html/qasciidict-members.html
-share/doc/qt/html/qasciidict.html
-share/doc/qt/html/qasciidictiterator-members.html
-share/doc/qt/html/qasciidictiterator.html
-share/doc/qt/html/qassistantclient-h.html
-share/doc/qt/html/qassistantclient-members.html
-share/doc/qt/html/qassistantclient.html
-share/doc/qt/html/qasyncimageio-h.html
-share/doc/qt/html/qasyncio-h.html
-share/doc/qt/html/qasyncio-members.html
-share/doc/qt/html/qasyncio.html
-share/doc/qt/html/qaxaggregated-members.html
-share/doc/qt/html/qaxaggregated.html
-share/doc/qt/html/qaxbase-h.html
-share/doc/qt/html/qaxbase-members.html
-share/doc/qt/html/qaxbase.html
-share/doc/qt/html/qaxbindable-h.html
-share/doc/qt/html/qaxbindable-members.html
-share/doc/qt/html/qaxbindable.html
-share/doc/qt/html/qaxcontainer-example-qutlook.html
-share/doc/qt/html/qaxcontainer-example-webbrowser.html
-share/doc/qt/html/qaxcontainer-examples.html
-share/doc/qt/html/qaxcontainer.html
-share/doc/qt/html/qaxfactory-h.html
-share/doc/qt/html/qaxfactory-members.html
-share/doc/qt/html/qaxfactory.html
-share/doc/qt/html/qaxobject-h.html
-share/doc/qt/html/qaxobject-members.html
-share/doc/qt/html/qaxobject.html
-share/doc/qt/html/qaxscript-h.html
-share/doc/qt/html/qaxscript-members.html
-share/doc/qt/html/qaxscript.html
-share/doc/qt/html/qaxscriptengine-members.html
-share/doc/qt/html/qaxscriptengine.html
-share/doc/qt/html/qaxscriptmanager-members.html
-share/doc/qt/html/qaxscriptmanager.html
-share/doc/qt/html/qaxserver-demo-hierarchy.html
-share/doc/qt/html/qaxserver-demo-menus.html
-share/doc/qt/html/qaxserver-demo-multiple.html
-share/doc/qt/html/qaxserver-demo-opengl.html
-share/doc/qt/html/qaxserver-demo-simple.html
-share/doc/qt/html/qaxserver-demo-tetrax.html
-share/doc/qt/html/qaxserver-demo-wrapper.html
-share/doc/qt/html/qaxserver-example-hierarchy.html
-share/doc/qt/html/qaxserver-example-menus.html
-share/doc/qt/html/qaxserver-example-multiple.html
-share/doc/qt/html/qaxserver-example-opengl.html
-share/doc/qt/html/qaxserver-example-simple.html
-share/doc/qt/html/qaxserver-example-tetrax.html
-share/doc/qt/html/qaxserver-example-wrapper.html
-share/doc/qt/html/qaxserver-examples.html
-share/doc/qt/html/qaxserver.html
-share/doc/qt/html/qaxwidget-h.html
-share/doc/qt/html/qaxwidget-members.html
-share/doc/qt/html/qaxwidget.html
-share/doc/qt/html/qbig5codec-h.html
-share/doc/qt/html/qbig5codec-members.html
-share/doc/qt/html/qbig5codec.html
-share/doc/qt/html/qbig5hkscscodec-members.html
-share/doc/qt/html/qbig5hkscscodec.html
-share/doc/qt/html/qbitarray-h.html
-share/doc/qt/html/qbitarray-members.html
-share/doc/qt/html/qbitarray.html
-share/doc/qt/html/qbitmap-h.html
-share/doc/qt/html/qbitmap-members.html
-share/doc/qt/html/qbitmap.html
-share/doc/qt/html/qbitval-members.html
-share/doc/qt/html/qbitval.html
-share/doc/qt/html/qboxlayout-members.html
-share/doc/qt/html/qboxlayout.html
-share/doc/qt/html/qbrush-h.html
-share/doc/qt/html/qbrush-members.html
-share/doc/qt/html/qbrush.html
-share/doc/qt/html/qbttngrp-m.png
-share/doc/qt/html/qbttngrp-w.png
-share/doc/qt/html/qbuffer-h.html
-share/doc/qt/html/qbuffer-members.html
-share/doc/qt/html/qbuffer.html
-share/doc/qt/html/qbutton-h.html
-share/doc/qt/html/qbutton-members.html
-share/doc/qt/html/qbutton.html
-share/doc/qt/html/qbuttongroup-h.html
-share/doc/qt/html/qbuttongroup-h.png
-share/doc/qt/html/qbuttongroup-members.html
-share/doc/qt/html/qbuttongroup-v.png
-share/doc/qt/html/qbuttongroup.html
-share/doc/qt/html/qbytearray-members.html
-share/doc/qt/html/qbytearray.html
-share/doc/qt/html/qcache-h.html
-share/doc/qt/html/qcache-members.html
-share/doc/qt/html/qcache.html
-share/doc/qt/html/qcacheiterator-members.html
-share/doc/qt/html/qcacheiterator.html
-share/doc/qt/html/qcanvas-h.html
-share/doc/qt/html/qcanvas-members.html
-share/doc/qt/html/qcanvas.html
-share/doc/qt/html/qcanvas.png
-share/doc/qt/html/qcanvasellipse-members.html
-share/doc/qt/html/qcanvasellipse.html
-share/doc/qt/html/qcanvasellipse.png
-share/doc/qt/html/qcanvasitem-members.html
-share/doc/qt/html/qcanvasitem.html
-share/doc/qt/html/qcanvasitemlist-members.html
-share/doc/qt/html/qcanvasitemlist.html
-share/doc/qt/html/qcanvasline-members.html
-share/doc/qt/html/qcanvasline.html
-share/doc/qt/html/qcanvaspixmap-members.html
-share/doc/qt/html/qcanvaspixmap.html
-share/doc/qt/html/qcanvaspixmaparray-members.html
-share/doc/qt/html/qcanvaspixmaparray.html
-share/doc/qt/html/qcanvaspolygon-members.html
-share/doc/qt/html/qcanvaspolygon.html
-share/doc/qt/html/qcanvaspolygonalitem-members.html
-share/doc/qt/html/qcanvaspolygonalitem.html
-share/doc/qt/html/qcanvasrectangle-members.html
-share/doc/qt/html/qcanvasrectangle.html
-share/doc/qt/html/qcanvasspline-members.html
-share/doc/qt/html/qcanvasspline.html
-share/doc/qt/html/qcanvassprite-members.html
-share/doc/qt/html/qcanvassprite.html
-share/doc/qt/html/qcanvastext-members.html
-share/doc/qt/html/qcanvastext.html
-share/doc/qt/html/qcanvasview-members.html
-share/doc/qt/html/qcanvasview.html
-share/doc/qt/html/qcdestyle-h.html
-share/doc/qt/html/qcdestyle-members.html
-share/doc/qt/html/qcdestyle.html
-share/doc/qt/html/qchar-members.html
-share/doc/qt/html/qchar.html
-share/doc/qt/html/qcharref-members.html
-share/doc/qt/html/qcharref.html
-share/doc/qt/html/qcheckbox-h.html
-share/doc/qt/html/qcheckbox-members.html
-share/doc/qt/html/qcheckbox.html
-share/doc/qt/html/qchecklistitem-members.html
-share/doc/qt/html/qchecklistitem.html
-share/doc/qt/html/qchecktableitem-members.html
-share/doc/qt/html/qchecktableitem.html
-share/doc/qt/html/qchildevent-members.html
-share/doc/qt/html/qchildevent.html
-share/doc/qt/html/qchkbox-m.png
-share/doc/qt/html/qchkbox-w.png
-share/doc/qt/html/qclipboard-h.html
-share/doc/qt/html/qclipboard-members.html
-share/doc/qt/html/qclipboard.html
-share/doc/qt/html/qcloseevent-members.html
-share/doc/qt/html/qcloseevent.html
-share/doc/qt/html/qcollection.html
-share/doc/qt/html/qcolor-h.html
-share/doc/qt/html/qcolor-members.html
-share/doc/qt/html/qcolor.html
-share/doc/qt/html/qcolordialog-h.html
-share/doc/qt/html/qcolordialog-members.html
-share/doc/qt/html/qcolordialog.html
-share/doc/qt/html/qcolordlg-w.png
-share/doc/qt/html/qcolordrag-members.html
-share/doc/qt/html/qcolordrag.html
-share/doc/qt/html/qcolorgroup-members.html
-share/doc/qt/html/qcolorgroup.html
-share/doc/qt/html/qcombo1-m.png
-share/doc/qt/html/qcombo1-w.png
-share/doc/qt/html/qcombo2-m.png
-share/doc/qt/html/qcombo3-m.png
-share/doc/qt/html/qcombobox-h.html
-share/doc/qt/html/qcombobox-members.html
-share/doc/qt/html/qcombobox.html
-share/doc/qt/html/qcombotableitem-members.html
-share/doc/qt/html/qcombotableitem.html
-share/doc/qt/html/qcommonstyle-h.html
-share/doc/qt/html/qcommonstyle-members.html
-share/doc/qt/html/qcommonstyle.html
-share/doc/qt/html/qconststring-members.html
-share/doc/qt/html/qconststring.html
-share/doc/qt/html/qcontextmenuevent-members.html
-share/doc/qt/html/qcontextmenuevent.html
-share/doc/qt/html/qcopchannel-members.html
-share/doc/qt/html/qcopchannel.html
-share/doc/qt/html/qcopchannel_qws-h.html
-share/doc/qt/html/qcstring-h.html
-share/doc/qt/html/qcstring-members.html
-share/doc/qt/html/qcstring.html
-share/doc/qt/html/qcursor-h.html
-share/doc/qt/html/qcursor-members.html
-share/doc/qt/html/qcursor.html
-share/doc/qt/html/qcustomevent-members.html
-share/doc/qt/html/qcustomevent.html
-share/doc/qt/html/qcustommenuitem-members.html
-share/doc/qt/html/qcustommenuitem.html
-share/doc/qt/html/qd-actioneditor.png
-share/doc/qt/html/qd-colortool-name.png
-share/doc/qt/html/qd-databrowserwzd.png
-share/doc/qt/html/qd-databrowserwzdpage2.png
-share/doc/qt/html/qd-databrowserwzdpage3.png
-share/doc/qt/html/qd-databrowserwzdpage4.png
-share/doc/qt/html/qd-databrowserwzdpage5.png
-share/doc/qt/html/qd-databrowserwzdpage6.png
-share/doc/qt/html/qd-datatablewzd.png
-share/doc/qt/html/qd-datatablewzdpage2.png
-share/doc/qt/html/qd-datatablewzdpage3.png
-share/doc/qt/html/qd-datatablewzdpage4.png
-share/doc/qt/html/qd-datatablewzdpage5.png
-share/doc/qt/html/qd-dataviewwzd.png
-share/doc/qt/html/qd-dataviewwzdpage2.png
-share/doc/qt/html/qd-dataviewwzdpage3.png
-share/doc/qt/html/qd-dataviewwzdpage4.png
-share/doc/qt/html/qd-helptoolbuttons3.png
-share/doc/qt/html/qd-mainwinwzd.png
-share/doc/qt/html/qd-mainwinwzdpage2.png
-share/doc/qt/html/qd-preface.png
-share/doc/qt/html/qd-preferences-dlg.png
-share/doc/qt/html/qdatabrowser-h.html
-share/doc/qt/html/qdatabrowser-members.html
-share/doc/qt/html/qdatabrowser.html
-share/doc/qt/html/qdatapump-members.html
-share/doc/qt/html/qdatapump.html
-share/doc/qt/html/qdatasink-members.html
-share/doc/qt/html/qdatasink.html
-share/doc/qt/html/qdatasource-members.html
-share/doc/qt/html/qdatasource.html
-share/doc/qt/html/qdatastream-h.html
-share/doc/qt/html/qdatastream-members.html
-share/doc/qt/html/qdatastream.html
-share/doc/qt/html/qdatatable-h.html
-share/doc/qt/html/qdatatable-members.html
-share/doc/qt/html/qdatatable.html
-share/doc/qt/html/qdataview-h.html
-share/doc/qt/html/qdataview-members.html
-share/doc/qt/html/qdataview.html
-share/doc/qt/html/qdate-members.html
-share/doc/qt/html/qdate.html
-share/doc/qt/html/qdateedit-members.html
-share/doc/qt/html/qdateedit.html
-share/doc/qt/html/qdatetime-h.html
-share/doc/qt/html/qdatetime-members.html
-share/doc/qt/html/qdatetime.html
-share/doc/qt/html/qdatetimeedit-h.html
-share/doc/qt/html/qdatetimeedit-members.html
-share/doc/qt/html/qdatetimeedit.html
-share/doc/qt/html/qdatetimeeditbase-members.html
-share/doc/qt/html/qdatetimeeditbase.html
-share/doc/qt/html/qdeepcopy-h.html
-share/doc/qt/html/qdeepcopy-members.html
-share/doc/qt/html/qdeepcopy.html
-share/doc/qt/html/qdesktopwidget-h.html
-share/doc/qt/html/qdesktopwidget-members.html
-share/doc/qt/html/qdesktopwidget.html
-share/doc/qt/html/qdesktopwidget.png
-share/doc/qt/html/qdial-h.html
-share/doc/qt/html/qdial-m.png
-share/doc/qt/html/qdial-members.html
-share/doc/qt/html/qdial-w.png
-share/doc/qt/html/qdial.html
-share/doc/qt/html/qdialog-h.html
-share/doc/qt/html/qdialog-members.html
-share/doc/qt/html/qdialog.html
-share/doc/qt/html/qdict-h.html
-share/doc/qt/html/qdict-members.html
-share/doc/qt/html/qdict.html
-share/doc/qt/html/qdictiterator-members.html
-share/doc/qt/html/qdictiterator.html
-share/doc/qt/html/qdir-example.html
-share/doc/qt/html/qdir-h.html
-share/doc/qt/html/qdir-members.html
-share/doc/qt/html/qdir.html
-share/doc/qt/html/qdirectpainter-members.html
-share/doc/qt/html/qdirectpainter.html
-share/doc/qt/html/qdirectpainter_qws-h.html
-share/doc/qt/html/qdns-h.html
-share/doc/qt/html/qdns-members.html
-share/doc/qt/html/qdns.html
-share/doc/qt/html/qdockarea-h.html
-share/doc/qt/html/qdockarea-members.html
-share/doc/qt/html/qdockarea.html
-share/doc/qt/html/qdockwindow-h.html
-share/doc/qt/html/qdockwindow-members.html
-share/doc/qt/html/qdockwindow.html
-share/doc/qt/html/qdockwindow.png
-share/doc/qt/html/qdom-h.html
-share/doc/qt/html/qdomattr-members.html
-share/doc/qt/html/qdomattr.html
-share/doc/qt/html/qdomcdatasection-members.html
-share/doc/qt/html/qdomcdatasection.html
-share/doc/qt/html/qdomcharacterdata-members.html
-share/doc/qt/html/qdomcharacterdata.html
-share/doc/qt/html/qdomcomment-members.html
-share/doc/qt/html/qdomcomment.html
-share/doc/qt/html/qdomdocument-members.html
-share/doc/qt/html/qdomdocument.html
-share/doc/qt/html/qdomdocumentfragment-members.html
-share/doc/qt/html/qdomdocumentfragment.html
-share/doc/qt/html/qdomdocumenttype-members.html
-share/doc/qt/html/qdomdocumenttype.html
-share/doc/qt/html/qdomelement-members.html
-share/doc/qt/html/qdomelement.html
-share/doc/qt/html/qdomentity-members.html
-share/doc/qt/html/qdomentity.html
-share/doc/qt/html/qdomentityreference-members.html
-share/doc/qt/html/qdomentityreference.html
-share/doc/qt/html/qdomimplementation-members.html
-share/doc/qt/html/qdomimplementation.html
-share/doc/qt/html/qdomnamednodemap-members.html
-share/doc/qt/html/qdomnamednodemap.html
-share/doc/qt/html/qdomnode-members.html
-share/doc/qt/html/qdomnode.html
-share/doc/qt/html/qdomnodelist-members.html
-share/doc/qt/html/qdomnodelist.html
-share/doc/qt/html/qdomnotation-members.html
-share/doc/qt/html/qdomnotation.html
-share/doc/qt/html/qdomprocessinginstruction-members.html
-share/doc/qt/html/qdomprocessinginstruction.html
-share/doc/qt/html/qdomtext-members.html
-share/doc/qt/html/qdomtext.html
-share/doc/qt/html/qdoublevalidator-members.html
-share/doc/qt/html/qdoublevalidator.html
-share/doc/qt/html/qdragenterevent-members.html
-share/doc/qt/html/qdragenterevent.html
-share/doc/qt/html/qdragleaveevent-members.html
-share/doc/qt/html/qdragleaveevent.html
-share/doc/qt/html/qdragmoveevent-members.html
-share/doc/qt/html/qdragmoveevent.html
-share/doc/qt/html/qdragobject-h.html
-share/doc/qt/html/qdragobject-members.html
-share/doc/qt/html/qdragobject.html
-share/doc/qt/html/qdrawutil-h.html
-share/doc/qt/html/qdropevent-members.html
-share/doc/qt/html/qdropevent.html
-share/doc/qt/html/qdropsite-h.html
-share/doc/qt/html/qdropsite-members.html
-share/doc/qt/html/qdropsite.html
-share/doc/qt/html/qeditorfactory-h.html
-share/doc/qt/html/qeditorfactory-members.html
-share/doc/qt/html/qeditorfactory.html
-share/doc/qt/html/qembed.html
-share/doc/qt/html/qerrormessage-h.html
-share/doc/qt/html/qerrormessage-members.html
-share/doc/qt/html/qerrormessage.html
-share/doc/qt/html/qerrormessage.png
-share/doc/qt/html/qeucjpcodec-h.html
-share/doc/qt/html/qeucjpcodec-members.html
-share/doc/qt/html/qeucjpcodec.html
-share/doc/qt/html/qeuckrcodec-h.html
-share/doc/qt/html/qeuckrcodec-members.html
-share/doc/qt/html/qeuckrcodec.html
-share/doc/qt/html/qevent-h.html
-share/doc/qt/html/qevent-members.html
-share/doc/qt/html/qevent.html
-share/doc/qt/html/qeventloop-h.html
-share/doc/qt/html/qeventloop-members.html
-share/doc/qt/html/qeventloop.html
-share/doc/qt/html/qfd-example.html
-share/doc/qt/html/qfile-h.html
-share/doc/qt/html/qfile-members.html
-share/doc/qt/html/qfile.html
-share/doc/qt/html/qfiledialog-h.html
-share/doc/qt/html/qfiledialog-members.html
-share/doc/qt/html/qfiledialog.html
-share/doc/qt/html/qfiledlg-m.png
-share/doc/qt/html/qfiledlg-w.png
-share/doc/qt/html/qfileiconprovider-members.html
-share/doc/qt/html/qfileiconprovider.html
-share/doc/qt/html/qfileinfo-h.html
-share/doc/qt/html/qfileinfo-members.html
-share/doc/qt/html/qfileinfo.html
-share/doc/qt/html/qfilepreview-members.html
-share/doc/qt/html/qfilepreview.html
-share/doc/qt/html/qfocusdata-h.html
-share/doc/qt/html/qfocusdata-members.html
-share/doc/qt/html/qfocusdata.html
-share/doc/qt/html/qfocusevent-members.html
-share/doc/qt/html/qfocusevent.html
-share/doc/qt/html/qfont-examples.html
-share/doc/qt/html/qfont-h.html
-share/doc/qt/html/qfont-members.html
-share/doc/qt/html/qfont.html
-share/doc/qt/html/qfontdatabase-h.html
-share/doc/qt/html/qfontdatabase-members.html
-share/doc/qt/html/qfontdatabase.html
-share/doc/qt/html/qfontdialog-h.html
-share/doc/qt/html/qfontdialog-members.html
-share/doc/qt/html/qfontdialog.html
-share/doc/qt/html/qfontdlg-w.png
-share/doc/qt/html/qfontinfo-h.html
-share/doc/qt/html/qfontinfo-members.html
-share/doc/qt/html/qfontinfo.html
-share/doc/qt/html/qfontmanager-members.html
-share/doc/qt/html/qfontmanager.html
-share/doc/qt/html/qfontmanager_qws-h.html
-share/doc/qt/html/qfontmetrics-h.html
-share/doc/qt/html/qfontmetrics-members.html
-share/doc/qt/html/qfontmetrics.html
-share/doc/qt/html/qframe-h.html
-share/doc/qt/html/qframe-members.html
-share/doc/qt/html/qframe.html
-share/doc/qt/html/qftp-h.html
-share/doc/qt/html/qftp-members.html
-share/doc/qt/html/qftp.html
-share/doc/qt/html/qgb18030codec-h.html
-share/doc/qt/html/qgb18030codec-members.html
-share/doc/qt/html/qgb18030codec.html
-share/doc/qt/html/qgb2312codec-members.html
-share/doc/qt/html/qgb2312codec.html
-share/doc/qt/html/qgbkcodec-members.html
-share/doc/qt/html/qgbkcodec.html
-share/doc/qt/html/qgfx_qws-h.html
-share/doc/qt/html/qgfxdriverfactory-members.html
-share/doc/qt/html/qgfxdriverfactory.html
-share/doc/qt/html/qgfxdriverfactory_qws-h.html
-share/doc/qt/html/qgfxdriverplugin-members.html
-share/doc/qt/html/qgfxdriverplugin.html
-share/doc/qt/html/qgfxdriverplugin_qws-h.html
-share/doc/qt/html/qgl-h.html
-share/doc/qt/html/qgl-members.html
-share/doc/qt/html/qgl.html
-share/doc/qt/html/qglayoutiterator-members.html
-share/doc/qt/html/qglayoutiterator.html
-share/doc/qt/html/qglcolormap-h.html
-share/doc/qt/html/qglcolormap-members.html
-share/doc/qt/html/qglcolormap.html
-share/doc/qt/html/qglcontext-members.html
-share/doc/qt/html/qglcontext.html
-share/doc/qt/html/qglformat-members.html
-share/doc/qt/html/qglformat.html
-share/doc/qt/html/qglobal-h.html
-share/doc/qt/html/qglwidget-members.html
-share/doc/qt/html/qglwidget.html
-share/doc/qt/html/qgrid-h.html
-share/doc/qt/html/qgrid-m.png
-share/doc/qt/html/qgrid-members.html
-share/doc/qt/html/qgrid.html
-share/doc/qt/html/qgridlayout-members.html
-share/doc/qt/html/qgridlayout.html
-share/doc/qt/html/qgridview-h.html
-share/doc/qt/html/qgridview-members.html
-share/doc/qt/html/qgridview.html
-share/doc/qt/html/qgroupbox-h.html
-share/doc/qt/html/qgroupbox-members.html
-share/doc/qt/html/qgroupbox.html
-share/doc/qt/html/qgroupboxes.png
-share/doc/qt/html/qgrpbox-w.png
-share/doc/qt/html/qguardedptr-h.html
-share/doc/qt/html/qguardedptr-members.html
-share/doc/qt/html/qguardedptr.html
-share/doc/qt/html/qhbox-h.html
-share/doc/qt/html/qhbox-m.png
-share/doc/qt/html/qhbox-members.html
-share/doc/qt/html/qhbox.html
-share/doc/qt/html/qhboxlayout-members.html
-share/doc/qt/html/qhboxlayout.html
-share/doc/qt/html/qhboxlayout.png
-share/doc/qt/html/qhbuttongroup-h.html
-share/doc/qt/html/qhbuttongroup-members.html
-share/doc/qt/html/qhbuttongroup.html
-share/doc/qt/html/qheader-h.html
-share/doc/qt/html/qheader-m.png
-share/doc/qt/html/qheader-members.html
-share/doc/qt/html/qheader-w.png
-share/doc/qt/html/qheader.html
-share/doc/qt/html/qhebrewcodec-members.html
-share/doc/qt/html/qhebrewcodec.html
-share/doc/qt/html/qhgroupbox-h.html
-share/doc/qt/html/qhgroupbox-members.html
-share/doc/qt/html/qhgroupbox.html
-share/doc/qt/html/qhideevent-members.html
-share/doc/qt/html/qhideevent.html
-share/doc/qt/html/qhostaddress-h.html
-share/doc/qt/html/qhostaddress-members.html
-share/doc/qt/html/qhostaddress.html
-share/doc/qt/html/qhttp-h.html
-share/doc/qt/html/qhttp-members.html
-share/doc/qt/html/qhttp.html
-share/doc/qt/html/qhttpheader-members.html
-share/doc/qt/html/qhttpheader.html
-share/doc/qt/html/qhttprequestheader-members.html
-share/doc/qt/html/qhttprequestheader.html
-share/doc/qt/html/qhttpresponseheader-members.html
-share/doc/qt/html/qhttpresponseheader.html
-share/doc/qt/html/qicondrag-members.html
-share/doc/qt/html/qicondrag.html
-share/doc/qt/html/qicondragevent-members.html
-share/doc/qt/html/qicondragevent.html
-share/doc/qt/html/qicondragitem-members.html
-share/doc/qt/html/qicondragitem.html
-share/doc/qt/html/qiconfactory-members.html
-share/doc/qt/html/qiconfactory.html
-share/doc/qt/html/qiconset-h.html
-share/doc/qt/html/qiconset-members.html
-share/doc/qt/html/qiconset.html
-share/doc/qt/html/qiconview-h.html
-share/doc/qt/html/qiconview-m.png
-share/doc/qt/html/qiconview-members.html
-share/doc/qt/html/qiconview-w.png
-share/doc/qt/html/qiconview.html
-share/doc/qt/html/qiconviewitem-members.html
-share/doc/qt/html/qiconviewitem.html
-share/doc/qt/html/qimage-h.html
-share/doc/qt/html/qimage-members.html
-share/doc/qt/html/qimage.html
-share/doc/qt/html/qimageconsumer-members.html
-share/doc/qt/html/qimageconsumer.html
-share/doc/qt/html/qimagedecoder-members.html
-share/doc/qt/html/qimagedecoder.html
-share/doc/qt/html/qimagedrag-members.html
-share/doc/qt/html/qimagedrag.html
-share/doc/qt/html/qimageformat-members.html
-share/doc/qt/html/qimageformat.html
-share/doc/qt/html/qimageformatplugin-h.html
-share/doc/qt/html/qimageformatplugin-members.html
-share/doc/qt/html/qimageformatplugin.html
-share/doc/qt/html/qimageformattype-members.html
-share/doc/qt/html/qimageformattype.html
-share/doc/qt/html/qimageio-members.html
-share/doc/qt/html/qimageio.html
-share/doc/qt/html/qimevent-members.html
-share/doc/qt/html/qimevent.html
-share/doc/qt/html/qinputdialog-h.html
-share/doc/qt/html/qinputdialog-members.html
-share/doc/qt/html/qinputdialog.html
-share/doc/qt/html/qintcache-h.html
-share/doc/qt/html/qintcache-members.html
-share/doc/qt/html/qintcache.html
-share/doc/qt/html/qintcacheiterator-members.html
-share/doc/qt/html/qintcacheiterator.html
-share/doc/qt/html/qintdict-h.html
-share/doc/qt/html/qintdict-members.html
-share/doc/qt/html/qintdict.html
-share/doc/qt/html/qintdictiterator-members.html
-share/doc/qt/html/qintdictiterator.html
-share/doc/qt/html/qintvalidator-members.html
-share/doc/qt/html/qintvalidator.html
-share/doc/qt/html/qiodevice-h.html
-share/doc/qt/html/qiodevice-members.html
-share/doc/qt/html/qiodevice.html
-share/doc/qt/html/qiodevicesource-members.html
-share/doc/qt/html/qiodevicesource.html
-share/doc/qt/html/qjiscodec-h.html
-share/doc/qt/html/qjiscodec-members.html
-share/doc/qt/html/qjiscodec.html
-share/doc/qt/html/qkbddriverfactory-members.html
-share/doc/qt/html/qkbddriverfactory.html
-share/doc/qt/html/qkbddriverfactory_qws-h.html
-share/doc/qt/html/qkbddriverplugin-members.html
-share/doc/qt/html/qkbddriverplugin.html
-share/doc/qt/html/qkbddriverplugin_qws-h.html
-share/doc/qt/html/qkeyboard_qws-h.html
-share/doc/qt/html/qkeyevent-members.html
-share/doc/qt/html/qkeyevent.html
-share/doc/qt/html/qkeysequence-h.html
-share/doc/qt/html/qkeysequence-members.html
-share/doc/qt/html/qkeysequence.html
-share/doc/qt/html/qlabel-h.html
-share/doc/qt/html/qlabel-m.png
-share/doc/qt/html/qlabel-members.html
-share/doc/qt/html/qlabel-w.png
-share/doc/qt/html/qlabel.html
-share/doc/qt/html/qlayout-h.html
-share/doc/qt/html/qlayout-members.html
-share/doc/qt/html/qlayout.html
-share/doc/qt/html/qlayoutitem-members.html
-share/doc/qt/html/qlayoutitem.html
-share/doc/qt/html/qlayoutiterator-members.html
-share/doc/qt/html/qlayoutiterator.html
-share/doc/qt/html/qlcdnum-m.png
-share/doc/qt/html/qlcdnum-w.png
-share/doc/qt/html/qlcdnumber-h.html
-share/doc/qt/html/qlcdnumber-members.html
-share/doc/qt/html/qlcdnumber.html
-share/doc/qt/html/qlibrary-h.html
-share/doc/qt/html/qlibrary-members.html
-share/doc/qt/html/qlibrary.html
-share/doc/qt/html/qlined-m.png
-share/doc/qt/html/qlined-w.png
-share/doc/qt/html/qlineedit-h.html
-share/doc/qt/html/qlineedit-members.html
-share/doc/qt/html/qlineedit.html
-share/doc/qt/html/qlist.html
-share/doc/qt/html/qlistbox-h.html
-share/doc/qt/html/qlistbox-m.png
-share/doc/qt/html/qlistbox-members.html
-share/doc/qt/html/qlistbox-w.png
-share/doc/qt/html/qlistbox.html
-share/doc/qt/html/qlistboxitem-members.html
-share/doc/qt/html/qlistboxitem.html
-share/doc/qt/html/qlistboxpixmap-members.html
-share/doc/qt/html/qlistboxpixmap.html
-share/doc/qt/html/qlistboxtext-members.html
-share/doc/qt/html/qlistboxtext.html
-share/doc/qt/html/qlistiterator.html
-share/doc/qt/html/qlistview-h.html
-share/doc/qt/html/qlistview-m.png
-share/doc/qt/html/qlistview-members.html
-share/doc/qt/html/qlistview-w.png
-share/doc/qt/html/qlistview.html
-share/doc/qt/html/qlistviewitem-members.html
-share/doc/qt/html/qlistviewitem.html
-share/doc/qt/html/qlistviewitemiterator-members.html
-share/doc/qt/html/qlistviewitemiterator.html
-share/doc/qt/html/qlistviewitems.png
-share/doc/qt/html/qlocale-h.html
-share/doc/qt/html/qlocale-members.html
-share/doc/qt/html/qlocale.html
-share/doc/qt/html/qlocalfs-h.html
-share/doc/qt/html/qlocalfs-members.html
-share/doc/qt/html/qlocalfs.html
-share/doc/qt/html/qmacmime-members.html
-share/doc/qt/html/qmacmime.html
-share/doc/qt/html/qmacstyle-members.html
-share/doc/qt/html/qmacstyle.html
-share/doc/qt/html/qmacstyle_mac-h.html
-share/doc/qt/html/qmag-example.html
-share/doc/qt/html/qmainwindow-h.html
-share/doc/qt/html/qmainwindow-m.png
-share/doc/qt/html/qmainwindow-members.html
-share/doc/qt/html/qmainwindow-qdockareas.png
-share/doc/qt/html/qmainwindow-w.png
-share/doc/qt/html/qmainwindow.html
-share/doc/qt/html/qmap-h.html
-share/doc/qt/html/qmap-members.html
-share/doc/qt/html/qmap.html
-share/doc/qt/html/qmapconstiterator-members.html
-share/doc/qt/html/qmapconstiterator.html
-share/doc/qt/html/qmapiterator-members.html
-share/doc/qt/html/qmapiterator.html
-share/doc/qt/html/qmemarray-h.html
-share/doc/qt/html/qmemarray-members.html
-share/doc/qt/html/qmemarray.html
-share/doc/qt/html/qmenubar-h.html
-share/doc/qt/html/qmenubar-m.png
-share/doc/qt/html/qmenubar-members.html
-share/doc/qt/html/qmenubar-w.png
-share/doc/qt/html/qmenubar.html
-share/doc/qt/html/qmenudata-h.html
-share/doc/qt/html/qmenudata-members.html
-share/doc/qt/html/qmenudata.html
-share/doc/qt/html/qmessagebox-crit.png
-share/doc/qt/html/qmessagebox-h.html
-share/doc/qt/html/qmessagebox-info.png
-share/doc/qt/html/qmessagebox-members.html
-share/doc/qt/html/qmessagebox-quest.png
-share/doc/qt/html/qmessagebox-warn.png
-share/doc/qt/html/qmessagebox.html
-share/doc/qt/html/qmetaobject-h.html
-share/doc/qt/html/qmetaobject-members.html
-share/doc/qt/html/qmetaobject.html
-share/doc/qt/html/qmetaproperty-members.html
-share/doc/qt/html/qmetaproperty.html
-share/doc/qt/html/qmime-h.html
-share/doc/qt/html/qmimesource-members.html
-share/doc/qt/html/qmimesource.html
-share/doc/qt/html/qmimesourcefactory-members.html
-share/doc/qt/html/qmimesourcefactory.html
-share/doc/qt/html/qmlined-m.png
-share/doc/qt/html/qmlined-w.png
-share/doc/qt/html/qmotif-h.html
-share/doc/qt/html/qmotif-members.html
-share/doc/qt/html/qmotif.html
-share/doc/qt/html/qmotifdialog-h.html
-share/doc/qt/html/qmotifdialog-members.html
-share/doc/qt/html/qmotifdialog.html
-share/doc/qt/html/qmotifplusstyle-h.html
-share/doc/qt/html/qmotifplusstyle-members.html
-share/doc/qt/html/qmotifplusstyle.html
-share/doc/qt/html/qmotifstyle-h.html
-share/doc/qt/html/qmotifstyle-members.html
-share/doc/qt/html/qmotifstyle.html
-share/doc/qt/html/qmotifwidget-h.html
-share/doc/qt/html/qmotifwidget-members.html
-share/doc/qt/html/qmotifwidget.html
-share/doc/qt/html/qmouse_qws-h.html
-share/doc/qt/html/qmousedriverfactory-members.html
-share/doc/qt/html/qmousedriverfactory.html
-share/doc/qt/html/qmousedriverfactory_qws-h.html
-share/doc/qt/html/qmousedriverplugin-members.html
-share/doc/qt/html/qmousedriverplugin.html
-share/doc/qt/html/qmousedriverplugin_qws-h.html
-share/doc/qt/html/qmouseevent-members.html
-share/doc/qt/html/qmouseevent.html
-share/doc/qt/html/qmoveevent-members.html
-share/doc/qt/html/qmoveevent.html
-share/doc/qt/html/qmovie-h.html
-share/doc/qt/html/qmovie-members.html
-share/doc/qt/html/qmovie.html
-share/doc/qt/html/qmovie.png
-share/doc/qt/html/qmsgbox-m.png
-share/doc/qt/html/qmsgbox-w.png
-share/doc/qt/html/qmultilineedit-h.html
-share/doc/qt/html/qmultilineedit-members.html
-share/doc/qt/html/qmultilineedit.html
-share/doc/qt/html/qmutex-h.html
-share/doc/qt/html/qmutex-members.html
-share/doc/qt/html/qmutex.html
-share/doc/qt/html/qmutexlocker-members.html
-share/doc/qt/html/qmutexlocker.html
-share/doc/qt/html/qnamespace-h.html
-share/doc/qt/html/qnetwork-h.html
-share/doc/qt/html/qnetworkoperation-members.html
-share/doc/qt/html/qnetworkoperation.html
-share/doc/qt/html/qnetworkprotocol-h.html
-share/doc/qt/html/qnetworkprotocol-members.html
-share/doc/qt/html/qnetworkprotocol.html
-share/doc/qt/html/qnp-h.html
-share/doc/qt/html/qnpinstance-members.html
-share/doc/qt/html/qnpinstance.html
-share/doc/qt/html/qnplugin-members.html
-share/doc/qt/html/qnplugin.html
-share/doc/qt/html/qnpstream-members.html
-share/doc/qt/html/qnpstream.html
-share/doc/qt/html/qnpwidget-members.html
-share/doc/qt/html/qnpwidget.html
-share/doc/qt/html/qobject-h.html
-share/doc/qt/html/qobject-members.html
-share/doc/qt/html/qobject.html
-share/doc/qt/html/qobjectcleanuphandler-h.html
-share/doc/qt/html/qobjectcleanuphandler-members.html
-share/doc/qt/html/qobjectcleanuphandler.html
-share/doc/qt/html/qobjectlist-h.html
-share/doc/qt/html/qobjectlist-members.html
-share/doc/qt/html/qobjectlist.html
-share/doc/qt/html/qobjectlistiterator-members.html
-share/doc/qt/html/qobjectlistiterator.html
-share/doc/qt/html/qpaintdevice-h.html
-share/doc/qt/html/qpaintdevice-members.html
-share/doc/qt/html/qpaintdevice.html
-share/doc/qt/html/qpaintdevicemetrics-h.html
-share/doc/qt/html/qpaintdevicemetrics-members.html
-share/doc/qt/html/qpaintdevicemetrics.html
-share/doc/qt/html/qpainter-h.html
-share/doc/qt/html/qpainter-members.html
-share/doc/qt/html/qpainter.html
-share/doc/qt/html/qpaintevent-members.html
-share/doc/qt/html/qpaintevent.html
-share/doc/qt/html/qpair-h.html
-share/doc/qt/html/qpair-members.html
-share/doc/qt/html/qpair.html
-share/doc/qt/html/qpalette-h.html
-share/doc/qt/html/qpalette-members.html
-share/doc/qt/html/qpalette.html
-share/doc/qt/html/qpen-h.html
-share/doc/qt/html/qpen-members.html
-share/doc/qt/html/qpen.html
-share/doc/qt/html/qpicture-h.html
-share/doc/qt/html/qpicture-members.html
-share/doc/qt/html/qpicture.html
-share/doc/qt/html/qpixmap-h.html
-share/doc/qt/html/qpixmap-members.html
-share/doc/qt/html/qpixmap.html
-share/doc/qt/html/qpixmapcache-h.html
-share/doc/qt/html/qpixmapcache-members.html
-share/doc/qt/html/qpixmapcache.html
-share/doc/qt/html/qplatinumstyle-h.html
-share/doc/qt/html/qplatinumstyle-members.html
-share/doc/qt/html/qplatinumstyle.html
-share/doc/qt/html/qpngimagepacker-members.html
-share/doc/qt/html/qpngimagepacker.html
-share/doc/qt/html/qpngio-h.html
-share/doc/qt/html/qpoint-h.html
-share/doc/qt/html/qpoint-members.html
-share/doc/qt/html/qpoint.html
-share/doc/qt/html/qpointarray-h.html
-share/doc/qt/html/qpointarray-members.html
-share/doc/qt/html/qpointarray.html
-share/doc/qt/html/qpopmenu-fancy.png
-share/doc/qt/html/qpopmenu-m.png
-share/doc/qt/html/qpopmenu-w.png
-share/doc/qt/html/qpopupmenu-h.html
-share/doc/qt/html/qpopupmenu-members.html
-share/doc/qt/html/qpopupmenu.html
-share/doc/qt/html/qprintdlg-m.png
-share/doc/qt/html/qprinter-h.html
-share/doc/qt/html/qprinter-members.html
-share/doc/qt/html/qprinter.html
-share/doc/qt/html/qprocess-examples.html
-share/doc/qt/html/qprocess-h.html
-share/doc/qt/html/qprocess-members.html
-share/doc/qt/html/qprocess.html
-share/doc/qt/html/qprogbar-m.png
-share/doc/qt/html/qprogbar-w.png
-share/doc/qt/html/qprogdlg-m.png
-share/doc/qt/html/qprogdlg-w.png
-share/doc/qt/html/qprogressbar-h.html
-share/doc/qt/html/qprogressbar-members.html
-share/doc/qt/html/qprogressbar.html
-share/doc/qt/html/qprogressdialog-h.html
-share/doc/qt/html/qprogressdialog-members.html
-share/doc/qt/html/qprogressdialog.html
-share/doc/qt/html/qptrcollection-h.html
-share/doc/qt/html/qptrcollection-members.html
-share/doc/qt/html/qptrcollection.html
-share/doc/qt/html/qptrdict-h.html
-share/doc/qt/html/qptrdict-members.html
-share/doc/qt/html/qptrdict.html
-share/doc/qt/html/qptrdictiterator-members.html
-share/doc/qt/html/qptrdictiterator.html
-share/doc/qt/html/qptrlist-h.html
-share/doc/qt/html/qptrlist-members.html
-share/doc/qt/html/qptrlist.html
-share/doc/qt/html/qptrlistiterator-members.html
-share/doc/qt/html/qptrlistiterator.html
-share/doc/qt/html/qptrqueue-h.html
-share/doc/qt/html/qptrqueue-members.html
-share/doc/qt/html/qptrqueue.html
-share/doc/qt/html/qptrstack-h.html
-share/doc/qt/html/qptrstack-members.html
-share/doc/qt/html/qptrstack.html
-share/doc/qt/html/qptrvector-h.html
-share/doc/qt/html/qptrvector-members.html
-share/doc/qt/html/qptrvector.html
-share/doc/qt/html/qpushbt-m.png
-share/doc/qt/html/qpushbt-w.png
-share/doc/qt/html/qpushbutton-h.html
-share/doc/qt/html/qpushbutton-members.html
-share/doc/qt/html/qpushbutton.html
-share/doc/qt/html/qqueue.html
-share/doc/qt/html/qradiobt-m.png
-share/doc/qt/html/qradiobt-w.png
-share/doc/qt/html/qradiobutton-h.html
-share/doc/qt/html/qradiobutton-members.html
-share/doc/qt/html/qradiobutton.html
-share/doc/qt/html/qrangecontrol-h.html
-share/doc/qt/html/qrangecontrol-members.html
-share/doc/qt/html/qrangecontrol.html
-share/doc/qt/html/qrect-h.html
-share/doc/qt/html/qrect-members.html
-share/doc/qt/html/qrect.html
-share/doc/qt/html/qregexp-h.html
-share/doc/qt/html/qregexp-members.html
-share/doc/qt/html/qregexp.html
-share/doc/qt/html/qregexpvalidator-members.html
-share/doc/qt/html/qregexpvalidator.html
-share/doc/qt/html/qregion-h.html
-share/doc/qt/html/qregion-members.html
-share/doc/qt/html/qregion.html
-share/doc/qt/html/qresizeevent-members.html
-share/doc/qt/html/qresizeevent.html
-share/doc/qt/html/qrtlcodec-h.html
-share/doc/qt/html/qs-addwidg.png
-share/doc/qt/html/qs-editconn1.png
-share/doc/qt/html/qs-editconn2.png
-share/doc/qt/html/qs-editfunc.png
-share/doc/qt/html/qs-editlistbox1.png
-share/doc/qt/html/qs-laygrid.png
-share/doc/qt/html/qs-layhoriz.png
-share/doc/qt/html/qs-layvert.png
-share/doc/qt/html/qs-newdlg.png
-share/doc/qt/html/qs-projset.png
-share/doc/qt/html/qs-pushbutt.png
-share/doc/qt/html/qs-spacers.png
-share/doc/qt/html/qs-taborder.png
-share/doc/qt/html/qs-txtlbl.png
-share/doc/qt/html/qscrbar-m.png
-share/doc/qt/html/qscrbar-w.png
-share/doc/qt/html/qscreen-members.html
-share/doc/qt/html/qscreen.html
-share/doc/qt/html/qscrollbar-h.html
-share/doc/qt/html/qscrollbar-members.html
-share/doc/qt/html/qscrollbar.html
-share/doc/qt/html/qscrollview-cl.png
-share/doc/qt/html/qscrollview-h.html
-share/doc/qt/html/qscrollview-m.png
-share/doc/qt/html/qscrollview-members.html
-share/doc/qt/html/qscrollview-vp.png
-share/doc/qt/html/qscrollview-vp2.png
-share/doc/qt/html/qscrollview-w.png
-share/doc/qt/html/qscrollview.html
-share/doc/qt/html/qsemaphore-h.html
-share/doc/qt/html/qsemaphore-members.html
-share/doc/qt/html/qsemaphore.html
-share/doc/qt/html/qserversocket-h.html
-share/doc/qt/html/qserversocket-members.html
-share/doc/qt/html/qserversocket.html
-share/doc/qt/html/qsessionmanager-h.html
-share/doc/qt/html/qsessionmanager-members.html
-share/doc/qt/html/qsessionmanager.html
-share/doc/qt/html/qsettings-h.html
-share/doc/qt/html/qsettings-members.html
-share/doc/qt/html/qsettings.html
-share/doc/qt/html/qsgistyle-h.html
-share/doc/qt/html/qsgistyle-members.html
-share/doc/qt/html/qsgistyle.html
-share/doc/qt/html/qshowevent-members.html
-share/doc/qt/html/qshowevent.html
-share/doc/qt/html/qsignal-h.html
-share/doc/qt/html/qsignal-members.html
-share/doc/qt/html/qsignal.html
-share/doc/qt/html/qsignalmapper-h.html
-share/doc/qt/html/qsignalmapper-members.html
-share/doc/qt/html/qsignalmapper.html
-share/doc/qt/html/qsimplerichtext-h.html
-share/doc/qt/html/qsimplerichtext-members.html
-share/doc/qt/html/qsimplerichtext.html
-share/doc/qt/html/qsize-h.html
-share/doc/qt/html/qsize-members.html
-share/doc/qt/html/qsize.html
-share/doc/qt/html/qsizegrip-h.html
-share/doc/qt/html/qsizegrip-m.png
-share/doc/qt/html/qsizegrip-members.html
-share/doc/qt/html/qsizegrip-w.png
-share/doc/qt/html/qsizegrip.html
-share/doc/qt/html/qsizepolicy-h.html
-share/doc/qt/html/qsizepolicy-members.html
-share/doc/qt/html/qsizepolicy.html
-share/doc/qt/html/qsjiscodec-h.html
-share/doc/qt/html/qsjiscodec-members.html
-share/doc/qt/html/qsjiscodec.html
-share/doc/qt/html/qslider-h.html
-share/doc/qt/html/qslider-m.png
-share/doc/qt/html/qslider-members.html
-share/doc/qt/html/qslider-w.png
-share/doc/qt/html/qslider.html
-share/doc/qt/html/qsmetric.png
-share/doc/qt/html/qsocket-h.html
-share/doc/qt/html/qsocket-members.html
-share/doc/qt/html/qsocket.html
-share/doc/qt/html/qsocketdevice-h.html
-share/doc/qt/html/qsocketdevice-members.html
-share/doc/qt/html/qsocketdevice.html
-share/doc/qt/html/qsocketnotifier-h.html
-share/doc/qt/html/qsocketnotifier-members.html
-share/doc/qt/html/qsocketnotifier.html
-share/doc/qt/html/qsortedlist-h.html
-share/doc/qt/html/qsortedlist-members.html
-share/doc/qt/html/qsortedlist.html
-share/doc/qt/html/qsound-h.html
-share/doc/qt/html/qsound-members.html
-share/doc/qt/html/qsound.html
-share/doc/qt/html/qspaceritem-members.html
-share/doc/qt/html/qspaceritem.html
-share/doc/qt/html/qspinbox-h.html
-share/doc/qt/html/qspinbox-m.png
-share/doc/qt/html/qspinbox-members.html
-share/doc/qt/html/qspinbox-w.png
-share/doc/qt/html/qspinbox.html
-share/doc/qt/html/qsplashscreen-h.html
-share/doc/qt/html/qsplashscreen-members.html
-share/doc/qt/html/qsplashscreen.html
-share/doc/qt/html/qsplitter-h.html
-share/doc/qt/html/qsplitter-m.png
-share/doc/qt/html/qsplitter-members.html
-share/doc/qt/html/qsplitter-w.png
-share/doc/qt/html/qsplitter.html
-share/doc/qt/html/qsql-h.html
-share/doc/qt/html/qsql-members.html
-share/doc/qt/html/qsql.html
-share/doc/qt/html/qsqlcursor-h.html
-share/doc/qt/html/qsqlcursor-members.html
-share/doc/qt/html/qsqlcursor.html
-share/doc/qt/html/qsqldatabase-h.html
-share/doc/qt/html/qsqldatabase-members.html
-share/doc/qt/html/qsqldatabase.html
-share/doc/qt/html/qsqldriver-h.html
-share/doc/qt/html/qsqldriver-members.html
-share/doc/qt/html/qsqldriver.html
-share/doc/qt/html/qsqldriverplugin-h.html
-share/doc/qt/html/qsqldriverplugin-members.html
-share/doc/qt/html/qsqldriverplugin.html
-share/doc/qt/html/qsqleditorfactory-h.html
-share/doc/qt/html/qsqleditorfactory-members.html
-share/doc/qt/html/qsqleditorfactory.html
-share/doc/qt/html/qsqlerror-h.html
-share/doc/qt/html/qsqlerror-members.html
-share/doc/qt/html/qsqlerror.html
-share/doc/qt/html/qsqlfield-h.html
-share/doc/qt/html/qsqlfield-members.html
-share/doc/qt/html/qsqlfield.html
-share/doc/qt/html/qsqlfieldinfo-members.html
-share/doc/qt/html/qsqlfieldinfo.html
-share/doc/qt/html/qsqlform-h.html
-share/doc/qt/html/qsqlform-members.html
-share/doc/qt/html/qsqlform.html
-share/doc/qt/html/qsqlindex-h.html
-share/doc/qt/html/qsqlindex-members.html
-share/doc/qt/html/qsqlindex.html
-share/doc/qt/html/qsqlpropertymap-h.html
-share/doc/qt/html/qsqlpropertymap-members.html
-share/doc/qt/html/qsqlpropertymap.html
-share/doc/qt/html/qsqlquery-h.html
-share/doc/qt/html/qsqlquery-members.html
-share/doc/qt/html/qsqlquery.html
-share/doc/qt/html/qsqlrecord-h.html
-share/doc/qt/html/qsqlrecord-members.html
-share/doc/qt/html/qsqlrecord.html
-share/doc/qt/html/qsqlrecordinfo-members.html
-share/doc/qt/html/qsqlrecordinfo.html
-share/doc/qt/html/qsqlresult-h.html
-share/doc/qt/html/qsqlresult-members.html
-share/doc/qt/html/qsqlresult.html
-share/doc/qt/html/qsqlselectcursor-h.html
-share/doc/qt/html/qsqlselectcursor-members.html
-share/doc/qt/html/qsqlselectcursor.html
-share/doc/qt/html/qstack.html
-share/doc/qt/html/qstatusbar-h.html
-share/doc/qt/html/qstatusbar-m.png
-share/doc/qt/html/qstatusbar-members.html
-share/doc/qt/html/qstatusbar-w.png
-share/doc/qt/html/qstatusbar.html
-share/doc/qt/html/qstoreddrag-members.html
-share/doc/qt/html/qstoreddrag.html
-share/doc/qt/html/qstrilist-members.html
-share/doc/qt/html/qstrilist.html
-share/doc/qt/html/qstring-h.html
-share/doc/qt/html/qstring-members.html
-share/doc/qt/html/qstring.html
-share/doc/qt/html/qstringlist-h.html
-share/doc/qt/html/qstringlist-members.html
-share/doc/qt/html/qstringlist.html
-share/doc/qt/html/qstrlist-h.html
-share/doc/qt/html/qstrlist-members.html
-share/doc/qt/html/qstrlist.html
-share/doc/qt/html/qstrlistiterator-members.html
-share/doc/qt/html/qstrlistiterator.html
-share/doc/qt/html/qstyle-h.html
-share/doc/qt/html/qstyle-members.html
-share/doc/qt/html/qstyle.html
-share/doc/qt/html/qstylefactory-h.html
-share/doc/qt/html/qstylefactory-members.html
-share/doc/qt/html/qstylefactory.html
-share/doc/qt/html/qstyleoption-members.html
-share/doc/qt/html/qstyleoption.html
-share/doc/qt/html/qstyleplugin-h.html
-share/doc/qt/html/qstyleplugin-members.html
-share/doc/qt/html/qstyleplugin.html
-share/doc/qt/html/qstylesheet-h.html
-share/doc/qt/html/qstylesheet-members.html
-share/doc/qt/html/qstylesheet.html
-share/doc/qt/html/qstylesheetitem-members.html
-share/doc/qt/html/qstylesheetitem.html
-share/doc/qt/html/qsyntaxhighlighter-h.html
-share/doc/qt/html/qsyntaxhighlighter-members.html
-share/doc/qt/html/qsyntaxhighlighter.html
-share/doc/qt/html/qt-colors.png
-share/doc/qt/html/qt-members.html
-share/doc/qt/html/qt-template-lib.html
-share/doc/qt/html/qt.dcf
-share/doc/qt/html/qt.html
-share/doc/qt/html/qt33-class-chart.png
-share/doc/qt/html/qtab-members.html
-share/doc/qt/html/qtab.html
-share/doc/qt/html/qtabbar-h.html
-share/doc/qt/html/qtabbar-m.png
-share/doc/qt/html/qtabbar-members.html
-share/doc/qt/html/qtabbar-w.png
-share/doc/qt/html/qtabbar.html
-share/doc/qt/html/qtabdialog-h.html
-share/doc/qt/html/qtabdialog-members.html
-share/doc/qt/html/qtabdialog.html
-share/doc/qt/html/qtabdlg-m.png
-share/doc/qt/html/qtabdlg-w.png
-share/doc/qt/html/qtable-h.html
-share/doc/qt/html/qtable-members.html
-share/doc/qt/html/qtable.html
-share/doc/qt/html/qtable.png
-share/doc/qt/html/qtableitem-members.html
-share/doc/qt/html/qtableitem.html
-share/doc/qt/html/qtableitems.png
-share/doc/qt/html/qtableselection-members.html
-share/doc/qt/html/qtableselection.html
-share/doc/qt/html/qtabletevent-members.html
-share/doc/qt/html/qtabletevent.html
-share/doc/qt/html/qtabwidget-h.html
-share/doc/qt/html/qtabwidget-m.png
-share/doc/qt/html/qtabwidget-members.html
-share/doc/qt/html/qtabwidget-w.png
-share/doc/qt/html/qtabwidget.html
-share/doc/qt/html/qtextbrowser-h.html
-share/doc/qt/html/qtextbrowser-m.png
-share/doc/qt/html/qtextbrowser-members.html
-share/doc/qt/html/qtextbrowser-w.png
-share/doc/qt/html/qtextbrowser.html
-share/doc/qt/html/qtextcodec-h.html
-share/doc/qt/html/qtextcodec-members.html
-share/doc/qt/html/qtextcodec.html
-share/doc/qt/html/qtextcodecplugin-h.html
-share/doc/qt/html/qtextcodecplugin-members.html
-share/doc/qt/html/qtextcodecplugin.html
-share/doc/qt/html/qtextdecoder-members.html
-share/doc/qt/html/qtextdecoder.html
-share/doc/qt/html/qtextdrag-members.html
-share/doc/qt/html/qtextdrag.html
-share/doc/qt/html/qtextedit-h.html
-share/doc/qt/html/qtextedit-members.html
-share/doc/qt/html/qtextedit.html
-share/doc/qt/html/qtextencoder-members.html
-share/doc/qt/html/qtextencoder.html
-share/doc/qt/html/qtextistream-members.html
-share/doc/qt/html/qtextistream.html
-share/doc/qt/html/qtextostream-members.html
-share/doc/qt/html/qtextostream.html
-share/doc/qt/html/qtextstream-h.html
-share/doc/qt/html/qtextstream-members.html
-share/doc/qt/html/qtextstream.html
-share/doc/qt/html/qtextview-h.html
-share/doc/qt/html/qtextview-members.html
-share/doc/qt/html/qtextview.html
-share/doc/qt/html/qthread-h.html
-share/doc/qt/html/qthread-members.html
-share/doc/qt/html/qthread.html
-share/doc/qt/html/qthreadstorage-h.html
-share/doc/qt/html/qthreadstorage-members.html
-share/doc/qt/html/qthreadstorage.html
-share/doc/qt/html/qtime-members.html
-share/doc/qt/html/qtime.html
-share/doc/qt/html/qtimeedit-members.html
-share/doc/qt/html/qtimeedit.html
-share/doc/qt/html/qtimer-h.html
-share/doc/qt/html/qtimer-members.html
-share/doc/qt/html/qtimer.html
-share/doc/qt/html/qtimerevent-members.html
-share/doc/qt/html/qtimerevent.html
-share/doc/qt/html/qtl-qvaluelist-example.html
-share/doc/qt/html/qtl.html
-share/doc/qt/html/qtmac-as-native.html
-share/doc/qt/html/qtoolbar-h.html
-share/doc/qt/html/qtoolbar-members.html
-share/doc/qt/html/qtoolbar.html
-share/doc/qt/html/qtoolbox-h.html
-share/doc/qt/html/qtoolbox-members.html
-share/doc/qt/html/qtoolbox.html
-share/doc/qt/html/qtoolbutton-h.html
-share/doc/qt/html/qtoolbutton-members.html
-share/doc/qt/html/qtoolbutton.html
-share/doc/qt/html/qtooltip-h.html
-share/doc/qt/html/qtooltip-members.html
-share/doc/qt/html/qtooltip.html
-share/doc/qt/html/qtooltipgroup-members.html
-share/doc/qt/html/qtooltipgroup.html
-share/doc/qt/html/qtranslator-h.html
-share/doc/qt/html/qtranslator-members.html
-share/doc/qt/html/qtranslator.html
-share/doc/qt/html/qtranslatormessage-members.html
-share/doc/qt/html/qtranslatormessage.html
-share/doc/qt/html/qtsciicodec-h.html
-share/doc/qt/html/qtsciicodec-members.html
-share/doc/qt/html/qtsciicodec.html
-share/doc/qt/html/quridrag-members.html
-share/doc/qt/html/quridrag.html
-share/doc/qt/html/qurl-h.html
-share/doc/qt/html/qurl-members.html
-share/doc/qt/html/qurl.html
-share/doc/qt/html/qurlinfo-h.html
-share/doc/qt/html/qurlinfo-members.html
-share/doc/qt/html/qurlinfo.html
-share/doc/qt/html/qurloperator-h.html
-share/doc/qt/html/qurloperator-members.html
-share/doc/qt/html/qurloperator.html
-share/doc/qt/html/quuid-h.html
-share/doc/qt/html/quuid-members.html
-share/doc/qt/html/quuid.html
-share/doc/qt/html/qvalidator-h.html
-share/doc/qt/html/qvalidator-members.html
-share/doc/qt/html/qvalidator.html
-share/doc/qt/html/qvaluelist-h.html
-share/doc/qt/html/qvaluelist-members.html
-share/doc/qt/html/qvaluelist.html
-share/doc/qt/html/qvaluelistconstiterator-members.html
-share/doc/qt/html/qvaluelistconstiterator.html
-share/doc/qt/html/qvaluelistiterator-members.html
-share/doc/qt/html/qvaluelistiterator.html
-share/doc/qt/html/qvaluestack-h.html
-share/doc/qt/html/qvaluestack-members.html
-share/doc/qt/html/qvaluestack.html
-share/doc/qt/html/qvaluevector-h.html
-share/doc/qt/html/qvaluevector-members.html
-share/doc/qt/html/qvaluevector.html
-share/doc/qt/html/qvariant-h.html
-share/doc/qt/html/qvariant-members.html
-share/doc/qt/html/qvariant.html
-share/doc/qt/html/qvbox-h.html
-share/doc/qt/html/qvbox-m.png
-share/doc/qt/html/qvbox-members.html
-share/doc/qt/html/qvbox.html
-share/doc/qt/html/qvboxlayout-members.html
-share/doc/qt/html/qvboxlayout.html
-share/doc/qt/html/qvboxlayout.png
-share/doc/qt/html/qvbuttongroup-h.html
-share/doc/qt/html/qvbuttongroup-members.html
-share/doc/qt/html/qvbuttongroup.html
-share/doc/qt/html/qvector.html
-share/doc/qt/html/qvgroupbox-h.html
-share/doc/qt/html/qvgroupbox-members.html
-share/doc/qt/html/qvgroupbox.html
-share/doc/qt/html/qwaitcondition-h.html
-share/doc/qt/html/qwaitcondition-members.html
-share/doc/qt/html/qwaitcondition.html
-share/doc/qt/html/qwerty-example.html
-share/doc/qt/html/qwhatsthis-h.html
-share/doc/qt/html/qwhatsthis-members.html
-share/doc/qt/html/qwhatsthis.html
-share/doc/qt/html/qwheelevent-members.html
-share/doc/qt/html/qwheelevent.html
-share/doc/qt/html/qwidget-h.html
-share/doc/qt/html/qwidget-members.html
-share/doc/qt/html/qwidget.html
-share/doc/qt/html/qwidgetfactory-h.html
-share/doc/qt/html/qwidgetfactory-members.html
-share/doc/qt/html/qwidgetfactory.html
-share/doc/qt/html/qwidgetitem-members.html
-share/doc/qt/html/qwidgetitem.html
-share/doc/qt/html/qwidgetplugin-h.html
-share/doc/qt/html/qwidgetplugin-members.html
-share/doc/qt/html/qwidgetplugin.html
-share/doc/qt/html/qwidgetstack-h.html
-share/doc/qt/html/qwidgetstack-members.html
-share/doc/qt/html/qwidgetstack.html
-share/doc/qt/html/qwindowdefs-h.html
-share/doc/qt/html/qwindowsmime-members.html
-share/doc/qt/html/qwindowsmime.html
-share/doc/qt/html/qwindowsstyle-h.html
-share/doc/qt/html/qwindowsstyle-members.html
-share/doc/qt/html/qwindowsstyle.html
-share/doc/qt/html/qwindowsystem_qws-h.html
-share/doc/qt/html/qwizard-h.html
-share/doc/qt/html/qwizard-members.html
-share/doc/qt/html/qwizard.html
-share/doc/qt/html/qwizard.png
-share/doc/qt/html/qwmatrix-h.html
-share/doc/qt/html/qwmatrix-members.html
-share/doc/qt/html/qwmatrix.html
-share/doc/qt/html/qworkspace-h.html
-share/doc/qt/html/qworkspace-members.html
-share/doc/qt/html/qworkspace.html
-share/doc/qt/html/qws.html
-share/doc/qt/html/qwsdecoration-members.html
-share/doc/qt/html/qwsdecoration.html
-share/doc/qt/html/qwsdecoration_qws-h.html
-share/doc/qt/html/qwsinputmethod-members.html
-share/doc/qt/html/qwsinputmethod.html
-share/doc/qt/html/qwskeyboardhandler-members.html
-share/doc/qt/html/qwskeyboardhandler.html
-share/doc/qt/html/qwsmousehandler-members.html
-share/doc/qt/html/qwsmousehandler.html
-share/doc/qt/html/qwsserver-members.html
-share/doc/qt/html/qwsserver.html
-share/doc/qt/html/qwswindow-members.html
-share/doc/qt/html/qwswindow.html
-share/doc/qt/html/qxml-h.html
-share/doc/qt/html/qxmlattributes-members.html
-share/doc/qt/html/qxmlattributes.html
-share/doc/qt/html/qxmlcontenthandler-members.html
-share/doc/qt/html/qxmlcontenthandler.html
-share/doc/qt/html/qxmldeclhandler-members.html
-share/doc/qt/html/qxmldeclhandler.html
-share/doc/qt/html/qxmldefaulthandler-members.html
-share/doc/qt/html/qxmldefaulthandler.html
-share/doc/qt/html/qxmldtdhandler-members.html
-share/doc/qt/html/qxmldtdhandler.html
-share/doc/qt/html/qxmlentityresolver-members.html
-share/doc/qt/html/qxmlentityresolver.html
-share/doc/qt/html/qxmlerrorhandler-members.html
-share/doc/qt/html/qxmlerrorhandler.html
-share/doc/qt/html/qxmlinputsource-members.html
-share/doc/qt/html/qxmlinputsource.html
-share/doc/qt/html/qxmllexicalhandler-members.html
-share/doc/qt/html/qxmllexicalhandler.html
-share/doc/qt/html/qxmllocator-members.html
-share/doc/qt/html/qxmllocator.html
-share/doc/qt/html/qxmlnamespacesupport-members.html
-share/doc/qt/html/qxmlnamespacesupport.html
-share/doc/qt/html/qxmlparseexception-members.html
-share/doc/qt/html/qxmlparseexception.html
-share/doc/qt/html/qxmlreader-members.html
-share/doc/qt/html/qxmlreader.html
-share/doc/qt/html/qxmlsimplereader-members.html
-share/doc/qt/html/qxmlsimplereader.html
-share/doc/qt/html/qxtwidget-h.html
-share/doc/qt/html/qxtwidget-members.html
-share/doc/qt/html/qxtwidget.html
-share/doc/qt/html/rangecontrols-example.html
-share/doc/qt/html/rd-add.png
-share/doc/qt/html/rd-chooseanimage.png
-share/doc/qt/html/rd-chooseapixmap.png
-share/doc/qt/html/rd-configmf.png
-share/doc/qt/html/rd-configtb.png
-share/doc/qt/html/rd-cwidgdef.png
-share/doc/qt/html/rd-cwidgprop.png
-share/doc/qt/html/rd-cwidgsig.png
-share/doc/qt/html/rd-cwidgslot.png
-share/doc/qt/html/rd-dbconn.png
-share/doc/qt/html/rd-ediconview.png
-share/doc/qt/html/rd-editincdec.png
-share/doc/qt/html/rd-edittext1.png
-share/doc/qt/html/rd-edittext2.png
-share/doc/qt/html/rd-edlistbox.png
-share/doc/qt/html/rd-edlistview.png
-share/doc/qt/html/rd-edlistview2.png
-share/doc/qt/html/rd-edpalette.png
-share/doc/qt/html/rd-edtablecol.png
-share/doc/qt/html/rd-edtablerow.png
-share/doc/qt/html/rd-find.png
-share/doc/qt/html/rd-formset.png
-share/doc/qt/html/rd-goto.png
-share/doc/qt/html/rd-image.png
-share/doc/qt/html/rd-open.png
-share/doc/qt/html/rd-pagetitle.png
-share/doc/qt/html/rd-prefedit1.png
-share/doc/qt/html/rd-projset.png
-share/doc/qt/html/rd-projset2.png
-share/doc/qt/html/rd-replace.png
-share/doc/qt/html/rd-saveas.png
-share/doc/qt/html/rd-saveform.png
-share/doc/qt/html/rd-saveformas.png
-share/doc/qt/html/rd-saveprojset.png
-share/doc/qt/html/rd-selcolor.png
-share/doc/qt/html/rd-selfont.png
-share/doc/qt/html/rd-startdesigntab2.png
-share/doc/qt/html/rd-template.png
-share/doc/qt/html/rd-text.png
-share/doc/qt/html/rd-title.png
-share/doc/qt/html/rd-tunepalette.png
-share/doc/qt/html/regexptester-example.html
-share/doc/qt/html/removed20.html
-share/doc/qt/html/richtext-example.html
-share/doc/qt/html/rintersect.png
-share/doc/qt/html/rmo-editmenu.png
-share/doc/qt/html/rmo-filemenu.png
-share/doc/qt/html/rmo-helpmenu.png
-share/doc/qt/html/rmo-layoutmenu.png
-share/doc/qt/html/rmo-previewmenu.png
-share/doc/qt/html/rmo-projectmenu.png
-share/doc/qt/html/rmo-searchmenu.png
-share/doc/qt/html/rmo-toolsmenu.png
-share/doc/qt/html/rmo-windowmenu.png
-share/doc/qt/html/rot-example.html
-share/doc/qt/html/rsubtract.png
-share/doc/qt/html/rtb-edit.png
-share/doc/qt/html/rtb-file.png
-share/doc/qt/html/rtb-layout.png
-share/doc/qt/html/rtb-search.png
-share/doc/qt/html/rtb-tbbuttons.png
-share/doc/qt/html/rtb-tbcontain.png
-share/doc/qt/html/rtb-tbcustom.png
-share/doc/qt/html/rtb-tbdatabase.png
-share/doc/qt/html/rtb-tbdisplay.png
-share/doc/qt/html/rtb-tbinput.png
-share/doc/qt/html/rtb-tbviews.png
-share/doc/qt/html/rtb-toolbox.png
-share/doc/qt/html/rtb-tools.png
-share/doc/qt/html/runion.png
-share/doc/qt/html/rxor.png
-share/doc/qt/html/scaling.png
-share/doc/qt/html/scribble-example.html
-share/doc/qt/html/scrollview-example.html
-share/doc/qt/html/search.png
-share/doc/qt/html/session.html
-share/doc/qt/html/session.png
-share/doc/qt/html/shared.html
-share/doc/qt/html/shclass.html
-share/doc/qt/html/showimg-example.html
-share/doc/qt/html/sidebar.png
-share/doc/qt/html/signalsandslots.html
-share/doc/qt/html/simple-application-example.html
-share/doc/qt/html/simple-application.html
-share/doc/qt/html/simple-font-demo-example.html
-share/doc/qt/html/simple_dd-example.html
-share/doc/qt/html/small-table-example-example.html
-share/doc/qt/html/smooth.png
-share/doc/qt/html/sound-example.html
-share/doc/qt/html/splitter-example.html
-share/doc/qt/html/splitter-views-w.png
-share/doc/qt/html/sql-driver.html
-share/doc/qt/html/sql-examples.html
-share/doc/qt/html/sql-overview-basicbrowsing-main-cpp.html
-share/doc/qt/html/sql-overview-basicbrowsing2-main-cpp.html
-share/doc/qt/html/sql-overview-basicdatamanip-main-cpp.html
-share/doc/qt/html/sql-overview-connect1-main-cpp.html
-share/doc/qt/html/sql-overview-create_connections-main-cpp.html
-share/doc/qt/html/sql-overview-custom1-main-cpp.html
-share/doc/qt/html/sql-overview-custom1-main-h.html
-share/doc/qt/html/sql-overview-delete-main-cpp.html
-share/doc/qt/html/sql-overview-extract-main-cpp.html
-share/doc/qt/html/sql-overview-form1-main-cpp.html
-share/doc/qt/html/sql-overview-form2-main-h.html
-share/doc/qt/html/sql-overview-insert-main-cpp.html
-share/doc/qt/html/sql-overview-navigating-main-cpp.html
-share/doc/qt/html/sql-overview-order1-main-cpp.html
-share/doc/qt/html/sql-overview-order2-main-cpp.html
-share/doc/qt/html/sql-overview-retrieve1-main-cpp.html
-share/doc/qt/html/sql-overview-retrieve2-main-cpp.html
-share/doc/qt/html/sql-overview-subclass1-main-cpp.html
-share/doc/qt/html/sql-overview-subclass2-main-cpp.html
-share/doc/qt/html/sql-overview-subclass2-main-h.html
-share/doc/qt/html/sql-overview-subclass3-main-cpp.html
-share/doc/qt/html/sql-overview-subclass3-main-h.html
-share/doc/qt/html/sql-overview-subclass4-main-cpp.html
-share/doc/qt/html/sql-overview-subclass4-main-h.html
-share/doc/qt/html/sql-overview-subclass5-main-cpp.html
-share/doc/qt/html/sql-overview-subclass5-main-h.html
-share/doc/qt/html/sql-overview-table1-main-cpp.html
-share/doc/qt/html/sql-overview-table2-main-cpp.html
-share/doc/qt/html/sql-overview-table3-main-cpp.html
-share/doc/qt/html/sql-overview-table3-main-h.html
-share/doc/qt/html/sql-overview-table4-main-cpp.html
-share/doc/qt/html/sql-overview-table4-main-h.html
-share/doc/qt/html/sql-overview-update-main-cpp.html
-share/doc/qt/html/sql.html
-share/doc/qt/html/sqltable-example.html
-share/doc/qt/html/statistics-example.html
-share/doc/qt/html/step-by-step-examples.html
-share/doc/qt/html/t1.png
-share/doc/qt/html/t10-cannon-cpp.html
-share/doc/qt/html/t10-cannon-h.html
-share/doc/qt/html/t10-lcdrange-cpp.html
-share/doc/qt/html/t10-lcdrange-h.html
-share/doc/qt/html/t10-main-cpp.html
-share/doc/qt/html/t10.png
-share/doc/qt/html/t11-cannon-cpp.html
-share/doc/qt/html/t11-cannon-h.html
-share/doc/qt/html/t11-lcdrange-cpp.html
-share/doc/qt/html/t11-lcdrange-h.html
-share/doc/qt/html/t11-main-cpp.html
-share/doc/qt/html/t11.png
-share/doc/qt/html/t12-cannon-cpp.html
-share/doc/qt/html/t12-cannon-h.html
-share/doc/qt/html/t12-lcdrange-cpp.html
-share/doc/qt/html/t12-lcdrange-h.html
-share/doc/qt/html/t12-main-cpp.html
-share/doc/qt/html/t12.png
-share/doc/qt/html/t13-cannon-cpp.html
-share/doc/qt/html/t13-cannon-h.html
-share/doc/qt/html/t13-gamebrd-cpp.html
-share/doc/qt/html/t13-gamebrd-h.html
-share/doc/qt/html/t13-lcdrange-cpp.html
-share/doc/qt/html/t13-lcdrange-h.html
-share/doc/qt/html/t13-main-cpp.html
-share/doc/qt/html/t13.png
-share/doc/qt/html/t14-cannon-cpp.html
-share/doc/qt/html/t14-cannon-h.html
-share/doc/qt/html/t14-gamebrd-cpp.html
-share/doc/qt/html/t14-gamebrd-h.html
-share/doc/qt/html/t14-lcdrange-cpp.html
-share/doc/qt/html/t14-lcdrange-h.html
-share/doc/qt/html/t14-main-cpp.html
-share/doc/qt/html/t14.png
-share/doc/qt/html/t2.png
-share/doc/qt/html/t3.png
-share/doc/qt/html/t4.png
-share/doc/qt/html/t5.png
-share/doc/qt/html/t6.png
-share/doc/qt/html/t7-lcdrange-cpp.html
-share/doc/qt/html/t7-lcdrange-h.html
-share/doc/qt/html/t7-main-cpp.html
-share/doc/qt/html/t7.png
-share/doc/qt/html/t8-cannon-cpp.html
-share/doc/qt/html/t8-cannon-h.html
-share/doc/qt/html/t8-lcdrange-cpp.html
-share/doc/qt/html/t8-lcdrange-h.html
-share/doc/qt/html/t8-main-cpp.html
-share/doc/qt/html/t8.png
-share/doc/qt/html/t9-cannon-cpp.html
-share/doc/qt/html/t9-cannon-h.html
-share/doc/qt/html/t9-lcdrange-cpp.html
-share/doc/qt/html/t9-lcdrange-h.html
-share/doc/qt/html/t9-main-cpp.html
-share/doc/qt/html/t9.png
-share/doc/qt/html/t9_1.png
-share/doc/qt/html/t9_2.png
-share/doc/qt/html/tabdialog-example.html
-share/doc/qt/html/table-bigtable-main-cpp.html
-share/doc/qt/html/table-examples.html
-share/doc/qt/html/table-small-table-demo-main-cpp.html
-share/doc/qt/html/table-statistics-statistics-cpp.html
-share/doc/qt/html/table.html
-share/doc/qt/html/tablet-example.html
-share/doc/qt/html/tagreader-example.html
-share/doc/qt/html/tagreader-with-features-example.html
-share/doc/qt/html/templates.html
-share/doc/qt/html/tetrix-example.html
-share/doc/qt/html/text.html
-share/doc/qt/html/textedit-example.html
-share/doc/qt/html/themes-example.html
-share/doc/qt/html/thread.html
-share/doc/qt/html/threads.html
-share/doc/qt/html/tictac-example.html
-share/doc/qt/html/time.html
-share/doc/qt/html/timers.html
-share/doc/qt/html/titleindex
-share/doc/qt/html/toggleaction-example.html
-share/doc/qt/html/toolbar.png
-share/doc/qt/html/toolbar1.png
-share/doc/qt/html/tools-list.html
-share/doc/qt/html/tools.html
-share/doc/qt/html/tooltip-example.html
-share/doc/qt/html/toplevel-example.html
-share/doc/qt/html/trademarks.html
-share/doc/qt/html/trivial-nsplugin-example.html
-share/doc/qt/html/troll.html
-share/doc/qt/html/tt1_en.png
-share/doc/qt/html/tt1_la.png
-share/doc/qt/html/tt2_en.png
-share/doc/qt/html/tt2_fr.png
-share/doc/qt/html/tt2_nl.png
-share/doc/qt/html/tt3_10_en.png
-share/doc/qt/html/tt3_10_pt_bad.png
-share/doc/qt/html/tt3_10_pt_good.png
-share/doc/qt/html/tt3_11_about_pt.png
-share/doc/qt/html/tt3_11_en.png
-share/doc/qt/html/tt3_11_pt.png
-share/doc/qt/html/tutorial.html
-share/doc/qt/html/tutorial1-01.html
-share/doc/qt/html/tutorial1-02.html
-share/doc/qt/html/tutorial1-03.html
-share/doc/qt/html/tutorial1-04.html
-share/doc/qt/html/tutorial1-05.html
-share/doc/qt/html/tutorial1-06.html
-share/doc/qt/html/tutorial1-07.html
-share/doc/qt/html/tutorial1-08.html
-share/doc/qt/html/tutorial1-09.html
-share/doc/qt/html/tutorial1-10.html
-share/doc/qt/html/tutorial1-11.html
-share/doc/qt/html/tutorial1-12.html
-share/doc/qt/html/tutorial1-13.html
-share/doc/qt/html/tutorial1-14.html
-share/doc/qt/html/tutorial2-01.html
-share/doc/qt/html/tutorial2-02.html
-share/doc/qt/html/tutorial2-03.html
-share/doc/qt/html/tutorial2-04.html
-share/doc/qt/html/tutorial2-05.html
-share/doc/qt/html/tutorial2-06.html
-share/doc/qt/html/tutorial2-07.html
-share/doc/qt/html/tutorial2-08.html
-share/doc/qt/html/tutorial2-09.html
-share/doc/qt/html/tutorial2-10.html
-share/doc/qt/html/tutorial2-11.html
-share/doc/qt/html/tutorial2.html
-share/doc/qt/html/uic.html
-share/doc/qt/html/unicode.html
-share/doc/qt/html/unsmooth.png
-share/doc/qt/html/validateaccelerators.png
-share/doc/qt/html/validatephrases.png
-share/doc/qt/html/validatepunctuation.png
-share/doc/qt/html/web.png
-share/doc/qt/html/whatsthis
-share/doc/qt/html/whatsthis.png
-share/doc/qt/html/widgets-example.html
-share/doc/qt/html/win-objexplor1.png
-share/doc/qt/html/win-objexplor2.png
-share/doc/qt/html/win-projoverview.png
-share/doc/qt/html/win-propedit1.png
-share/doc/qt/html/win-propedit2.png
-share/doc/qt/html/winsystem.html
-share/doc/qt/html/wizard-example.html
-share/doc/qt/html/wizard-wizard-cpp.html
-share/doc/qt/html/wizard-wizard-h.html
-share/doc/qt/html/workspace.html
-share/doc/qt/html/xform-example.html
-share/doc/qt/html/xform.png
-share/doc/qt/html/xml-examples.html
-share/doc/qt/html/xml-sax-features-walkthrough.html
-share/doc/qt/html/xml-sax-walkthrough.html
-share/doc/qt/html/xml-tools.html
-share/doc/qt/html/xml.html
-share/doc/qt/html/y2k.html
-share/qt/phrasebooks/danish.qph
-share/qt/phrasebooks/dutch.qph
-share/qt/phrasebooks/finnish.qph
-share/qt/phrasebooks/french.qph
-share/qt/phrasebooks/german.qph
-share/qt/phrasebooks/italian.qph
-share/qt/phrasebooks/norwegian.qph
-share/qt/phrasebooks/russian.qph
-share/qt/phrasebooks/spanish.qph
-share/qt/phrasebooks/swedish.qph
-share/qt/templates/Configuration_Dialog.ui
-share/qt/templates/Dialog_with_Buttons_(Bottom).ui
-share/qt/templates/Dialog_with_Buttons_(Right).ui
-share/qt/templates/Tab_Dialog.ui
-translations/assistant_de.qm
-translations/qt_ar.qm
-translations/qt_ca.qm
-translations/qt_cs.qm
-translations/qt_de.qm
-translations/qt_es.qm
-translations/qt_fr.qm
-translations/qt_he.qm
-translations/qt_it.qm
-translations/qt_ja.qm
-translations/qt_nb.qm
-translations/qt_pt-br.qm
-translations/qt_ru.qm
-translations/qt_sk.qm
-translations/qt_zh-cn.qm
-translations/qt_zh-tw.qm
-@dirrm translations
-@dirrm share/qt/templates
-@dirrm share/qt/phrasebooks
-@dirrmtry share/qt
-@dirrm share/doc/qt/html
-@dirrm share/doc/qt
-@dirrm lib/plugins/designer
-@dirrm lib/plugins
-@dirrm include/private