12 files changed, 341 insertions, 256 deletions

diff --git a/x11/qt3-docs/PLIST b/x11/qt3-docs/PLIST
index 74329ac781f..8626e407c49 100644
--- a/x11/qt3-docs/PLIST
+++ b/x11/qt3-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2002/10/28 08:46:45 skrll Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/03/11 13:02:07 markd Exp $
 qt3/doc/html/README
 qt3/doc/html/README.QT
 qt3/doc/html/aboutqt.html
@@ -6,6 +6,9 @@ qt3/doc/html/abstract-connections.png
 qt3/doc/html/abstractwidgets.html
 qt3/doc/html/accelerators.html
 qt3/doc/html/aclock-example.html
+qt3/doc/html/actiongroup.png
+qt3/doc/html/addmainwidg.png
+qt3/doc/html/addmenuitem.png
 qt3/doc/html/addressbook-example.html
 qt3/doc/html/advanced.html
 qt3/doc/html/annotated.html
@@ -16,7 +19,10 @@ qt3/doc/html/assistant-1.html
 qt3/doc/html/assistant-2.html
 qt3/doc/html/assistant-3.html
 qt3/doc/html/assistant-4.html
+qt3/doc/html/assistant-5.html
+qt3/doc/html/assistant-6.html
 qt3/doc/html/assistant.html
+qt3/doc/html/assistant.xml
 qt3/doc/html/basic.html
 qt3/doc/html/bearings.png
 qt3/doc/html/biff-example.html
@@ -25,11 +31,10 @@ qt3/doc/html/book-dialog.png
 qt3/doc/html/book-main.png
 qt3/doc/html/brush-styles.png
 qt3/doc/html/bughowto.html
-qt3/doc/html/buttongroup-m.png
 qt3/doc/html/buttongroup-w.png
 qt3/doc/html/buttongroups-example.html
+qt3/doc/html/buttons.png
 qt3/doc/html/buyhowto.html
-qt3/doc/html/callbacks.png
 qt3/doc/html/canvas-chart-example.html
 qt3/doc/html/canvas-example.html
 qt3/doc/html/canvas.html
@@ -58,8 +63,11 @@ qt3/doc/html/classchart.html
 qt3/doc/html/classes.html
 qt3/doc/html/clientserver-example.html
 qt3/doc/html/collection.html
+qt3/doc/html/coloriconv.png
+qt3/doc/html/colortable.png
 qt3/doc/html/commonproblems.html
 qt3/doc/html/concrete-connections.png
+qt3/doc/html/containers.png
 qt3/doc/html/coordsys.html
 qt3/doc/html/coordsys.png
 qt3/doc/html/credits.html
@@ -70,11 +78,13 @@ qt3/doc/html/customlayout.html
 qt3/doc/html/customstyles.html
 qt3/doc/html/database-connections.png
 qt3/doc/html/database.html
+qt3/doc/html/database.png
 qt3/doc/html/datastreamformat.html
 qt3/doc/html/datetimewidgets.png
 qt3/doc/html/dclock-example.html
 qt3/doc/html/debug.html
 qt3/doc/html/demo-example.html
+qt3/doc/html/dependencies.png
 qt3/doc/html/designer-manual-1.html
 qt3/doc/html/designer-manual-10.html
 qt3/doc/html/designer-manual-11.html
@@ -82,6 +92,7 @@ qt3/doc/html/designer-manual-12.html
 qt3/doc/html/designer-manual-13.html
 qt3/doc/html/designer-manual-14.html
 qt3/doc/html/designer-manual-15.html
+qt3/doc/html/designer-manual-16.html
 qt3/doc/html/designer-manual-2.html
 qt3/doc/html/designer-manual-3.html
 qt3/doc/html/designer-manual-4.html
@@ -91,30 +102,52 @@ qt3/doc/html/designer-manual-7.html
 qt3/doc/html/designer-manual-8.html
 qt3/doc/html/designer-manual-9.html
 qt3/doc/html/designer-manual.html
-qt3/doc/html/designer.png
+qt3/doc/html/designer.xml
 qt3/doc/html/designer1.jpg
 qt3/doc/html/designer2.jpg
 qt3/doc/html/designer3.jpg
 qt3/doc/html/desktop-example.html
+qt3/doc/html/dialog1addwidg.png
+qt3/doc/html/dialog1layout1.png
+qt3/doc/html/dialog1layout2.png
+qt3/doc/html/dialog1selewidg.png
+qt3/doc/html/dialog1selewidg1.png
+qt3/doc/html/dialog1tab.png
+qt3/doc/html/dialog2laywidg.png
+qt3/doc/html/dialog2sample.png
+qt3/doc/html/dialog2setwidg.png
+qt3/doc/html/dialog3buttons.png
+qt3/doc/html/dialog3clipgrp.png
+qt3/doc/html/dialog3grpbox.png
+qt3/doc/html/dialog3layclip.png
+qt3/doc/html/dialog3layout.png
+qt3/doc/html/dialog3sample.png
 qt3/doc/html/dialogs.html
 qt3/doc/html/dirview-example.html
+qt3/doc/html/display.png
+qt3/doc/html/distributingqt.html
 qt3/doc/html/dnd.html
-qt3/doc/html/doc.png
 qt3/doc/html/doneandnext.png
+qt3/doc/html/dragaction.png
 qt3/doc/html/draganddrop.html
 qt3/doc/html/dragdrop-example.html
 qt3/doc/html/drawdemo-example.html
 qt3/doc/html/drawlines-example.html
 qt3/doc/html/edit-dbtable-dialog.png
+qt3/doc/html/editconn.png
+qt3/doc/html/editconn1.png
+qt3/doc/html/editconn2.png
+qt3/doc/html/editconn3.png
 qt3/doc/html/editcopy.png
 qt3/doc/html/editcut.png
 qt3/doc/html/editfind.png
+qt3/doc/html/editfunc.png
 qt3/doc/html/editions.html
 qt3/doc/html/editpaste.png
 qt3/doc/html/editredo.png
 qt3/doc/html/editundo.png
+qt3/doc/html/editvar.png
 qt3/doc/html/emb-accel.html
-qt3/doc/html/emb-casestudy.html
 qt3/doc/html/emb-charinput.html
 qt3/doc/html/emb-classes.html
 qt3/doc/html/emb-envvars.html
@@ -133,7 +166,7 @@ qt3/doc/html/environment.html
 qt3/doc/html/events.html
 qt3/doc/html/eventsandfilters.html
 qt3/doc/html/examples.html
-qt3/doc/html/face.jpg
+qt3/doc/html/extension-dialog-example.html
 qt3/doc/html/filechooser.png
 qt3/doc/html/fileiconview-example.html
 qt3/doc/html/fileopen.png
@@ -142,6 +175,8 @@ qt3/doc/html/filesave.png
 qt3/doc/html/finddialog.png
 qt3/doc/html/focus.html
 qt3/doc/html/forever-example.html
+qt3/doc/html/formsettings.png
+qt3/doc/html/forwdec.png
 qt3/doc/html/frames.png
 qt3/doc/html/ftpclient-example.html
 qt3/doc/html/functions.html
@@ -149,14 +184,12 @@ qt3/doc/html/geomanagement.html
 qt3/doc/html/geometry.html
 qt3/doc/html/geometry.png
 qt3/doc/html/gpl.html
-qt3/doc/html/graph.g1n
-qt3/doc/html/grapher-nsplugin-example.html
 qt3/doc/html/graphics.html
 qt3/doc/html/gridlayout.png
-qt3/doc/html/groupbox-m.png
 qt3/doc/html/groupbox-w.png
 qt3/doc/html/groups.html
 qt3/doc/html/guibooks.html
+qt3/doc/html/headerfilesynonyms
 qt3/doc/html/headers.html
 qt3/doc/html/hello-example.html
 qt3/doc/html/helpsystem.html
@@ -172,14 +205,19 @@ qt3/doc/html/iconview-simple_dd-main-cpp.html
 qt3/doc/html/iconview-simple_dd-main-h.html
 qt3/doc/html/iconview.html
 qt3/doc/html/images.html
+qt3/doc/html/incimp.png
 qt3/doc/html/index
 qt3/doc/html/index.html
+qt3/doc/html/input.png
 qt3/doc/html/inputdialogs.png
 qt3/doc/html/install-win.html
 qt3/doc/html/install-x11.html
 qt3/doc/html/installation.html
 qt3/doc/html/io.html
 qt3/doc/html/keyfeatures30.html
+qt3/doc/html/laycoloriconv.png
+qt3/doc/html/laycolortable.png
+qt3/doc/html/laymainwidg.png
 qt3/doc/html/layout-example.html
 qt3/doc/html/layout.html
 qt3/doc/html/layout1.png
@@ -194,6 +232,7 @@ qt3/doc/html/linguist-manual-3.html
 qt3/doc/html/linguist-manual-4.html
 qt3/doc/html/linguist-manual.html
 qt3/doc/html/linguist.png
+qt3/doc/html/linguist.xml
 qt3/doc/html/listbox-example.html
 qt3/doc/html/listboxcombo-example.html
 qt3/doc/html/listviews-example.html
@@ -202,10 +241,6 @@ qt3/doc/html/mac-differences.html
 qt3/doc/html/mail-example.html
 qt3/doc/html/mailinglists.html
 qt3/doc/html/mainclasses.html
-qt3/doc/html/mainlyMotif-editor-example.html
-qt3/doc/html/mainlyQt-editor-example.html
-qt3/doc/html/mainlyXt-editor-example.html
-qt3/doc/html/mainwindow-m.png
 qt3/doc/html/mainwindow-w.png
 qt3/doc/html/makeqpf.html
 qt3/doc/html/mdi-example.html
@@ -215,19 +250,25 @@ qt3/doc/html/metaobjects.html
 qt3/doc/html/misc.html
 qt3/doc/html/moc.html
 qt3/doc/html/modules.html
+qt3/doc/html/motif-customwidget-example.html
+qt3/doc/html/motif-dialog-example.html
+qt3/doc/html/motif-examples.html
+qt3/doc/html/motif-extension.html
 qt3/doc/html/movies-example.html
-qt3/doc/html/multiclip.png
 qt3/doc/html/multimedia.html
+qt3/doc/html/mwwiz.png
+qt3/doc/html/mwwiz2.png
 qt3/doc/html/network-examples.html
 qt3/doc/html/network.html
 qt3/doc/html/networkprotocol-example.html
+qt3/doc/html/newfiledialog.png
+qt3/doc/html/newopendialog.png
 qt3/doc/html/next.png
 qt3/doc/html/nextunfinished.png
-qt3/doc/html/nsplugin-examples.html
-qt3/doc/html/nsplugin.html
 qt3/doc/html/object.html
 qt3/doc/html/objectmodel.html
 qt3/doc/html/objecttrees.html
+qt3/doc/html/objexplor.png
 qt3/doc/html/opengl-box-example.html
 qt3/doc/html/opengl-examples.html
 qt3/doc/html/opengl-gear-example.html
@@ -252,16 +293,18 @@ qt3/doc/html/picture-example.html
 qt3/doc/html/pictures.html
 qt3/doc/html/plugins-howto.html
 qt3/doc/html/plugins.html
-qt3/doc/html/pnglogo.png
 qt3/doc/html/popup-example.html
 qt3/doc/html/porting.html
 qt3/doc/html/porting2.html
 qt3/doc/html/prev.png
+qt3/doc/html/previewform.png
 qt3/doc/html/prevunfinished.png
 qt3/doc/html/primes.html
 qt3/doc/html/process-example.html
 qt3/doc/html/progress-example.html
 qt3/doc/html/progressbar-example.html
+qt3/doc/html/projset.png
+qt3/doc/html/propedit.png
 qt3/doc/html/properties.html
 qt3/doc/html/propertydocs
 qt3/doc/html/propertyindex
@@ -301,10 +344,18 @@ qt3/doc/html/qasciidict-members.html
 qt3/doc/html/qasciidict.html
 qt3/doc/html/qasciidictiterator-members.html
 qt3/doc/html/qasciidictiterator.html
+qt3/doc/html/qassistantclient-h.html
+qt3/doc/html/qassistantclient-members.html
+qt3/doc/html/qassistantclient.html
 qt3/doc/html/qasyncimageio-h.html
 qt3/doc/html/qasyncio-h.html
 qt3/doc/html/qasyncio-members.html
 qt3/doc/html/qasyncio.html
+qt3/doc/html/qbig5codec-h.html
+qt3/doc/html/qbig5codec-members.html
+qt3/doc/html/qbig5codec.html
+qt3/doc/html/qbig5hkscscodec-members.html
+qt3/doc/html/qbig5hkscscodec.html
 qt3/doc/html/qbitarray-h.html
 qt3/doc/html/qbitarray-members.html
 qt3/doc/html/qbitarray.html
@@ -377,9 +428,7 @@ qt3/doc/html/qchar.html
 qt3/doc/html/qcharref-members.html
 qt3/doc/html/qcharref.html
 qt3/doc/html/qcheckbox-h.html
-qt3/doc/html/qcheckbox-m.png
 qt3/doc/html/qcheckbox-members.html
-qt3/doc/html/qcheckbox-w.png
 qt3/doc/html/qcheckbox.html
 qt3/doc/html/qchecklistitem-members.html
 qt3/doc/html/qchecklistitem.html
@@ -401,7 +450,6 @@ qt3/doc/html/qcolor.html
 qt3/doc/html/qcolordialog-h.html
 qt3/doc/html/qcolordialog-members.html
 qt3/doc/html/qcolordialog.html
-qt3/doc/html/qcolordlg-m.png
 qt3/doc/html/qcolordlg-w.png
 qt3/doc/html/qcolordrag-members.html
 qt3/doc/html/qcolordrag.html
@@ -410,9 +458,7 @@ qt3/doc/html/qcolorgroup.html
 qt3/doc/html/qcombo1-m.png
 qt3/doc/html/qcombo1-w.png
 qt3/doc/html/qcombo2-m.png
-qt3/doc/html/qcombo2-w.png
 qt3/doc/html/qcombo3-m.png
-qt3/doc/html/qcombo3-w.png
 qt3/doc/html/qcombobox-h.html
 qt3/doc/html/qcombobox-members.html
 qt3/doc/html/qcombobox.html
@@ -439,39 +485,12 @@ qt3/doc/html/qcustomevent.html
 qt3/doc/html/qcustommenuitem-members.html
 qt3/doc/html/qcustommenuitem.html
 qt3/doc/html/qd-buttonstoolbuttons3.png
-qt3/doc/html/qd-chapdialog-previewing2.png
-qt3/doc/html/qd-chapdialog-signalsandslots.png
-qt3/doc/html/qd-chapdialog-taborder.png
-qt3/doc/html/qd-chapdialogs-addingwidgets.png
-qt3/doc/html/qd-chapdialogs-creatingmulticlipform3.png
-qt3/doc/html/qd-chapdialogs-creatingnewprojects.png
-qt3/doc/html/qd-chapdialogs-layoutwidgets-stepone-after.png
-qt3/doc/html/qd-chapdialogs-objectexplorer.png
-qt3/doc/html/qd-chapdialogs-propertyeditor.png
-qt3/doc/html/qd-chapmainwin-actioneditor1.png
-qt3/doc/html/qd-chapmainwin-actioneditor2.png
-qt3/doc/html/qd-chapmainwin-actiongroup.png
-qt3/doc/html/qd-chapmainwin-addtextedit.png
-qt3/doc/html/qd-chapmainwin-addwidg.png
-qt3/doc/html/qd-chapmainwin-alignactiongroup.png
-qt3/doc/html/qd-chapmainwin-connaction.png
-qt3/doc/html/qd-chapmainwin-connalign1.png
-qt3/doc/html/qd-chapmainwin-connfontsize.png
-qt3/doc/html/qd-chapmainwin-deleteaction.png
-qt3/doc/html/qd-chapmainwin-dragtomenu.png
-qt3/doc/html/qd-chapmainwin-dropinmenu1.png
-qt3/doc/html/qd-chapmainwin-mainwinwiz1.png
-qt3/doc/html/qd-chapmainwin-mainwinwiz2.png
-qt3/doc/html/qd-chapmainwin-mainwinwiz3.png
-qt3/doc/html/qd-chapmainwin-namemenu.png
-qt3/doc/html/qd-chapmainwin-previewing.png
-qt3/doc/html/qd-chapmainwin-propeditnewact.png
-qt3/doc/html/qd-chapmainwin-toolbaractiongroup1.png
-qt3/doc/html/qd-chapmainwin-toolbarhandle.png
-qt3/doc/html/qd-chapmainwin-toolbarhandle2.png
 qt3/doc/html/qd-chooseanimage.png
 qt3/doc/html/qd-chooseapixmap.png
 qt3/doc/html/qd-chooseimages.png
+qt3/doc/html/qd-colortool-name.png
+qt3/doc/html/qd-colortool1.png
+qt3/doc/html/qd-colortool2.png
 qt3/doc/html/qd-configmainfile.png
 qt3/doc/html/qd-containertoolbuttons3.png
 qt3/doc/html/qd-createtemplate.png
@@ -498,8 +517,6 @@ qt3/doc/html/qd-dataviewwzdpage4.png
 qt3/doc/html/qd-displaytoolbuttons3.png
 qt3/doc/html/qd-editclassvariables.png
 qt3/doc/html/qd-editcustwidsigtab.png
-qt3/doc/html/qd-editeditconnections.png
-qt3/doc/html/qd-editformsettings.png
 qt3/doc/html/qd-editforwarddeclarations.png
 qt3/doc/html/qd-editiconview.png
 qt3/doc/html/qd-editincludesindeclaration.png
@@ -511,7 +528,6 @@ qt3/doc/html/qd-editmenu1.png
 qt3/doc/html/qd-editpalettedialog.png
 qt3/doc/html/qd-editpreferencesc++.png
 qt3/doc/html/qd-editpreferencesgeneral.png
-qt3/doc/html/qd-editslots1.png
 qt3/doc/html/qd-edittablecolumns.png
 qt3/doc/html/qd-edittablerows.png
 qt3/doc/html/qd-edittoolbuttons3.png
@@ -528,12 +544,6 @@ qt3/doc/html/qd-finddirectorydialog.png
 qt3/doc/html/qd-helpmenu.png
 qt3/doc/html/qd-helptoolbuttons3.png
 qt3/doc/html/qd-inputtoolbuttons3.png
-qt3/doc/html/qd-layout2.1-twogroups.png
-qt3/doc/html/qd-layout2.2-layoutform.png
-qt3/doc/html/qd-layout3-groupedwidgets.png
-qt3/doc/html/qd-layout3-rubberband.png
-qt3/doc/html/qd-layout3.2-addspacer.png
-qt3/doc/html/qd-layout3.5-layoutform.png
 qt3/doc/html/qd-layoutmenu1.png
 qt3/doc/html/qd-layouttoolbuttons3.png
 qt3/doc/html/qd-mainwinwzd.png
@@ -548,7 +558,6 @@ qt3/doc/html/qd-projectimages.png
 qt3/doc/html/qd-projectmenu.png
 qt3/doc/html/qd-projectsettingsc++tabdialog.png
 qt3/doc/html/qd-projectsettingsdialog.png
-qt3/doc/html/qd-projectsettingsfilestabdialog.png
 qt3/doc/html/qd-propedsigtab.png
 qt3/doc/html/qd-propedwinproptab.png
 qt3/doc/html/qd-searchfindtextdialog.png
@@ -563,7 +572,6 @@ qt3/doc/html/qd-title.png
 qt3/doc/html/qd-toolsmenu.png
 qt3/doc/html/qd-toolstoolbuttons4.png
 qt3/doc/html/qd-tunepalettedialog.png
-qt3/doc/html/qd-viewconnections.png
 qt3/doc/html/qd-viewstoolbuttons5.png
 qt3/doc/html/qd-windowmenu1.png
 qt3/doc/html/qdatabrowser-h.html
@@ -594,6 +602,9 @@ qt3/doc/html/qdatetime.html
 qt3/doc/html/qdatetimeedit-h.html
 qt3/doc/html/qdatetimeedit-members.html
 qt3/doc/html/qdatetimeedit.html
+qt3/doc/html/qdeepcopy-h.html
+qt3/doc/html/qdeepcopy-members.html
+qt3/doc/html/qdeepcopy.html
 qt3/doc/html/qdesktopwidget-h.html
 qt3/doc/html/qdesktopwidget-members.html
 qt3/doc/html/qdesktopwidget.html
@@ -697,6 +708,9 @@ qt3/doc/html/qeuckrcodec.html
 qt3/doc/html/qevent-h.html
 qt3/doc/html/qevent-members.html
 qt3/doc/html/qevent.html
+qt3/doc/html/qeventloop-h.html
+qt3/doc/html/qeventloop-members.html
+qt3/doc/html/qeventloop.html
 qt3/doc/html/qfd-example.html
 qt3/doc/html/qfile-h.html
 qt3/doc/html/qfile-members.html
@@ -728,7 +742,6 @@ qt3/doc/html/qfontdatabase.html
 qt3/doc/html/qfontdialog-h.html
 qt3/doc/html/qfontdialog-members.html
 qt3/doc/html/qfontdialog.html
-qt3/doc/html/qfontdlg-m.png
 qt3/doc/html/qfontdlg-w.png
 qt3/doc/html/qfontinfo-h.html
 qt3/doc/html/qfontinfo-members.html
@@ -748,9 +761,17 @@ qt3/doc/html/qftp.html
 qt3/doc/html/qgb18030codec-h.html
 qt3/doc/html/qgb18030codec-members.html
 qt3/doc/html/qgb18030codec.html
+qt3/doc/html/qgb2312codec-members.html
+qt3/doc/html/qgb2312codec.html
 qt3/doc/html/qgbkcodec-members.html
 qt3/doc/html/qgbkcodec.html
 qt3/doc/html/qgfx_qws-h.html
+qt3/doc/html/qgfxdriverfactory-members.html
+qt3/doc/html/qgfxdriverfactory.html
+qt3/doc/html/qgfxdriverfactory_qws-h.html
+qt3/doc/html/qgfxdriverplugin-members.html
+qt3/doc/html/qgfxdriverplugin.html
+qt3/doc/html/qgfxdriverplugin_qws-h.html
 qt3/doc/html/qgl-h.html
 qt3/doc/html/qgl-members.html
 qt3/doc/html/qgl.html
@@ -769,9 +790,7 @@ qt3/doc/html/qglwidget.html
 qt3/doc/html/qgrid-h.html
 qt3/doc/html/qgrid-m.png
 qt3/doc/html/qgrid-members.html
-qt3/doc/html/qgrid-w.png
 qt3/doc/html/qgrid.html
-qt3/doc/html/qgrid.png
 qt3/doc/html/qgridlayout-members.html
 qt3/doc/html/qgridlayout.html
 qt3/doc/html/qgridview-h.html
@@ -781,7 +800,6 @@ qt3/doc/html/qgroupbox-h.html
 qt3/doc/html/qgroupbox-members.html
 qt3/doc/html/qgroupbox.html
 qt3/doc/html/qgroupboxes.png
-qt3/doc/html/qgrpbox-m.png
 qt3/doc/html/qgrpbox-w.png
 qt3/doc/html/qguardedptr-h.html
 qt3/doc/html/qguardedptr-members.html
@@ -789,9 +807,7 @@ qt3/doc/html/qguardedptr.html
 qt3/doc/html/qhbox-h.html
 qt3/doc/html/qhbox-m.png
 qt3/doc/html/qhbox-members.html
-qt3/doc/html/qhbox-w.png
 qt3/doc/html/qhbox.html
-qt3/doc/html/qhbox.png
 qt3/doc/html/qhboxlayout-members.html
 qt3/doc/html/qhboxlayout.html
 qt3/doc/html/qhboxlayout.png
@@ -816,10 +832,18 @@ qt3/doc/html/qhostaddress.html
 qt3/doc/html/qhttp-h.html
 qt3/doc/html/qhttp-members.html
 qt3/doc/html/qhttp.html
+qt3/doc/html/qhttpheader-members.html
+qt3/doc/html/qhttpheader.html
+qt3/doc/html/qhttprequestheader-members.html
+qt3/doc/html/qhttprequestheader.html
+qt3/doc/html/qhttpresponseheader-members.html
+qt3/doc/html/qhttpresponseheader.html
 qt3/doc/html/qicondrag-members.html
 qt3/doc/html/qicondrag.html
 qt3/doc/html/qicondragitem-members.html
 qt3/doc/html/qicondragitem.html
+qt3/doc/html/qiconfactory-members.html
+qt3/doc/html/qiconfactory.html
 qt3/doc/html/qiconset-h.html
 qt3/doc/html/qiconset-members.html
 qt3/doc/html/qiconset.html
@@ -873,6 +897,12 @@ qt3/doc/html/qiodevicesource.html
 qt3/doc/html/qjiscodec-h.html
 qt3/doc/html/qjiscodec-members.html
 qt3/doc/html/qjiscodec.html
+qt3/doc/html/qkbddriverfactory-members.html
+qt3/doc/html/qkbddriverfactory.html
+qt3/doc/html/qkbddriverfactory_qws-h.html
+qt3/doc/html/qkbddriverplugin-members.html
+qt3/doc/html/qkbddriverplugin.html
+qt3/doc/html/qkbddriverplugin_qws-h.html
 qt3/doc/html/qkeyboard_qws-h.html
 qt3/doc/html/qkeyevent-members.html
 qt3/doc/html/qkeyevent.html
@@ -930,9 +960,9 @@ qt3/doc/html/qlistviewitems.png
 qt3/doc/html/qlocalfs-h.html
 qt3/doc/html/qlocalfs-members.html
 qt3/doc/html/qlocalfs.html
-qt3/doc/html/qlock-members.html
-qt3/doc/html/qlock.html
-qt3/doc/html/qlock_qws-h.html
+qt3/doc/html/qmacstyle-members.html
+qt3/doc/html/qmacstyle.html
+qt3/doc/html/qmacstyle_mac-h.html
 qt3/doc/html/qmag-example.html
 qt3/doc/html/qmainwindow-h.html
 qt3/doc/html/qmainwindow-m.png
@@ -948,6 +978,7 @@ qt3/doc/html/qmake-manual-5.html
 qt3/doc/html/qmake-manual-6.html
 qt3/doc/html/qmake-manual-7.html
 qt3/doc/html/qmake-manual.html
+qt3/doc/html/qmake.xml
 qt3/doc/html/qmap-h.html
 qt3/doc/html/qmap-members.html
 qt3/doc/html/qmap.html
@@ -984,12 +1015,28 @@ qt3/doc/html/qmimesourcefactory-members.html
 qt3/doc/html/qmimesourcefactory.html
 qt3/doc/html/qmlined-m.png
 qt3/doc/html/qmlined-w.png
+qt3/doc/html/qmotif-h.html
+qt3/doc/html/qmotif-members.html
+qt3/doc/html/qmotif.html
+qt3/doc/html/qmotifdialog-h.html
+qt3/doc/html/qmotifdialog-members.html
+qt3/doc/html/qmotifdialog.html
 qt3/doc/html/qmotifplusstyle-h.html
 qt3/doc/html/qmotifplusstyle-members.html
 qt3/doc/html/qmotifplusstyle.html
 qt3/doc/html/qmotifstyle-h.html
 qt3/doc/html/qmotifstyle-members.html
 qt3/doc/html/qmotifstyle.html
+qt3/doc/html/qmotifwidget-h.html
+qt3/doc/html/qmotifwidget-members.html
+qt3/doc/html/qmotifwidget.html
+qt3/doc/html/qmouse_qws-h.html
+qt3/doc/html/qmousedriverfactory-members.html
+qt3/doc/html/qmousedriverfactory.html
+qt3/doc/html/qmousedriverfactory_qws-h.html
+qt3/doc/html/qmousedriverplugin-members.html
+qt3/doc/html/qmousedriverplugin.html
+qt3/doc/html/qmousedriverplugin_qws-h.html
 qt3/doc/html/qmouseevent-members.html
 qt3/doc/html/qmouseevent.html
 qt3/doc/html/qmoveevent-members.html
@@ -1006,6 +1053,8 @@ qt3/doc/html/qmultilineedit.html
 qt3/doc/html/qmutex-h.html
 qt3/doc/html/qmutex-members.html
 qt3/doc/html/qmutex.html
+qt3/doc/html/qmutexlocker-members.html
+qt3/doc/html/qmutexlocker.html
 qt3/doc/html/qnamespace-h.html
 qt3/doc/html/qnetwork-h.html
 qt3/doc/html/qnetworkoperation-members.html
@@ -1013,15 +1062,6 @@ qt3/doc/html/qnetworkoperation.html
 qt3/doc/html/qnetworkprotocol-h.html
 qt3/doc/html/qnetworkprotocol-members.html
 qt3/doc/html/qnetworkprotocol.html
-qt3/doc/html/qnp-h.html
-qt3/doc/html/qnpinstance-members.html
-qt3/doc/html/qnpinstance.html
-qt3/doc/html/qnplugin-members.html
-qt3/doc/html/qnplugin.html
-qt3/doc/html/qnpstream-members.html
-qt3/doc/html/qnpstream.html
-qt3/doc/html/qnpwidget-members.html
-qt3/doc/html/qnpwidget.html
 qt3/doc/html/qobject-h.html
 qt3/doc/html/qobject-members.html
 qt3/doc/html/qobject.html
@@ -1031,8 +1071,6 @@ qt3/doc/html/qobjectcleanuphandler.html
 qt3/doc/html/qobjectlist-h.html
 qt3/doc/html/qobjectlist-members.html
 qt3/doc/html/qobjectlist.html
-qt3/doc/html/qobjectlistit-members.html
-qt3/doc/html/qobjectlistit.html
 qt3/doc/html/qpaintdevice-h.html
 qt3/doc/html/qpaintdevice-members.html
 qt3/doc/html/qpaintdevice.html
@@ -1081,7 +1119,6 @@ qt3/doc/html/qpopupmenu-h.html
 qt3/doc/html/qpopupmenu-members.html
 qt3/doc/html/qpopupmenu.html
 qt3/doc/html/qprintdlg-m.png
-qt3/doc/html/qprintdlg-w.png
 qt3/doc/html/qprinter-h.html
 qt3/doc/html/qprinter-members.html
 qt3/doc/html/qprinter.html
@@ -1231,8 +1268,6 @@ qt3/doc/html/qspinbox-m.png
 qt3/doc/html/qspinbox-members.html
 qt3/doc/html/qspinbox-w.png
 qt3/doc/html/qspinbox.html
-qt3/doc/html/qspinbox2-m.png
-qt3/doc/html/qspinbox2-w.png
 qt3/doc/html/qsplitter-h.html
 qt3/doc/html/qsplitter-m.png
 qt3/doc/html/qsplitter-members.html
@@ -1321,11 +1356,15 @@ qt3/doc/html/qstylesheet-members.html
 qt3/doc/html/qstylesheet.html
 qt3/doc/html/qstylesheetitem-members.html
 qt3/doc/html/qstylesheetitem.html
+qt3/doc/html/qsyntaxhighlighter-h.html
+qt3/doc/html/qsyntaxhighlighter-members.html
+qt3/doc/html/qsyntaxhighlighter.html
 qt3/doc/html/qt-colors.png
 qt3/doc/html/qt-members.html
 qt3/doc/html/qt-template-lib.html
 qt3/doc/html/qt.html
-qt3/doc/html/qt30-class-chart.png
+qt3/doc/html/qt.xml
+qt3/doc/html/qt31-class-chart.png
 qt3/doc/html/qtab-members.html
 qt3/doc/html/qtab.html
 qt3/doc/html/qtabbar-h.html
@@ -1389,7 +1428,6 @@ qt3/doc/html/qtextview.html
 qt3/doc/html/qthread-h.html
 qt3/doc/html/qthread-members.html
 qt3/doc/html/qthread.html
-qt3/doc/html/qtimage-nsplugin-example.html
 qt3/doc/html/qtime-members.html
 qt3/doc/html/qtime.html
 qt3/doc/html/qtimeedit-members.html
@@ -1401,10 +1439,6 @@ qt3/doc/html/qtimerevent-members.html
 qt3/doc/html/qtimerevent.html
 qt3/doc/html/qtl-qvaluelist-example.html
 qt3/doc/html/qtl.html
-qt3/doc/html/qtlogo.png
-qt3/doc/html/qtmultilineedit-h.html
-qt3/doc/html/qtmultilineedit-members.html
-qt3/doc/html/qtmultilineedit.html
 qt3/doc/html/qtoolbar-h.html
 qt3/doc/html/qtoolbar-members.html
 qt3/doc/html/qtoolbar.html
@@ -1424,9 +1458,6 @@ qt3/doc/html/qtranslatormessage.html
 qt3/doc/html/qtsciicodec-h.html
 qt3/doc/html/qtsciicodec-members.html
 qt3/doc/html/qtsciicodec.html
-qt3/doc/html/qttableview-h.html
-qt3/doc/html/qttableview-members.html
-qt3/doc/html/qttableview.html
 qt3/doc/html/quridrag-members.html
 qt3/doc/html/quridrag.html
 qt3/doc/html/qurl-h.html
@@ -1460,9 +1491,7 @@ qt3/doc/html/qvariant.html
 qt3/doc/html/qvbox-h.html
 qt3/doc/html/qvbox-m.png
 qt3/doc/html/qvbox-members.html
-qt3/doc/html/qvbox-w.png
 qt3/doc/html/qvbox.html
-qt3/doc/html/qvbox.png
 qt3/doc/html/qvboxlayout-members.html
 qt3/doc/html/qvboxlayout.html
 qt3/doc/html/qvboxlayout.png
@@ -1517,9 +1546,10 @@ qt3/doc/html/qws.html
 qt3/doc/html/qwsdecoration-members.html
 qt3/doc/html/qwsdecoration.html
 qt3/doc/html/qwsdecoration_qws-h.html
+qt3/doc/html/qwsinputmethod-members.html
+qt3/doc/html/qwsinputmethod.html
 qt3/doc/html/qwskeyboardhandler-members.html
 qt3/doc/html/qwskeyboardhandler.html
-qt3/doc/html/qwsmouse_qws-h.html
 qt3/doc/html/qwsmousehandler-members.html
 qt3/doc/html/qwsmousehandler.html
 qt3/doc/html/qwsserver-members.html
@@ -1555,14 +1585,11 @@ qt3/doc/html/qxmlreader-members.html
 qt3/doc/html/qxmlreader.html
 qt3/doc/html/qxmlsimplereader-members.html
 qt3/doc/html/qxmlsimplereader.html
-qt3/doc/html/qxt-h.html
-qt3/doc/html/qxtapplication-members.html
-qt3/doc/html/qxtapplication.html
+qt3/doc/html/qxtwidget-h.html
 qt3/doc/html/qxtwidget-members.html
 qt3/doc/html/qxtwidget.html
 qt3/doc/html/rangecontrols-example.html
 qt3/doc/html/removed20.html
-qt3/doc/html/richedit-main.png
 qt3/doc/html/richtext-example.html
 qt3/doc/html/rintersect.png
 qt3/doc/html/rot-example.html
@@ -1578,7 +1605,6 @@ qt3/doc/html/session.png
 qt3/doc/html/shared.html
 qt3/doc/html/shclass.html
 qt3/doc/html/showimg-example.html
-qt3/doc/html/signals-and-slots.png
 qt3/doc/html/signalsandslots.html
 qt3/doc/html/simple-application-example.html
 qt3/doc/html/simple-application.html
@@ -1588,7 +1614,6 @@ qt3/doc/html/small-table-example-example.html
 qt3/doc/html/smooth.png
 qt3/doc/html/sound-example.html
 qt3/doc/html/splitter-example.html
-qt3/doc/html/splitter-views-m.png
 qt3/doc/html/splitter-views-w.png
 qt3/doc/html/sql-driver.html
 qt3/doc/html/sql-examples.html
@@ -1599,7 +1624,7 @@ qt3/doc/html/sql-overview-connect1-main-cpp.html
 qt3/doc/html/sql-overview-create_connections-main-cpp.html
 qt3/doc/html/sql-overview-custom1-main-cpp.html
 qt3/doc/html/sql-overview-custom1-main-h.html
-qt3/doc/html/sql-overview-del-main-cpp.html
+qt3/doc/html/sql-overview-delete-main-cpp.html
 qt3/doc/html/sql-overview-extract-main-cpp.html
 qt3/doc/html/sql-overview-form1-main-cpp.html
 qt3/doc/html/sql-overview-form2-main-h.html
@@ -1697,7 +1722,6 @@ qt3/doc/html/tablet-example.html
 qt3/doc/html/tagreader-example.html
 qt3/doc/html/tagreader-with-features-example.html
 qt3/doc/html/templates.html
-qt3/doc/html/test.png
 qt3/doc/html/tetrix-example.html
 qt3/doc/html/text.html
 qt3/doc/html/textedit-example.html
@@ -1710,10 +1734,11 @@ qt3/doc/html/timers.html
 qt3/doc/html/titleindex
 qt3/doc/html/toggleaction-example.html
 qt3/doc/html/toolbar.png
+qt3/doc/html/toolbarpits.png
+qt3/doc/html/toolbox.png
 qt3/doc/html/tools-list.html
 qt3/doc/html/tools.html
 qt3/doc/html/tooltip-example.html
-qt3/doc/html/trivial-nsplugin-example.html
 qt3/doc/html/troll.html
 qt3/doc/html/tt1_en.png
 qt3/doc/html/tt1_la.png
@@ -1727,7 +1752,6 @@ qt3/doc/html/tt3_11_about_pt.png
 qt3/doc/html/tt3_11_en.png
 qt3/doc/html/tt3_11_pt.png
 qt3/doc/html/tutorial.html
-qt3/doc/html/tutorial.png
 qt3/doc/html/tutorial1-01.html
 qt3/doc/html/tutorial1-02.html
 qt3/doc/html/tutorial1-03.html
@@ -1760,6 +1784,8 @@ qt3/doc/html/unsmooth.png
 qt3/doc/html/validateaccelerators.png
 qt3/doc/html/validatephrases.png
 qt3/doc/html/validatepunctuation.png
+qt3/doc/html/vieweditconn.png
+qt3/doc/html/views.png
 qt3/doc/html/whatsthis
 qt3/doc/html/whatsthis.png
 qt3/doc/html/widgets-example.html
@@ -1769,13 +1795,12 @@ qt3/doc/html/wizard-wizard-cpp.html
 qt3/doc/html/wizard-wizard-h.html
 qt3/doc/html/workspace.html
 qt3/doc/html/xform-example.html
+qt3/doc/html/xform.png
 qt3/doc/html/xml-examples.html
 qt3/doc/html/xml-sax-features-walkthrough.html
 qt3/doc/html/xml-sax-walkthrough.html
 qt3/doc/html/xml-tools.html
 qt3/doc/html/xml.html
-qt3/doc/html/xt-motif-examples.html
-qt3/doc/html/xt.html
 qt3/doc/html/y2k.html
 qt3/man/man3/QAccel.3
 qt3/man/man3/QAccessible.3
@@ -1788,6 +1813,9 @@ qt3/man/man3/QAsciiCache.3
 qt3/man/man3/QAsciiCacheIterator.3
 qt3/man/man3/QAsciiDict.3
 qt3/man/man3/QAsciiDictIterator.3
+qt3/man/man3/QAssistantClient.3
+qt3/man/man3/QBig5Codec.3
+qt3/man/man3/QBig5hkscsCodec.3
 qt3/man/man3/QBitArray.3
 qt3/man/man3/QBitVal.3
 qt3/man/man3/QBitmap.3
@@ -1844,6 +1872,7 @@ qt3/man/man3/QDate.3
 qt3/man/man3/QDateEdit.3
 qt3/man/man3/QDateTime.3
 qt3/man/man3/QDateTimeEdit.3
+qt3/man/man3/QDeepCopy.3
 qt3/man/man3/QDesktopWidget.3
 qt3/man/man3/QDial.3
 qt3/man/man3/QDialog.3
@@ -1882,6 +1911,7 @@ qt3/man/man3/QErrorMessage.3
 qt3/man/man3/QEucJpCodec.3
 qt3/man/man3/QEucKrCodec.3
 qt3/man/man3/QEvent.3
+qt3/man/man3/QEventLoop.3
 qt3/man/man3/QFile.3
 qt3/man/man3/QFileDialog.3
 qt3/man/man3/QFileIconProvider.3
@@ -1904,7 +1934,10 @@ qt3/man/man3/QGLFormat.3
 qt3/man/man3/QGLWidget.3
 qt3/man/man3/QGLayoutIterator.3
 qt3/man/man3/QGb18030Codec.3
+qt3/man/man3/QGb2312Codec.3
 qt3/man/man3/QGbkCodec.3
+qt3/man/man3/QGfxDriverFactory.3
+qt3/man/man3/QGfxDriverPlugin.3
 qt3/man/man3/QGrid.3
 qt3/man/man3/QGridLayout.3
 qt3/man/man3/QGridView.3
@@ -1919,10 +1952,14 @@ qt3/man/man3/QHebrewCodec.3
 qt3/man/man3/QHideEvent.3
 qt3/man/man3/QHostAddress.3
 qt3/man/man3/QHttp.3
+qt3/man/man3/QHttpHeader.3
+qt3/man/man3/QHttpRequestHeader.3
+qt3/man/man3/QHttpResponseHeader.3
 qt3/man/man3/QIMEvent.3
 qt3/man/man3/QIODevice.3
 qt3/man/man3/QIconDrag.3
 qt3/man/man3/QIconDragItem.3
+qt3/man/man3/QIconFactory.3
 qt3/man/man3/QIconSet.3
 qt3/man/man3/QIconView.3
 qt3/man/man3/QIconViewItem.3
@@ -1941,6 +1978,8 @@ qt3/man/man3/QIntDict.3
 qt3/man/man3/QIntDictIterator.3
 qt3/man/man3/QIntValidator.3
 qt3/man/man3/QJisCodec.3
+qt3/man/man3/QKbdDriverFactory.3
+qt3/man/man3/QKbdDriverPlugin.3
 qt3/man/man3/QKeyEvent.3
 qt3/man/man3/QKeySequence.3
 qt3/man/man3/QLCDNumber.3
@@ -1958,7 +1997,7 @@ qt3/man/man3/QListView.3
 qt3/man/man3/QListViewItem.3
 qt3/man/man3/QListViewItemIterator.3
 qt3/man/man3/QLocalFs.3
-qt3/man/man3/QLock.3
+qt3/man/man3/QMacStyle.3
 qt3/man/man3/QMainWindow.3
 qt3/man/man3/QMap.3
 qt3/man/man3/QMapConstIterator.3
@@ -1971,22 +2010,23 @@ qt3/man/man3/QMetaObject.3
 qt3/man/man3/QMetaProperty.3
 qt3/man/man3/QMimeSource.3
 qt3/man/man3/QMimeSourceFactory.3
+qt3/man/man3/QMotif.3
+qt3/man/man3/QMotifDialog.3
 qt3/man/man3/QMotifPlusStyle.3
 qt3/man/man3/QMotifStyle.3
+qt3/man/man3/QMotifWidget.3
+qt3/man/man3/QMouseDriverFactory.3
+qt3/man/man3/QMouseDriverPlugin.3
 qt3/man/man3/QMouseEvent.3
 qt3/man/man3/QMoveEvent.3
 qt3/man/man3/QMovie.3
 qt3/man/man3/QMutex.3
-qt3/man/man3/QNPInstance.3
-qt3/man/man3/QNPStream.3
-qt3/man/man3/QNPWidget.3
-qt3/man/man3/QNPlugin.3
+qt3/man/man3/QMutexLocker.3
 qt3/man/man3/QNetworkOperation.3
 qt3/man/man3/QNetworkProtocol.3
 qt3/man/man3/QObject.3
 qt3/man/man3/QObjectCleanupHandler.3
 qt3/man/man3/QObjectList.3
-qt3/man/man3/QObjectListIt.3
 qt3/man/man3/QPNGImagePacker.3
 qt3/man/man3/QPaintDevice.3
 qt3/man/man3/QPaintDeviceMetrics.3
@@ -2075,6 +2115,7 @@ qt3/man/man3/QStyleOption.3
 qt3/man/man3/QStylePlugin.3
 qt3/man/man3/QStyleSheet.3
 qt3/man/man3/QStyleSheetItem.3
+qt3/man/man3/QSyntaxHighlighter.3
 qt3/man/man3/QTab.3
 qt3/man/man3/QTabBar.3
 qt3/man/man3/QTabDialog.3
@@ -2122,6 +2163,7 @@ qt3/man/man3/QValueVector.3
 qt3/man/man3/QVariant.3
 qt3/man/man3/QWMatrix.3
 qt3/man/man3/QWSDecoration.3
+qt3/man/man3/QWSInputMethod.3
 qt3/man/man3/QWSKeyboardHandler.3
 qt3/man/man3/QWSMouseHandler.3
 qt3/man/man3/QWSServer.3
@@ -2152,7 +2194,6 @@ qt3/man/man3/QXmlNamespaceSupport.3
 qt3/man/man3/QXmlParseException.3
 qt3/man/man3/QXmlReader.3
 qt3/man/man3/QXmlSimpleReader.3
-qt3/man/man3/QXtApplication.3
 qt3/man/man3/QXtWidget.3
 qt3/man/man3/Qt.3
 qt3/man/man3/qaccel.3
@@ -2166,6 +2207,9 @@ qt3/man/man3/qasciicache.3
 qt3/man/man3/qasciicacheiterator.3
 qt3/man/man3/qasciidict.3
 qt3/man/man3/qasciidictiterator.3
+qt3/man/man3/qassistantclient.3
+qt3/man/man3/qbig5codec.3
+qt3/man/man3/qbig5hkscscodec.3
 qt3/man/man3/qbitarray.3
 qt3/man/man3/qbitmap.3
 qt3/man/man3/qbitval.3
@@ -2222,6 +2266,7 @@ qt3/man/man3/qdate.3
 qt3/man/man3/qdateedit.3
 qt3/man/man3/qdatetime.3
 qt3/man/man3/qdatetimeedit.3
+qt3/man/man3/qdeepcopy.3
 qt3/man/man3/qdesktopwidget.3
 qt3/man/man3/qdial.3
 qt3/man/man3/qdialog.3
@@ -2260,6 +2305,7 @@ qt3/man/man3/qerrormessage.3
 qt3/man/man3/qeucjpcodec.3
 qt3/man/man3/qeuckrcodec.3
 qt3/man/man3/qevent.3
+qt3/man/man3/qeventloop.3
 qt3/man/man3/qfile.3
 qt3/man/man3/qfiledialog.3
 qt3/man/man3/qfileiconprovider.3
@@ -2276,7 +2322,10 @@ qt3/man/man3/qfontmetrics.3
 qt3/man/man3/qframe.3
 qt3/man/man3/qftp.3
 qt3/man/man3/qgb18030codec.3
+qt3/man/man3/qgb2312codec.3
 qt3/man/man3/qgbkcodec.3
+qt3/man/man3/qgfxdriverfactory.3
+qt3/man/man3/qgfxdriverplugin.3
 qt3/man/man3/qgl.3
 qt3/man/man3/qglayoutiterator.3
 qt3/man/man3/qglcolormap.3
@@ -2297,8 +2346,12 @@ qt3/man/man3/qhgroupbox.3
 qt3/man/man3/qhideevent.3
 qt3/man/man3/qhostaddress.3
 qt3/man/man3/qhttp.3
+qt3/man/man3/qhttpheader.3
+qt3/man/man3/qhttprequestheader.3
+qt3/man/man3/qhttpresponseheader.3
 qt3/man/man3/qicondrag.3
 qt3/man/man3/qicondragitem.3
+qt3/man/man3/qiconfactory.3
 qt3/man/man3/qiconset.3
 qt3/man/man3/qiconview.3
 qt3/man/man3/qiconviewitem.3
@@ -2319,6 +2372,8 @@ qt3/man/man3/qintdictiterator.3
 qt3/man/man3/qintvalidator.3
 qt3/man/man3/qiodevice.3
 qt3/man/man3/qjiscodec.3
+qt3/man/man3/qkbddriverfactory.3
+qt3/man/man3/qkbddriverplugin.3
 qt3/man/man3/qkeyevent.3
 qt3/man/man3/qkeysequence.3
 qt3/man/man3/qlabel.3
@@ -2336,7 +2391,7 @@ qt3/man/man3/qlistview.3
 qt3/man/man3/qlistviewitem.3
 qt3/man/man3/qlistviewitemiterator.3
 qt3/man/man3/qlocalfs.3
-qt3/man/man3/qlock.3
+qt3/man/man3/qmacstyle.3
 qt3/man/man3/qmainwindow.3
 qt3/man/man3/qmap.3
 qt3/man/man3/qmapconstiterator.3
@@ -2349,22 +2404,23 @@ qt3/man/man3/qmetaobject.3
 qt3/man/man3/qmetaproperty.3
 qt3/man/man3/qmimesource.3
 qt3/man/man3/qmimesourcefactory.3
+qt3/man/man3/qmotif.3
+qt3/man/man3/qmotifdialog.3
 qt3/man/man3/qmotifplusstyle.3
 qt3/man/man3/qmotifstyle.3
+qt3/man/man3/qmotifwidget.3
+qt3/man/man3/qmousedriverfactory.3
+qt3/man/man3/qmousedriverplugin.3
 qt3/man/man3/qmouseevent.3
 qt3/man/man3/qmoveevent.3
 qt3/man/man3/qmovie.3
 qt3/man/man3/qmutex.3
+qt3/man/man3/qmutexlocker.3
 qt3/man/man3/qnetworkoperation.3
 qt3/man/man3/qnetworkprotocol.3
-qt3/man/man3/qnpinstance.3
-qt3/man/man3/qnplugin.3
-qt3/man/man3/qnpstream.3
-qt3/man/man3/qnpwidget.3
 qt3/man/man3/qobject.3
 qt3/man/man3/qobjectcleanuphandler.3
 qt3/man/man3/qobjectlist.3
-qt3/man/man3/qobjectlistit.3
 qt3/man/man3/qpaintdevice.3
 qt3/man/man3/qpaintdevicemetrics.3
 qt3/man/man3/qpainter.3
@@ -2453,6 +2509,7 @@ qt3/man/man3/qstyleoption.3
 qt3/man/man3/qstyleplugin.3
 qt3/man/man3/qstylesheet.3
 qt3/man/man3/qstylesheetitem.3
+qt3/man/man3/qsyntaxhighlighter.3
 qt3/man/man3/qt.3
 qt3/man/man3/qtab.3
 qt3/man/man3/qtabbar.3
@@ -2513,6 +2570,7 @@ qt3/man/man3/qwizard.3
 qt3/man/man3/qwmatrix.3
 qt3/man/man3/qworkspace.3
 qt3/man/man3/qwsdecoration.3
+qt3/man/man3/qwsinputmethod.3
 qt3/man/man3/qwskeyboardhandler.3
 qt3/man/man3/qwsmousehandler.3
 qt3/man/man3/qwsserver.3
@@ -2531,7 +2589,6 @@ qt3/man/man3/qxmlnamespacesupport.3
 qt3/man/man3/qxmlparseexception.3
 qt3/man/man3/qxmlreader.3
 qt3/man/man3/qxmlsimplereader.3
-qt3/man/man3/qxtapplication.3
 qt3/man/man3/qxtwidget.3
 @dirrm qt3/man/man3
 @dirrm qt3/man
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index 2442417066c..e84c9e465e2 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile.common,v 1.12 2003/02/18 19:16:53 drochner Exp $
+# $NetBSD: Makefile.common,v 1.13 2003/03/11 13:02:07 markd Exp $
 #
 DISTNAME=		qt-x11-free-${QTVERSION}
 CATEGORIES=		x11
 MASTER_SITES=		ftp://ftp.trolltech.com/qt/source/ \
 			ftp://ftp.bero.org/pub/qt/source/
+EXTRACT_SUFX=		.tar.bz2
 
 .include "../qt3/Makefile.common"
 
@@ -16,11 +17,15 @@ USE_X11BASE=		yes
 USE_GMAKE=		yes
 USE_CXX=		yes
 USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	-shared -sm -thread \
+
+QTPREFIX=		${PREFIX}/qt3
+
+CONFIGURE_ARGS+=	-prefix ${QTPREFIX}
+CONFIGURE_ARGS+=	-shared -sm -thread -no-stl \
 			-system-zlib -system-libpng \
 			-system-libmng -system-libjpeg
-CONFIGURE_ARGS+=	-no-xinerama
 CONFIGURE_ARGS+=	-qt-gif	# qt3 does not write compressed GIFs
+CONFIGURE_ARGS+=	-no-g++-exceptions
 
 CONFIGURE_ARGS+=	< ${FILESDIR}/license-acceptance
 
@@ -38,15 +43,14 @@ SCRIPTS_ENV+=		HOME="${WRKDIR}"
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
+CONFIGURE_SCRIPT=	${SH} ./configure
 CONFIGURE_ARGS+=	-platform solaris-g++
 SYS_LIBS=		-lresolv -lsocket -lnsl
 .endif
 
-# 
-# A cheat so that we don't have to set QTDIR at run-time to find the
-# plugins.
-# 
-CXXFLAGS+=		-DQT_INSTALL_PLUGINS=\\"${QTPREFIX}/plugins\\"
+.if !exists(${X11BASE}/lib/libXinerama.so)
+CONFIGURE_ARGS+=	-no-xinerama
+.endif
 
 #
 # Reverse the change to how templates are handled made between 3.0.4
diff --git a/x11/qt3-libs/PLIST b/x11/qt3-libs/PLIST
index 3a883963f31..4d7bcaef9f5 100644
--- a/x11/qt3-libs/PLIST
+++ b/x11/qt3-libs/PLIST
@@ -1,10 +1,5 @@
-@comment $NetBSD: PLIST,v 1.8 2003/02/04 18:09:16 skrll Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/03/11 13:02:07 markd Exp $
 qt3/bin/moc
-qt3/include/jri.h
-qt3/include/jri_md.h
-qt3/include/jritypes.h
-qt3/include/npapi.h
-qt3/include/npupp.h
 qt3/include/private/qapplication_p.h
 qt3/include/private/qcolor_p.h
 qt3/include/private/qcom_p.h
@@ -14,22 +9,30 @@ qt3/include/private/qcomponentfactory_p.h
 qt3/include/private/qcriticalsection_p.h
 qt3/include/private/qdir_p.h
 qt3/include/private/qeffects_p.h
+qt3/include/private/qeventloop_p.h
 qt3/include/private/qfiledefs_p.h
 qt3/include/private/qfontcodecs_p.h
 qt3/include/private/qfontdata_p.h
+qt3/include/private/qgfxdriverinterface_p.h
 qt3/include/private/qgpluginmanager_p.h
 qt3/include/private/qimageformatinterface_p.h
 qt3/include/private/qinputcontext_p.h
 qt3/include/private/qinternal_p.h
+qt3/include/private/qkbddriverinterface_p.h
 qt3/include/private/qlayoutengine_p.h
 qt3/include/private/qlibrary_p.h
+qt3/include/private/qlock_p.h
+qt3/include/private/qmousedriverinterface_p.h
 qt3/include/private/qmutex_p.h
+qt3/include/private/qmutexpool_p.h
 qt3/include/private/qpainter_p.h
 qt3/include/private/qpluginmanager_p.h
 qt3/include/private/qpsprinter_p.h
 qt3/include/private/qrichtext_p.h
+qt3/include/private/qsettings_p.h
 qt3/include/private/qsharedmemory_p.h
 qt3/include/private/qsqldriverinterface_p.h
+qt3/include/private/qsqlextension_p.h
 qt3/include/private/qsqlmanager_p.h
 qt3/include/private/qstyleinterface_p.h
 qt3/include/private/qsvgdevice_p.h
@@ -50,6 +53,7 @@ qt3/include/qapplication.h
 qt3/include/qarray.h
 qt3/include/qasciicache.h
 qt3/include/qasciidict.h
+qt3/include/qassistantclient.h
 qt3/include/qasyncimageio.h
 qt3/include/qasyncio.h
 qt3/include/qbig5codec.h
@@ -94,6 +98,7 @@ qt3/include/qdataview.h
 qt3/include/qdatetime.h
 qt3/include/qdatetimeedit.h
 qt3/include/qdatetm.h
+qt3/include/qdeepcopy.h
 qt3/include/qdesktopwidget.h
 qt3/include/qdial.h
 qt3/include/qdialog.h
@@ -113,6 +118,7 @@ qt3/include/qerrormessage.h
 qt3/include/qeucjpcodec.h
 qt3/include/qeuckrcodec.h
 qt3/include/qevent.h
+qt3/include/qeventloop.h
 qt3/include/qfeatures.h
 qt3/include/qfile.h
 qt3/include/qfiledef.h
@@ -194,8 +200,11 @@ qt3/include/qmime.h
 qt3/include/qmlined.h
 qt3/include/qmngio.h
 qt3/include/qmodules.h
+qt3/include/qmotif.h
+qt3/include/qmotifdialog.h
 qt3/include/qmotifplusstyle.h
 qt3/include/qmotifstyle.h
+qt3/include/qmotifwidget.h
 qt3/include/qmovie.h
 qt3/include/qmsgbox.h
 qt3/include/qmultilinedit.h
@@ -204,7 +213,6 @@ qt3/include/qmutex.h
 qt3/include/qnamespace.h
 qt3/include/qnetwork.h
 qt3/include/qnetworkprotocol.h
-qt3/include/qnp.h
 qt3/include/qobjcoll.h
 qt3/include/qobjdefs.h
 qt3/include/qobject.h
@@ -312,6 +320,8 @@ qt3/include/qstyle.h
 qt3/include/qstylefactory.h
 qt3/include/qstyleplugin.h
 qt3/include/qstylesheet.h
+qt3/include/qsyntaxhighlighter.h
+qt3/include/qt.h
 qt3/include/qt_x11.h
 qt3/include/qtabbar.h
 qt3/include/qtabdialog.h
@@ -328,14 +338,12 @@ qt3/include/qtextview.h
 qt3/include/qthread.h
 qt3/include/qtimer.h
 qt3/include/qtl.h
-qt3/include/qtmultilineedit.h
 qt3/include/qtoolbar.h
 qt3/include/qtoolbutton.h
 qt3/include/qtooltip.h
 qt3/include/qtranslator.h
 qt3/include/qtsciicodec.h
 qt3/include/qtstream.h
-qt3/include/qttableview.h
 qt3/include/qurl.h
 qt3/include/qurlinfo.h
 qt3/include/qurloperator.h
@@ -364,16 +372,17 @@ qt3/include/qwindefs.h
 qt3/include/qwindow.h
 qt3/include/qwindowdefs.h
 qt3/include/qwindowsstyle.h
+qt3/include/qwindowsxpstyle.h
 qt3/include/qwizard.h
 qt3/include/qwmatrix.h
 qt3/include/qworkspace.h
 qt3/include/qxml.h
-qt3/include/qxt.h
+qt3/include/qxtwidget.h
 qt3/lib/libqt-mt.a
 qt3/lib/libqt-mt.la
 qt3/lib/libqt-mt.so
 qt3/lib/libqt-mt.so.3
-qt3/lib/libqt-mt.so.3.0
+qt3/lib/libqt-mt.so.3.1
 qt3/plugins/imageformats/libqjpeg.a
 qt3/plugins/imageformats/libqjpeg.la
 qt3/plugins/imageformats/libqjpeg.so
diff --git a/x11/qt3-libs/buildlink2.mk b/x11/qt3-libs/buildlink2.mk
index 8b665280e9a..4fed07b6a95 100644
--- a/x11/qt3-libs/buildlink2.mk
+++ b/x11/qt3-libs/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.8 2003/02/04 18:09:16 skrll Exp $
+# $NetBSD: buildlink2.mk,v 1.9 2003/03/11 13:02:07 markd Exp $
 
 .if !defined(QT3_LIBS_BUILDLINK2_MK)
 QT3_LIBS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-libs
-BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.0.7
+BUILDLINK_DEPENDS.qt3-libs?=	qt3-libs>=3.1.1
 BUILDLINK_PKGSRCDIR.qt3-libs?=	../../x11/qt3-libs
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.qt3-libs=qt3-libs
diff --git a/x11/qt3-libs/distinfo b/x11/qt3-libs/distinfo
index 79320138c06..6c51c8c7909 100644
--- a/x11/qt3-libs/distinfo
+++ b/x11/qt3-libs/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.11 2003/02/04 18:09:16 skrll Exp $
+$NetBSD: distinfo,v 1.12 2003/03/11 13:02:08 markd Exp $
 
-SHA1 (qt-x11-free-3.0.7.tar.gz) = 9ca6f48dfc0f4a1d3ba711be595c4ac1a6bcbd9a
-Size (qt-x11-free-3.0.7.tar.gz) = 16098098 bytes
+SHA1 (qt-x11-free-3.1.1.tar.bz2) = c0175a264ee60fc65b062842bf4a6be9e1618da5
+Size (qt-x11-free-3.1.1.tar.bz2) = 12393902 bytes
 SHA1 (patch-aa) = d230bbb56eac7f386c4610f3a7088902c95c9c4d
-SHA1 (patch-ab) = 8842f4ef5d3464d3a588c20d0ef5b0bb40d48180
-SHA1 (patch-ac) = e68231282b24674498de446f1dc4e4f052fe1196
-SHA1 (patch-ad) = 197ba1f217635ad0b25d4709d0be9786ade079cc
+SHA1 (patch-ab) = e8c2bbb84c241df34f493fd9cf44209069f2495e
+SHA1 (patch-ac) = ea4a7e3c5cef4e366a1cea4985f0fa34efa8f34f
+SHA1 (patch-ad) = 5f3d133051a9894aa45df1b1a6e1d0b6d964c49c
 SHA1 (patch-ba) = 0f5baae5501a83ea53e5d4df846bb1f338e4d802
 SHA1 (patch-bb) = 5196eb7c63f33fc36fe3569273d6c7061aeb9dbb
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf
index 192d658ce7d..f05bd6f3da5 100644
--- a/x11/qt3-libs/files/qmake.conf
+++ b/x11/qt3-libs/files/qmake.conf
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.7 2003/02/18 19:16:54 drochner Exp $
-# $Id: qmake.conf,v 1.7 2003/02/18 19:16:54 drochner Exp $
+# $NetBSD: qmake.conf,v 1.8 2003/03/11 13:02:08 markd Exp $
+# $Id: qmake.conf,v 1.8 2003/03/11 13:02:08 markd Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -21,6 +21,7 @@ QMAKE_CFLAGS_RELEASE	= -O2
 QMAKE_CFLAGS_DEBUG	= -g
 QMAKE_CFLAGS_SHLIB	= 
 QMAKE_CFLAGS_YACC	= -Wno-unused -Wno-parentheses
+QMAKE_CFLAGS_THREAD	= -D_REENTRANT
 
 QMAKE_CXX		= @CXX@
 QMAKE_CXXFLAGS		= @CXXFLAGS@ -DQ_TRAILING_DIR_SEP
@@ -31,6 +32,7 @@ QMAKE_CXXFLAGS_RELEASE	= $$QMAKE_CFLAGS_RELEASE
 QMAKE_CXXFLAGS_DEBUG	= $$QMAKE_CFLAGS_DEBUG
 QMAKE_CXXFLAGS_SHLIB	= $$QMAKE_CFLAGS_SHLIB
 QMAKE_CXXFLAGS_YACC	= $$QMAKE_CFLAGS_YACC
+QMAKE_CXXFLAGS_THREAD	= $$QMAKE_CFLAGS_THREAD
 
 QMAKE_INCDIR		= @LOCALBASE@/include
 QMAKE_LIBDIR		= @LOCALBASE@/lib
@@ -81,7 +83,7 @@ QMAKE_LIBS_OPENGL_QT	= -lGL -lXmu
 QMAKE_MOC		= $(QTDIR)/bin/moc
 QMAKE_UIC		= $(QTDIR)/bin/uic
 
-QMAKE_AR		= true
+QMAKE_AR		= libtool --mode=link c++ -o 
 QMAKE_RANLIB		= true
 
 QMAKE_TAR		= tar -cf
diff --git a/x11/qt3-libs/patches/patch-ab b/x11/qt3-libs/patches/patch-ab
index 73b0548ff33..2d501980708 100644
--- a/x11/qt3-libs/patches/patch-ab
+++ b/x11/qt3-libs/patches/patch-ab
@@ -1,13 +1,12 @@
-$NetBSD: patch-ab,v 1.4 2002/05/04 13:30:11 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2003/03/11 13:02:08 markd Exp $
 
---- configure.orig	Mon Apr 22 22:03:46 2002
-+++ configure	Fri May  3 17:40:27 2002
-@@ -775,7 +775,7 @@
- # we may write in the build tree, let's take advantage of this
- # to test that QTDIR is correctly set to be the build tree
- touch .test.qt.
--if [ '!' -f ${QTDIR}/.test.qt. ]; then
-+if [ '!' -f .test.qt. ]; then
-     rm -f .test.qt.
-     echo
-     echo
+--- tools/designer/editor/editor.pro.orig	Wed Nov 20 11:07:43 2002
++++ tools/designer/editor/editor.pro
+@@ -1,6 +1,5 @@
+ TEMPLATE	= lib
+-CONFIG		+= qt warn_on staticlib
+-CONFIG		-= dll
++CONFIG		+= qt warn_on dll
+ HEADERS		= editor.h  \
+ 		  parenmatcher.h  \
+ 		  completion.h \
diff --git a/x11/qt3-libs/patches/patch-ac b/x11/qt3-libs/patches/patch-ac
index 8e9cd05fdfc..0a4598911e5 100644
--- a/x11/qt3-libs/patches/patch-ac
+++ b/x11/qt3-libs/patches/patch-ac
@@ -1,8 +1,25 @@
-$NetBSD: patch-ac,v 1.2 2002/10/28 08:46:44 skrll Exp $
+$NetBSD: patch-ac,v 1.3 2003/03/11 13:02:08 markd Exp $
 
---- src/tools/qdir_unix.cpp.orig	Thu Oct 17 15:08:58 2002
+--- src/tools/qdir_unix.cpp.orig	Mon Dec  9 22:40:32 2002
 +++ src/tools/qdir_unix.cpp
-@@ -82,10 +82,19 @@ QString QDir::canonicalPath() const
+@@ -36,6 +36,16 @@
+ **********************************************************************/
+ 
+ #include "qplatformdefs.h"
++
++#ifdef Q_TRAILING_DIR_SEP  // Some OSes doesn't support trailing /'s
++
++// POSIX Large File Support redefines truncate -> truncate64
++#if defined(truncate)
++# undef truncate
++#endif
++
++#endif
++
+ #include "qdir.h"
+ 
+ #ifndef QT_NO_DIR
+@@ -86,10 +96,19 @@
  
  bool QDir::mkdir( const QString &dirName, bool acceptAbsPath ) const
  {
@@ -13,19 +30,19 @@ $NetBSD: patch-ac,v 1.2 2002/10/28 08:46:44 skrll Exp $
 -	name = dirName.left( dirName.length() - 1 );
 +    int pos = name.length();
 +    if (pos > 0) {
-+	while ( (pos - 1) >= 0 && name[pos - 1] == '/' ) {
-+	    --pos;
-+	};
-+	if ( pos == 0 ) {
-+	    name = QDir::rootDirPath();
-+	} else {
-+	    name.truncate( pos );
-+	}
++       while ( (pos - 1) >= 0 && name[pos - 1] == '/' ) {
++	   --pos;
++       };
++       if ( pos == 0 ) {
++	   name = QDir::rootDirPath();
++       } else {
++	   name.truncate( pos );
++       }
 +    }
-     return QT_MKDIR( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 )
+     return ::mkdir( QFile::encodeName(filePath(name,acceptAbsPath)), 0777 )
  	== 0;
  #else
-@@ -96,7 +105,24 @@ bool QDir::mkdir( const QString &dirName
+@@ -100,7 +119,24 @@
  
  bool QDir::rmdir( const QString &dirName, bool acceptAbsPath ) const
  {
@@ -33,19 +50,19 @@ $NetBSD: patch-ac,v 1.2 2002/10/28 08:46:44 skrll Exp $
 +    QString name = dirName;
 +    int pos = name.length();
 +    if (pos > 0) {
-+	while ( (pos - 1) >= 0 && name[pos - 1] == '/' ) {
-+	    --pos;
-+	};
-+	if ( pos == 0 ) {
-+	    name = QDir::rootDirPath();
-+	} else {
-+	    name.truncate( pos );
-+	}
++       while ( (pos - 1) >= 0 && name[pos - 1] == '/' ) {
++	   --pos;
++       };
++       if ( pos == 0 ) {
++	   name = QDir::rootDirPath();
++       } else {
++	   name.truncate( pos );
++       }
 +    }
-+    return QT_RMDIR( QFile::encodeName(filePath(name,acceptAbsPath)) )
-+	== 0;
++    return ::rmdir( QFile::encodeName(filePath(name,acceptAbsPath)) )
++       == 0;
 +#else
-     return QT_RMDIR( QFile::encodeName(filePath(dirName,acceptAbsPath)) ) == 0;
+     return ::rmdir( QFile::encodeName(filePath(dirName,acceptAbsPath)) ) == 0;
 +#endif
  }
  
diff --git a/x11/qt3-libs/patches/patch-ad b/x11/qt3-libs/patches/patch-ad
index 241ef83148f..5c53ce20b29 100644
--- a/x11/qt3-libs/patches/patch-ad
+++ b/x11/qt3-libs/patches/patch-ad
@@ -1,28 +1,32 @@
-$NetBSD: patch-ad,v 1.2 2002/08/25 18:40:47 jlam Exp $
+$NetBSD: patch-ad,v 1.3 2003/03/11 13:02:09 markd Exp $
 
---- src/kernel/qthread_unix.cpp.orig	Fri May 24 16:43:12 2002
+--- src/kernel/qthread_unix.cpp.orig	2002-12-09 09:40:39.000000000 +0000
 +++ src/kernel/qthread_unix.cpp
-@@ -87,6 +87,7 @@
- // helpers
- #define Q_THREAD_SELF()    pthread_self()
- #define Q_THREAD_EXIT(a)   pthread_exit((a))
+@@ -378,10 +378,17 @@ void QThread::start()
+     int ret;
+     pthread_attr_t attr;
+     pthread_attr_init( &attr );
 +#if defined(_POSIX_THREAD_PRIORITY_SCHEDULING)
- #define Q_THREAD_CREATE(a) pthread_attr_t attr; \
-                            pthread_attr_init(&attr); \
- 	                   pthread_attr_setinheritsched(&attr, PTHREAD_INHERIT_SCHED); \
-@@ -94,6 +95,15 @@
- 	                   (a) = pthread_create(&thread_id, &attr, start_thread, \
-                                                 (void *) that); \
- 	                   pthread_attr_destroy(&attr);
+     pthread_attr_setinheritsched( &attr, PTHREAD_INHERIT_SCHED );
++#endif
+     pthread_attr_setdetachstate( &attr, PTHREAD_CREATE_DETACHED );
+     if ( d->stacksize > 0 ) {
++#if defined(_POSIX_THREAD_ATTR_STACKSIZE)
+ 	ret = pthread_attr_setstacksize( &attr, d->stacksize );
 +#else
-+#define Q_THREAD_CREATE(a) pthread_attr_t attr; \
-+                           pthread_attr_init(&attr); \
-+                           pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); \
-+	                   (a) = pthread_create(&thread_id, &attr, start_thread, \
-+                                                (void *) that); \
-+	                   pthread_attr_destroy(&attr);
++	ret = 1;
 +#endif
 +
- #endif // Q_OS_SOLARIS
- 
- 
+ 	if ( ret ) {
+ #ifdef QT_CHECK_STATE
+ 	    qWarning( "QThread::start: thread stack size error: %s", strerror( ret ) ) ;
+@@ -392,7 +399,8 @@ void QThread::start()
+ 	    d->running = FALSE;
+ 	    d->finished = FALSE;
+ 	    return;
+-	}
++        }
++
+     }
+     d->args[0] = this;
+     d->args[1] = d;
diff --git a/x11/qt3-tools/PLIST b/x11/qt3-tools/PLIST
index ef68292d213..62c57562abe 100644
--- a/x11/qt3-tools/PLIST
+++ b/x11/qt3-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/10/28 08:46:45 skrll Exp $
+@comment $NetBSD: PLIST,v 1.7 2003/03/11 13:02:09 markd Exp $
 qt3/bin/assistant
 qt3/bin/designer
 qt3/bin/linguist
@@ -16,12 +16,12 @@ qt3/lib/libqui.la
 qt3/lib/libqui.so
 qt3/lib/libqui.so.1
 qt3/lib/libqui.so.1.0
-qt3/mkspecs/aix-64/qmake.conf
-qt3/mkspecs/aix-64/qplatformdefs.h
 qt3/mkspecs/aix-g++/qmake.conf
 qt3/mkspecs/aix-g++/qplatformdefs.h
 qt3/mkspecs/aix-xlc/qmake.conf
 qt3/mkspecs/aix-xlc/qplatformdefs.h
+qt3/mkspecs/aix-xlc-64/qmake.conf
+qt3/mkspecs/aix-xlc-64/qplatformdefs.h
 qt3/mkspecs/bsdi-g++/qmake.conf
 qt3/mkspecs/bsdi-g++/qplatformdefs.h
 qt3/mkspecs/cygwin-g++/qmake.conf
@@ -35,24 +35,24 @@ qt3/mkspecs/freebsd-g++/qmake.conf
 qt3/mkspecs/freebsd-g++/qplatformdefs.h
 qt3/mkspecs/hpux-acc/qmake.conf
 qt3/mkspecs/hpux-acc/qplatformdefs.h
+qt3/mkspecs/hpux-acc-64/qmake.conf
+qt3/mkspecs/hpux-acc-64/qplatformdefs.h
+qt3/mkspecs/hpux-acc-o64/qmake.conf
+qt3/mkspecs/hpux-acc-o64/qplatformdefs.h
 qt3/mkspecs/hpux-cc/qmake.conf
 qt3/mkspecs/hpux-cc/qplatformdefs.h
 qt3/mkspecs/hpux-g++/qmake.conf
 qt3/mkspecs/hpux-g++/qplatformdefs.h
-qt3/mkspecs/hpux-n64/qmake.conf
-qt3/mkspecs/hpux-n64/qplatformdefs.h
-qt3/mkspecs/hpux-o64/qmake.conf
-qt3/mkspecs/hpux-o64/qplatformdefs.h
 qt3/mkspecs/hurd-g++/qmake.conf
 qt3/mkspecs/hurd-g++/qplatformdefs.h
-qt3/mkspecs/irix-64/qmake.conf
-qt3/mkspecs/irix-64/qplatformdefs.h
+qt3/mkspecs/irix-cc-64/qmake.conf
+qt3/mkspecs/irix-cc-64/qplatformdefs.h
+qt3/mkspecs/irix-cc-o32/qmake.conf
+qt3/mkspecs/irix-cc-o32/qplatformdefs.h
+qt3/mkspecs/irix-cc/qmake.conf
+qt3/mkspecs/irix-cc/qplatformdefs.h
 qt3/mkspecs/irix-g++/qmake.conf
 qt3/mkspecs/irix-g++/qplatformdefs.h
-qt3/mkspecs/irix-n32/qmake.conf
-qt3/mkspecs/irix-n32/qplatformdefs.h
-qt3/mkspecs/irix-o32/qmake.conf
-qt3/mkspecs/irix-o32/qplatformdefs.h
 qt3/mkspecs/linux-cxx/qmake.conf
 qt3/mkspecs/linux-cxx/qplatformdefs.h
 qt3/mkspecs/linux-g++/qmake.conf
@@ -80,22 +80,18 @@ qt3/mkspecs/netbsd-g++/qmake.conf
 qt3/mkspecs/netbsd-g++/qplatformdefs.h
 qt3/mkspecs/openbsd-g++/qmake.conf
 qt3/mkspecs/openbsd-g++/qplatformdefs.h
-qt3/mkspecs/openunix-cc/qmake.conf
-qt3/mkspecs/openunix-cc/qplatformdefs.h
-qt3/mkspecs/openunix-g++/qmake.conf
-qt3/mkspecs/openunix-g++/qplatformdefs.h
 qt3/mkspecs/qnx-g++/qmake.conf
 qt3/mkspecs/qnx-g++/qplatformdefs.h
-qt3/mkspecs/reliant-64/qmake.conf
-qt3/mkspecs/reliant-64/qplatformdefs.h
+qt3/mkspecs/reliant-cds-64/qmake.conf
+qt3/mkspecs/reliant-cds-64/qplatformdefs.h
 qt3/mkspecs/reliant-cds/qmake.conf
 qt3/mkspecs/reliant-cds/qplatformdefs.h
 qt3/mkspecs/sco-cc/qmake.conf
 qt3/mkspecs/sco-cc/qplatformdefs.h
 qt3/mkspecs/sco-g++/qmake.conf
 qt3/mkspecs/sco-g++/qplatformdefs.h
-qt3/mkspecs/solaris-64/qmake.conf
-qt3/mkspecs/solaris-64/qplatformdefs.h
+qt3/mkspecs/solaris-cc-64/qmake.conf
+qt3/mkspecs/solaris-cc-64/qplatformdefs.h
 qt3/mkspecs/solaris-cc/qmake.conf
 qt3/mkspecs/solaris-cc/qplatformdefs.h
 qt3/mkspecs/solaris-g++-64/qmake.conf
@@ -104,17 +100,15 @@ qt3/mkspecs/solaris-g++/qmake.conf
 qt3/mkspecs/solaris-g++/qplatformdefs.h
 qt3/mkspecs/solaris-kcc/qmake.conf
 qt3/mkspecs/solaris-kcc/qplatformdefs.h
-qt3/mkspecs/sunos-g++/qmake.conf
 qt3/mkspecs/tru64-cxx/qmake.conf
 qt3/mkspecs/tru64-cxx/qplatformdefs.h
 qt3/mkspecs/tru64-g++/qmake.conf
 qt3/mkspecs/tru64-g++/qplatformdefs.h
 qt3/mkspecs/ultrix-g++/qmake.conf
+qt3/mkspecs/unixware-cc/qmake.conf
+qt3/mkspecs/unixware-cc/qplatformdefs.h
 qt3/mkspecs/unixware-g++/qmake.conf
-qt3/mkspecs/unixware7-cc/qmake.conf
-qt3/mkspecs/unixware7-cc/qplatformdefs.h
-qt3/mkspecs/unixware7-g++/qmake.conf
-qt3/mkspecs/unixware7-g++/qplatformdefs.h
+qt3/mkspecs/unixware-g++/qplatformdefs.h
 qt3/mkspecs/win32-borland/qmake.conf
 qt3/mkspecs/win32-borland/qplatformdefs.h
 qt3/mkspecs/win32-g++/qmake.conf
@@ -128,6 +122,8 @@ qt3/mkspecs/win32-msvc/qplatformdefs.h
 qt3/mkspecs/win32-msvc/win32app.dsp
 qt3/mkspecs/win32-msvc/win32dll.dsp
 qt3/mkspecs/win32-msvc/win32lib.dsp
+qt3/mkspecs/win32-msvc.net/qmake.conf
+qt3/mkspecs/win32-msvc.net/qplatformdefs.h
 qt3/mkspecs/win32-visage/qmake.conf
 qt3/mkspecs/win32-watcom/qmake.conf
 qt3/plugins/designer/libcppeditor.a
@@ -145,29 +141,26 @@ qt3/plugins/designer/libwizards.so
 @dirrm qt3/plugins/designer
 @dirrm qt3/mkspecs/win32-watcom
 @dirrm qt3/mkspecs/win32-visage
+@dirrm qt3/mkspecs/win32-msvc.net
 @dirrm qt3/mkspecs/win32-msvc
 @dirrm qt3/mkspecs/win32-icc
 @dirrm qt3/mkspecs/win32-g++
 @dirrm qt3/mkspecs/win32-borland
-@dirrm qt3/mkspecs/unixware7-g++
-@dirrm qt3/mkspecs/unixware7-cc
+@dirrm qt3/mkspecs/unixware-cc
 @dirrm qt3/mkspecs/unixware-g++
 @dirrm qt3/mkspecs/ultrix-g++
 @dirrm qt3/mkspecs/tru64-g++
 @dirrm qt3/mkspecs/tru64-cxx
-@dirrm qt3/mkspecs/sunos-g++
 @dirrm qt3/mkspecs/solaris-kcc
 @dirrm qt3/mkspecs/solaris-g++-64
 @dirrm qt3/mkspecs/solaris-g++
 @dirrm qt3/mkspecs/solaris-cc
-@dirrm qt3/mkspecs/solaris-64
+@dirrm qt3/mkspecs/solaris-cc-64
 @dirrm qt3/mkspecs/sco-g++
 @dirrm qt3/mkspecs/sco-cc
 @dirrm qt3/mkspecs/reliant-cds
-@dirrm qt3/mkspecs/reliant-64
+@dirrm qt3/mkspecs/reliant-cds-64
 @dirrm qt3/mkspecs/qnx-g++
-@dirrm qt3/mkspecs/openunix-g++
-@dirrm qt3/mkspecs/openunix-cc
 @dirrm qt3/mkspecs/openbsd-g++
 @dirrm qt3/mkspecs/netbsd-g++
 @dirrm qt3/mkspecs/macx-pbuilder
@@ -179,22 +172,22 @@ qt3/plugins/designer/libwizards.so
 @dirrm qt3/mkspecs/linux-icc
 @dirrm qt3/mkspecs/linux-g++
 @dirrm qt3/mkspecs/linux-cxx
-@dirrm qt3/mkspecs/irix-o32
-@dirrm qt3/mkspecs/irix-n32
+@dirrm qt3/mkspecs/irix-cc-o32
+@dirrm qt3/mkspecs/irix-cc
 @dirrm qt3/mkspecs/irix-g++
-@dirrm qt3/mkspecs/irix-64
+@dirrm qt3/mkspecs/irix-cc-64
 @dirrm qt3/mkspecs/hurd-g++
-@dirrm qt3/mkspecs/hpux-o64
-@dirrm qt3/mkspecs/hpux-n64
 @dirrm qt3/mkspecs/hpux-g++
 @dirrm qt3/mkspecs/hpux-cc
 @dirrm qt3/mkspecs/hpux-acc
+@dirrm qt3/mkspecs/hpux-acc-o64
+@dirrm qt3/mkspecs/hpux-acc-64
 @dirrm qt3/mkspecs/freebsd-g++
 @dirrm qt3/mkspecs/dgux-g++
 @dirrm qt3/mkspecs/darwin-g++
 @dirrm qt3/mkspecs/cygwin-g++
 @dirrm qt3/mkspecs/bsdi-g++
 @dirrm qt3/mkspecs/aix-xlc
+@dirrm qt3/mkspecs/aix-xlc-64
 @dirrm qt3/mkspecs/aix-g++
-@dirrm qt3/mkspecs/aix-64
 @dirrm qt3/mkspecs
diff --git a/x11/qt3-tools/buildlink2.mk b/x11/qt3-tools/buildlink2.mk
index 24bd3cb8327..80fefec3df8 100644
--- a/x11/qt3-tools/buildlink2.mk
+++ b/x11/qt3-tools/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.6 2002/12/24 06:10:36 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2003/03/11 13:02:09 markd Exp $
 
 .if !defined(QT3_TOOLS_BUILDLINK2_MK)
 QT3_TOOLS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		qt3-tools
-BUILDLINK_DEPENDS.qt3-tools?=	qt3-tools>=3.0.6nb1
+BUILDLINK_DEPENDS.qt3-tools?=	qt3-tools>=3.1.1
 BUILDLINK_PKGSRCDIR.qt3-tools?=	../../x11/qt3-tools
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.qt3-tools=qt3-tools
diff --git a/x11/qt3/Makefile.common b/x11/qt3/Makefile.common
index 4207d5e1c6f..573e7043f8f 100644
--- a/x11/qt3/Makefile.common
+++ b/x11/qt3/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.7 2003/02/04 18:06:49 skrll Exp $
+# $NetBSD: Makefile.common,v 1.8 2003/03/11 13:02:06 markd Exp $
 #
 
-QTVERSION=	3.0.7
+QTVERSION=	3.1.1
 
 MAINTAINER=	skrll@netbsd.org
 HOMEPAGE=	http://www.trolltech.com/products/qt.html