Fix includes installation

5 files changed, 78 insertions, 817 deletions

diff --git a/x11/qt4-libs/Makefile b/x11/qt4-libs/Makefile
index 75f453175a7..3f79ae86a6a 100644
--- a/x11/qt4-libs/Makefile
+++ b/x11/qt4-libs/Makefile
@@ -1,15 +1,19 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $
+# $NetBSD: Makefile,v 1.2 2006/02/25 09:25:00 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
-PKGNAME=		qt4-libs-${QTVERSION}
-COMMENT=		C++ X GUI toolkit
+PKGNAME=	qt4-libs-${QTVERSION}
+COMMENT=	C++ X GUI toolkit
 
 BUILD_TARGET=		sub-src
+INSTALL_TARGET=		install_flat_headers install_targ_headers
+
 PTHREAD_OPTS+=		require
 UNLIMIT_RESOURCES=	datasize
 BUILDLINK_PASSTHRU_DIRS+= ${QTPREFIX}
 
+PLIST_SRC=		${WRKDIR}/PLIST ${PKGDIR}/PLIST
+
 do-install:
 	${INSTALL_DATA_DIR} ${QTPREFIX}
 	${INSTALL_PROGRAM_DIR} ${QTPREFIX}/bin
@@ -18,10 +22,11 @@ do-install:
 .endfor
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/uic3 ${QTPREFIX}/bin/
 	${INSTALL_DATA_DIR} ${QTPREFIX}/include
-.for inc in Qt Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml
-	${INSTALL_DATA_DIR} ${QTPREFIX}/include/${inc}
-	${INSTALL_DATA} ${WRKSRC}/include/${inc}/q*.h ${QTPREFIX}/include/${inc}/
+.for incl in corelib gui network opengl qt3support sql svg xml
+	cd ${WRKSRC}/src/${incl} && env ${MAKE_ENV} \
+		${MAKE_PROGRAM} -f Makefile.Release ${INSTALL_TARGET}
 .endfor
+	cd ${PREFIX} && ${FIND} qt4/include -type f -print > ${WRKDIR}/PLIST
 	${INSTALL_LIB_DIR} ${QTPREFIX}/lib
 .for lib in Qt3Support QtCore QtGui QtNetwork QtOpenGL QtSql QtSvg QtXml
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
diff --git a/x11/qt4-libs/PLIST b/x11/qt4-libs/PLIST
index a7306f54139..33e73b99fa0 100644
--- a/x11/qt4-libs/PLIST
+++ b/x11/qt4-libs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/20 12:08:15 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/25 09:25:00 adam Exp $
 lib/pkgconfig/Qt3Support.pc
 lib/pkgconfig/QtCore.pc
 lib/pkgconfig/QtGui.pc
@@ -11,807 +11,6 @@ qt4/bin/moc
 qt4/bin/rcc
 qt4/bin/uic
 qt4/bin/uic3
-qt4/include/Qt/q3accel.h
-qt4/include/Qt/q3action.h
-qt4/include/Qt/q3asciicache.h
-qt4/include/Qt/q3asciidict.h
-qt4/include/Qt/q3boxlayout.h
-qt4/include/Qt/q3button.h
-qt4/include/Qt/q3buttongroup.h
-qt4/include/Qt/q3cache.h
-qt4/include/Qt/q3canvas.h
-qt4/include/Qt/q3cleanuphandler.h
-qt4/include/Qt/q3combobox.h
-qt4/include/Qt/q3cstring.h
-qt4/include/Qt/q3databrowser.h
-qt4/include/Qt/q3datatable.h
-qt4/include/Qt/q3dataview.h
-qt4/include/Qt/q3datetimeedit.h
-qt4/include/Qt/q3deepcopy.h
-qt4/include/Qt/q3dict.h
-qt4/include/Qt/q3dns.h
-qt4/include/Qt/q3dockarea.h
-qt4/include/Qt/q3dockwindow.h
-qt4/include/Qt/q3dragobject.h
-qt4/include/Qt/q3dropsite.h
-qt4/include/Qt/q3editorfactory.h
-qt4/include/Qt/q3filedialog.h
-qt4/include/Qt/q3frame.h
-qt4/include/Qt/q3ftp.h
-qt4/include/Qt/q3garray.h
-qt4/include/Qt/q3gcache.h
-qt4/include/Qt/q3gdict.h
-qt4/include/Qt/q3glist.h
-qt4/include/Qt/q3grid.h
-qt4/include/Qt/q3gridlayout.h
-qt4/include/Qt/q3gridview.h
-qt4/include/Qt/q3groupbox.h
-qt4/include/Qt/q3gvector.h
-qt4/include/Qt/q3hbox.h
-qt4/include/Qt/q3header.h
-qt4/include/Qt/q3http.h
-qt4/include/Qt/q3iconview.h
-qt4/include/Qt/q3intcache.h
-qt4/include/Qt/q3intdict.h
-qt4/include/Qt/q3listbox.h
-qt4/include/Qt/q3listview.h
-qt4/include/Qt/q3localfs.h
-qt4/include/Qt/q3mainwindow.h
-qt4/include/Qt/q3memarray.h
-qt4/include/Qt/q3mimefactory.h
-qt4/include/Qt/q3multilineedit.h
-qt4/include/Qt/q3network.h
-qt4/include/Qt/q3networkprotocol.h
-qt4/include/Qt/q3objectdict.h
-qt4/include/Qt/q3paintdevicemetrics.h
-qt4/include/Qt/q3painter.h
-qt4/include/Qt/q3picture.h
-qt4/include/Qt/q3pointarray.h
-qt4/include/Qt/q3polygonscanner.h
-qt4/include/Qt/q3popupmenu.h
-qt4/include/Qt/q3process.h
-qt4/include/Qt/q3progressbar.h
-qt4/include/Qt/q3progressdialog.h
-qt4/include/Qt/q3ptrcollection.h
-qt4/include/Qt/q3ptrdict.h
-qt4/include/Qt/q3ptrlist.h
-qt4/include/Qt/q3ptrqueue.h
-qt4/include/Qt/q3ptrstack.h
-qt4/include/Qt/q3ptrvector.h
-qt4/include/Qt/q3rangecontrol.h
-qt4/include/Qt/q3scrollview.h
-qt4/include/Qt/q3semaphore.h
-qt4/include/Qt/q3serversocket.h
-qt4/include/Qt/q3shared.h
-qt4/include/Qt/q3signal.h
-qt4/include/Qt/q3simplerichtext.h
-qt4/include/Qt/q3socket.h
-qt4/include/Qt/q3socketdevice.h
-qt4/include/Qt/q3sortedlist.h
-qt4/include/Qt/q3sqlcursor.h
-qt4/include/Qt/q3sqleditorfactory.h
-qt4/include/Qt/q3sqlfieldinfo.h
-qt4/include/Qt/q3sqlform.h
-qt4/include/Qt/q3sqlpropertymap.h
-qt4/include/Qt/q3sqlrecordinfo.h
-qt4/include/Qt/q3sqlselectcursor.h
-qt4/include/Qt/q3strlist.h
-qt4/include/Qt/q3strvec.h
-qt4/include/Qt/q3stylesheet.h
-qt4/include/Qt/q3syntaxhighlighter.h
-qt4/include/Qt/q3tabdialog.h
-qt4/include/Qt/q3table.h
-qt4/include/Qt/q3textbrowser.h
-qt4/include/Qt/q3textedit.h
-qt4/include/Qt/q3textview.h
-qt4/include/Qt/q3tl.h
-qt4/include/Qt/q3toolbar.h
-qt4/include/Qt/q3url.h
-qt4/include/Qt/q3urloperator.h
-qt4/include/Qt/q3valuelist.h
-qt4/include/Qt/q3valuestack.h
-qt4/include/Qt/q3valuevector.h
-qt4/include/Qt/q3vbox.h
-qt4/include/Qt/q3whatsthis.h
-qt4/include/Qt/q3widgetstack.h
-qt4/include/Qt/q3wizard.h
-qt4/include/Qt/qabstractbutton.h
-qt4/include/Qt/qabstracteventdispatcher.h
-qt4/include/Qt/qabstractfileengine.h
-qt4/include/Qt/qabstractitemdelegate.h
-qt4/include/Qt/qabstractitemmodel.h
-qt4/include/Qt/qabstractitemview.h
-qt4/include/Qt/qabstractpagesetupdialog.h
-qt4/include/Qt/qabstractprintdialog.h
-qt4/include/Qt/qabstractproxymodel.h
-qt4/include/Qt/qabstractscrollarea.h
-qt4/include/Qt/qabstractslider.h
-qt4/include/Qt/qabstractsocket.h
-qt4/include/Qt/qabstractspinbox.h
-qt4/include/Qt/qabstracttextdocumentlayout.h
-qt4/include/Qt/qaccessible.h
-qt4/include/Qt/qaccessiblebridge.h
-qt4/include/Qt/qaccessibleobject.h
-qt4/include/Qt/qaccessibleplugin.h
-qt4/include/Qt/qaccessiblewidget.h
-qt4/include/Qt/qaction.h
-qt4/include/Qt/qactiongroup.h
-qt4/include/Qt/qalgorithms.h
-qt4/include/Qt/qapplication.h
-qt4/include/Qt/qassistantclient.h
-qt4/include/Qt/qatomic.h
-qt4/include/Qt/qbasictimer.h
-qt4/include/Qt/qbitarray.h
-qt4/include/Qt/qbitmap.h
-qt4/include/Qt/qboxlayout.h
-qt4/include/Qt/qbrush.h
-qt4/include/Qt/qbuffer.h
-qt4/include/Qt/qbuttongroup.h
-qt4/include/Qt/qbytearray.h
-qt4/include/Qt/qbytearraymatcher.h
-qt4/include/Qt/qcache.h
-qt4/include/Qt/qcdestyle.h
-qt4/include/Qt/qchar.h
-qt4/include/Qt/qcheckbox.h
-qt4/include/Qt/qclipboard.h
-qt4/include/Qt/qcolor.h
-qt4/include/Qt/qcolordialog.h
-qt4/include/Qt/qcolormap.h
-qt4/include/Qt/qcombobox.h
-qt4/include/Qt/qcommonstyle.h
-qt4/include/Qt/qconfig-dist.h
-qt4/include/Qt/qconfig-large.h
-qt4/include/Qt/qconfig-medium.h
-qt4/include/Qt/qconfig-minimal.h
-qt4/include/Qt/qconfig-small.h
-qt4/include/Qt/qconfig.h
-qt4/include/Qt/qcoreapplication.h
-qt4/include/Qt/qcoreevent.h
-qt4/include/Qt/qcursor.h
-qt4/include/Qt/qdatastream.h
-qt4/include/Qt/qdatetime.h
-qt4/include/Qt/qdatetimeedit.h
-qt4/include/Qt/qdebug.h
-qt4/include/Qt/qdesigner_components.h
-qt4/include/Qt/qdesigner_components_global.h
-qt4/include/Qt/qdesignerexportwidget.h
-qt4/include/Qt/qdesktopwidget.h
-qt4/include/Qt/qdial.h
-qt4/include/Qt/qdialog.h
-qt4/include/Qt/qdir.h
-qt4/include/Qt/qdirmodel.h
-qt4/include/Qt/qdockwidget.h
-qt4/include/Qt/qdom.h
-qt4/include/Qt/qdrag.h
-qt4/include/Qt/qdrawutil.h
-qt4/include/Qt/qendian.h
-qt4/include/Qt/qerrormessage.h
-qt4/include/Qt/qevent.h
-qt4/include/Qt/qeventloop.h
-qt4/include/Qt/qextensionmanager.h
-qt4/include/Qt/qfactoryinterface.h
-qt4/include/Qt/qfeatures.h
-qt4/include/Qt/qfile.h
-qt4/include/Qt/qfiledialog.h
-qt4/include/Qt/qfileinfo.h
-qt4/include/Qt/qfocusframe.h
-qt4/include/Qt/qfont.h
-qt4/include/Qt/qfontdatabase.h
-qt4/include/Qt/qfontdialog.h
-qt4/include/Qt/qfontinfo.h
-qt4/include/Qt/qfontmetrics.h
-qt4/include/Qt/qframe.h
-qt4/include/Qt/qfsfileengine.h
-qt4/include/Qt/qftp.h
-qt4/include/Qt/qgl.h
-qt4/include/Qt/qglcolormap.h
-qt4/include/Qt/qglobal.h
-qt4/include/Qt/qglpbuffer.h
-qt4/include/Qt/qglpixelbuffer.h
-qt4/include/Qt/qgridlayout.h
-qt4/include/Qt/qgroupbox.h
-qt4/include/Qt/qhash.h
-qt4/include/Qt/qheaderview.h
-qt4/include/Qt/qhostaddress.h
-qt4/include/Qt/qhostinfo.h
-qt4/include/Qt/qhttp.h
-qt4/include/Qt/qicon.h
-qt4/include/Qt/qiconengine.h
-qt4/include/Qt/qiconengineplugin.h
-qt4/include/Qt/qiconset.h
-qt4/include/Qt/qimage.h
-qt4/include/Qt/qimageiohandler.h
-qt4/include/Qt/qimagereader.h
-qt4/include/Qt/qimagewriter.h
-qt4/include/Qt/qinputcontext.h
-qt4/include/Qt/qinputcontextfactory.h
-qt4/include/Qt/qinputcontextplugin.h
-qt4/include/Qt/qinputdialog.h
-qt4/include/Qt/qiodevice.h
-qt4/include/Qt/qitemdelegate.h
-qt4/include/Qt/qitemeditorfactory.h
-qt4/include/Qt/qitemselectionmodel.h
-qt4/include/Qt/qiterator.h
-qt4/include/Qt/qkeysequence.h
-qt4/include/Qt/qlabel.h
-qt4/include/Qt/qlayout.h
-qt4/include/Qt/qlayoutitem.h
-qt4/include/Qt/qlcdnumber.h
-qt4/include/Qt/qlibrary.h
-qt4/include/Qt/qlibraryinfo.h
-qt4/include/Qt/qline.h
-qt4/include/Qt/qlineedit.h
-qt4/include/Qt/qlinkedlist.h
-qt4/include/Qt/qlist.h
-qt4/include/Qt/qlistview.h
-qt4/include/Qt/qlistwidget.h
-qt4/include/Qt/qlocale.h
-qt4/include/Qt/qmainwindow.h
-qt4/include/Qt/qmap.h
-qt4/include/Qt/qmatrix.h
-qt4/include/Qt/qmenu.h
-qt4/include/Qt/qmenubar.h
-qt4/include/Qt/qmenudata.h
-qt4/include/Qt/qmessagebox.h
-qt4/include/Qt/qmetaobject.h
-qt4/include/Qt/qmetatype.h
-qt4/include/Qt/qmime.h
-qt4/include/Qt/qmimedata.h
-qt4/include/Qt/qmotifstyle.h
-qt4/include/Qt/qmovie.h
-qt4/include/Qt/qmutex.h
-qt4/include/Qt/qnamespace.h
-qt4/include/Qt/qnetworkproxy.h
-qt4/include/Qt/qobject.h
-qt4/include/Qt/qobjectcleanuphandler.h
-qt4/include/Qt/qobjectdefs.h
-qt4/include/Qt/qpagesetupdialog.h
-qt4/include/Qt/qpaintdevice.h
-qt4/include/Qt/qpaintengine.h
-qt4/include/Qt/qpainter.h
-qt4/include/Qt/qpainterpath.h
-qt4/include/Qt/qpair.h
-qt4/include/Qt/qpalette.h
-qt4/include/Qt/qpen.h
-qt4/include/Qt/qpicture.h
-qt4/include/Qt/qpictureformatplugin.h
-qt4/include/Qt/qpixmap.h
-qt4/include/Qt/qpixmapcache.h
-qt4/include/Qt/qplastiquestyle.h
-qt4/include/Qt/qplugin.h
-qt4/include/Qt/qpluginloader.h
-qt4/include/Qt/qpoint.h
-qt4/include/Qt/qpointer.h
-qt4/include/Qt/qpolygon.h
-qt4/include/Qt/qprintdialog.h
-qt4/include/Qt/qprintengine.h
-qt4/include/Qt/qprinter.h
-qt4/include/Qt/qprocess.h
-qt4/include/Qt/qprogressbar.h
-qt4/include/Qt/qprogressdialog.h
-qt4/include/Qt/qproxymodel.h
-qt4/include/Qt/qpushbutton.h
-qt4/include/Qt/qqueue.h
-qt4/include/Qt/qradiobutton.h
-qt4/include/Qt/qreadwritelock.h
-qt4/include/Qt/qrect.h
-qt4/include/Qt/qregexp.h
-qt4/include/Qt/qregion.h
-qt4/include/Qt/qrgb.h
-qt4/include/Qt/qrubberband.h
-qt4/include/Qt/qscrollarea.h
-qt4/include/Qt/qscrollbar.h
-qt4/include/Qt/qsemaphore.h
-qt4/include/Qt/qsessionmanager.h
-qt4/include/Qt/qset.h
-qt4/include/Qt/qsettings.h
-qt4/include/Qt/qshareddata.h
-qt4/include/Qt/qshortcut.h
-qt4/include/Qt/qsignalmapper.h
-qt4/include/Qt/qsignalspy.h
-qt4/include/Qt/qsize.h
-qt4/include/Qt/qsizegrip.h
-qt4/include/Qt/qsizepolicy.h
-qt4/include/Qt/qslider.h
-qt4/include/Qt/qsocketnotifier.h
-qt4/include/Qt/qsortfilterproxymodel.h
-qt4/include/Qt/qsound.h
-qt4/include/Qt/qspinbox.h
-qt4/include/Qt/qsplashscreen.h
-qt4/include/Qt/qsplitter.h
-qt4/include/Qt/qsql.h
-qt4/include/Qt/qsql_ibase.h
-qt4/include/Qt/qsql_mysql.h
-qt4/include/Qt/qsql_odbc.h
-qt4/include/Qt/qsql_psql.h
-qt4/include/Qt/qsql_sqlite.h
-qt4/include/Qt/qsql_sqlite2.h
-qt4/include/Qt/qsqldatabase.h
-qt4/include/Qt/qsqldriver.h
-qt4/include/Qt/qsqldriverplugin.h
-qt4/include/Qt/qsqlerror.h
-qt4/include/Qt/qsqlfield.h
-qt4/include/Qt/qsqlindex.h
-qt4/include/Qt/qsqlquery.h
-qt4/include/Qt/qsqlquerymodel.h
-qt4/include/Qt/qsqlrecord.h
-qt4/include/Qt/qsqlrelationaldelegate.h
-qt4/include/Qt/qsqlrelationaltablemodel.h
-qt4/include/Qt/qsqlresult.h
-qt4/include/Qt/qsqltablemodel.h
-qt4/include/Qt/qstack.h
-qt4/include/Qt/qstackedlayout.h
-qt4/include/Qt/qstackedwidget.h
-qt4/include/Qt/qstandarditemmodel.h
-qt4/include/Qt/qstatusbar.h
-qt4/include/Qt/qstring.h
-qt4/include/Qt/qstringlist.h
-qt4/include/Qt/qstringlistmodel.h
-qt4/include/Qt/qstringmatcher.h
-qt4/include/Qt/qstyle.h
-qt4/include/Qt/qstylefactory.h
-qt4/include/Qt/qstyleoption.h
-qt4/include/Qt/qstylepainter.h
-qt4/include/Qt/qstyleplugin.h
-qt4/include/Qt/qsvgrenderer.h
-qt4/include/Qt/qsvgwidget.h
-qt4/include/Qt/qsyntaxhighlighter.h
-qt4/include/Qt/qtabbar.h
-qt4/include/Qt/qtableview.h
-qt4/include/Qt/qtablewidget.h
-qt4/include/Qt/qtabwidget.h
-qt4/include/Qt/qtcpserver.h
-qt4/include/Qt/qtcpsocket.h
-qt4/include/Qt/qtemporaryfile.h
-qt4/include/Qt/qtest.h
-qt4/include/Qt/qtest_global.h
-qt4/include/Qt/qtest_gui.h
-qt4/include/Qt/qtestaccessible.h
-qt4/include/Qt/qtestassert.h
-qt4/include/Qt/qtestcase.h
-qt4/include/Qt/qtestdata.h
-qt4/include/Qt/qtestevent.h
-qt4/include/Qt/qtesteventloop.h
-qt4/include/Qt/qtestkeyboard.h
-qt4/include/Qt/qtestmouse.h
-qt4/include/Qt/qtestsystem.h
-qt4/include/Qt/qtextbrowser.h
-qt4/include/Qt/qtextcodec.h
-qt4/include/Qt/qtextcodecplugin.h
-qt4/include/Qt/qtextcursor.h
-qt4/include/Qt/qtextdocument.h
-qt4/include/Qt/qtextdocumentfragment.h
-qt4/include/Qt/qtextedit.h
-qt4/include/Qt/qtextformat.h
-qt4/include/Qt/qtextlayout.h
-qt4/include/Qt/qtextlist.h
-qt4/include/Qt/qtextobject.h
-qt4/include/Qt/qtextoption.h
-qt4/include/Qt/qtextstream.h
-qt4/include/Qt/qtexttable.h
-qt4/include/Qt/qthread.h
-qt4/include/Qt/qthreadstorage.h
-qt4/include/Qt/qtimer.h
-qt4/include/Qt/qtoolbar.h
-qt4/include/Qt/qtoolbox.h
-qt4/include/Qt/qtoolbutton.h
-qt4/include/Qt/qtooltip.h
-qt4/include/Qt/qtranslator.h
-qt4/include/Qt/qtreeview.h
-qt4/include/Qt/qtreewidget.h
-qt4/include/Qt/qtreewidgetitemiterator.h
-qt4/include/Qt/qudpsocket.h
-qt4/include/Qt/quiloader.h
-qt4/include/Qt/qurl.h
-qt4/include/Qt/qurlinfo.h
-qt4/include/Qt/quuid.h
-qt4/include/Qt/qvalidator.h
-qt4/include/Qt/qvariant.h
-qt4/include/Qt/qvarlengtharray.h
-qt4/include/Qt/qvector.h
-qt4/include/Qt/qvfbhdr.h
-qt4/include/Qt/qwaitcondition.h
-qt4/include/Qt/qwhatsthis.h
-qt4/include/Qt/qwidget.h
-qt4/include/Qt/qwindowdefs.h
-qt4/include/Qt/qwindowsstyle.h
-qt4/include/Qt/qwindowsxpstyle.h
-qt4/include/Qt/qwmatrix.h
-qt4/include/Qt/qworkspace.h
-qt4/include/Qt/qx11embed_x11.h
-qt4/include/Qt/qx11info_x11.h
-qt4/include/Qt/qxml.h
-qt4/include/Qt3Support/q3accel.h
-qt4/include/Qt3Support/q3action.h
-qt4/include/Qt3Support/q3asciicache.h
-qt4/include/Qt3Support/q3asciidict.h
-qt4/include/Qt3Support/q3boxlayout.h
-qt4/include/Qt3Support/q3button.h
-qt4/include/Qt3Support/q3buttongroup.h
-qt4/include/Qt3Support/q3cache.h
-qt4/include/Qt3Support/q3canvas.h
-qt4/include/Qt3Support/q3cleanuphandler.h
-qt4/include/Qt3Support/q3combobox.h
-qt4/include/Qt3Support/q3cstring.h
-qt4/include/Qt3Support/q3databrowser.h
-qt4/include/Qt3Support/q3datatable.h
-qt4/include/Qt3Support/q3dataview.h
-qt4/include/Qt3Support/q3datetimeedit.h
-qt4/include/Qt3Support/q3deepcopy.h
-qt4/include/Qt3Support/q3dict.h
-qt4/include/Qt3Support/q3dns.h
-qt4/include/Qt3Support/q3dockarea.h
-qt4/include/Qt3Support/q3dockwindow.h
-qt4/include/Qt3Support/q3dragobject.h
-qt4/include/Qt3Support/q3dropsite.h
-qt4/include/Qt3Support/q3editorfactory.h
-qt4/include/Qt3Support/q3filedialog.h
-qt4/include/Qt3Support/q3frame.h
-qt4/include/Qt3Support/q3ftp.h
-qt4/include/Qt3Support/q3garray.h
-qt4/include/Qt3Support/q3gcache.h
-qt4/include/Qt3Support/q3gdict.h
-qt4/include/Qt3Support/q3glist.h
-qt4/include/Qt3Support/q3grid.h
-qt4/include/Qt3Support/q3gridlayout.h
-qt4/include/Qt3Support/q3gridview.h
-qt4/include/Qt3Support/q3groupbox.h
-qt4/include/Qt3Support/q3gvector.h
-qt4/include/Qt3Support/q3hbox.h
-qt4/include/Qt3Support/q3header.h
-qt4/include/Qt3Support/q3http.h
-qt4/include/Qt3Support/q3iconview.h
-qt4/include/Qt3Support/q3intcache.h
-qt4/include/Qt3Support/q3intdict.h
-qt4/include/Qt3Support/q3listbox.h
-qt4/include/Qt3Support/q3listview.h
-qt4/include/Qt3Support/q3localfs.h
-qt4/include/Qt3Support/q3mainwindow.h
-qt4/include/Qt3Support/q3memarray.h
-qt4/include/Qt3Support/q3mimefactory.h
-qt4/include/Qt3Support/q3multilineedit.h
-qt4/include/Qt3Support/q3network.h
-qt4/include/Qt3Support/q3networkprotocol.h
-qt4/include/Qt3Support/q3objectdict.h
-qt4/include/Qt3Support/q3paintdevicemetrics.h
-qt4/include/Qt3Support/q3painter.h
-qt4/include/Qt3Support/q3picture.h
-qt4/include/Qt3Support/q3pointarray.h
-qt4/include/Qt3Support/q3polygonscanner.h
-qt4/include/Qt3Support/q3popupmenu.h
-qt4/include/Qt3Support/q3process.h
-qt4/include/Qt3Support/q3progressbar.h
-qt4/include/Qt3Support/q3progressdialog.h
-qt4/include/Qt3Support/q3ptrcollection.h
-qt4/include/Qt3Support/q3ptrdict.h
-qt4/include/Qt3Support/q3ptrlist.h
-qt4/include/Qt3Support/q3ptrqueue.h
-qt4/include/Qt3Support/q3ptrstack.h
-qt4/include/Qt3Support/q3ptrvector.h
-qt4/include/Qt3Support/q3rangecontrol.h
-qt4/include/Qt3Support/q3scrollview.h
-qt4/include/Qt3Support/q3semaphore.h
-qt4/include/Qt3Support/q3serversocket.h
-qt4/include/Qt3Support/q3shared.h
-qt4/include/Qt3Support/q3signal.h
-qt4/include/Qt3Support/q3simplerichtext.h
-qt4/include/Qt3Support/q3socket.h
-qt4/include/Qt3Support/q3socketdevice.h
-qt4/include/Qt3Support/q3sortedlist.h
-qt4/include/Qt3Support/q3sqlcursor.h
-qt4/include/Qt3Support/q3sqleditorfactory.h
-qt4/include/Qt3Support/q3sqlfieldinfo.h
-qt4/include/Qt3Support/q3sqlform.h
-qt4/include/Qt3Support/q3sqlpropertymap.h
-qt4/include/Qt3Support/q3sqlrecordinfo.h
-qt4/include/Qt3Support/q3sqlselectcursor.h
-qt4/include/Qt3Support/q3strlist.h
-qt4/include/Qt3Support/q3strvec.h
-qt4/include/Qt3Support/q3stylesheet.h
-qt4/include/Qt3Support/q3syntaxhighlighter.h
-qt4/include/Qt3Support/q3tabdialog.h
-qt4/include/Qt3Support/q3table.h
-qt4/include/Qt3Support/q3textbrowser.h
-qt4/include/Qt3Support/q3textedit.h
-qt4/include/Qt3Support/q3textview.h
-qt4/include/Qt3Support/q3tl.h
-qt4/include/Qt3Support/q3toolbar.h
-qt4/include/Qt3Support/q3url.h
-qt4/include/Qt3Support/q3urloperator.h
-qt4/include/Qt3Support/q3valuelist.h
-qt4/include/Qt3Support/q3valuestack.h
-qt4/include/Qt3Support/q3valuevector.h
-qt4/include/Qt3Support/q3vbox.h
-qt4/include/Qt3Support/q3whatsthis.h
-qt4/include/Qt3Support/q3widgetstack.h
-qt4/include/Qt3Support/q3wizard.h
-qt4/include/Qt3Support/qiconset.h
-qt4/include/QtCore/qabstracteventdispatcher.h
-qt4/include/QtCore/qabstractfileengine.h
-qt4/include/QtCore/qabstractitemmodel.h
-qt4/include/QtCore/qalgorithms.h
-qt4/include/QtCore/qatomic.h
-qt4/include/QtCore/qbasictimer.h
-qt4/include/QtCore/qbitarray.h
-qt4/include/QtCore/qbuffer.h
-qt4/include/QtCore/qbytearray.h
-qt4/include/QtCore/qbytearraymatcher.h
-qt4/include/QtCore/qcache.h
-qt4/include/QtCore/qchar.h
-qt4/include/QtCore/qconfig-dist.h
-qt4/include/QtCore/qconfig-large.h
-qt4/include/QtCore/qconfig-medium.h
-qt4/include/QtCore/qconfig-minimal.h
-qt4/include/QtCore/qconfig-small.h
-qt4/include/QtCore/qconfig.h
-qt4/include/QtCore/qcoreapplication.h
-qt4/include/QtCore/qcoreevent.h
-qt4/include/QtCore/qdatastream.h
-qt4/include/QtCore/qdatetime.h
-qt4/include/QtCore/qdebug.h
-qt4/include/QtCore/qdir.h
-qt4/include/QtCore/qendian.h
-qt4/include/QtCore/qeventloop.h
-qt4/include/QtCore/qfactoryinterface.h
-qt4/include/QtCore/qfeatures.h
-qt4/include/QtCore/qfile.h
-qt4/include/QtCore/qfileinfo.h
-qt4/include/QtCore/qfsfileengine.h
-qt4/include/QtCore/qglobal.h
-qt4/include/QtCore/qhash.h
-qt4/include/QtCore/qiodevice.h
-qt4/include/QtCore/qiterator.h
-qt4/include/QtCore/qlibrary.h
-qt4/include/QtCore/qlibraryinfo.h
-qt4/include/QtCore/qline.h
-qt4/include/QtCore/qlinkedlist.h
-qt4/include/QtCore/qlist.h
-qt4/include/QtCore/qlocale.h
-qt4/include/QtCore/qmap.h
-qt4/include/QtCore/qmetaobject.h
-qt4/include/QtCore/qmetatype.h
-qt4/include/QtCore/qmimedata.h
-qt4/include/QtCore/qmutex.h
-qt4/include/QtCore/qnamespace.h
-qt4/include/QtCore/qobject.h
-qt4/include/QtCore/qobjectcleanuphandler.h
-qt4/include/QtCore/qobjectdefs.h
-qt4/include/QtCore/qpair.h
-qt4/include/QtCore/qplugin.h
-qt4/include/QtCore/qpluginloader.h
-qt4/include/QtCore/qpoint.h
-qt4/include/QtCore/qpointer.h
-qt4/include/QtCore/qprocess.h
-qt4/include/QtCore/qqueue.h
-qt4/include/QtCore/qreadwritelock.h
-qt4/include/QtCore/qrect.h
-qt4/include/QtCore/qregexp.h
-qt4/include/QtCore/qsemaphore.h
-qt4/include/QtCore/qset.h
-qt4/include/QtCore/qsettings.h
-qt4/include/QtCore/qshareddata.h
-qt4/include/QtCore/qsignalmapper.h
-qt4/include/QtCore/qsize.h
-qt4/include/QtCore/qsocketnotifier.h
-qt4/include/QtCore/qstack.h
-qt4/include/QtCore/qstring.h
-qt4/include/QtCore/qstringlist.h
-qt4/include/QtCore/qstringmatcher.h
-qt4/include/QtCore/qtemporaryfile.h
-qt4/include/QtCore/qtextcodec.h
-qt4/include/QtCore/qtextcodecplugin.h
-qt4/include/QtCore/qtextstream.h
-qt4/include/QtCore/qthread.h
-qt4/include/QtCore/qthreadstorage.h
-qt4/include/QtCore/qtimer.h
-qt4/include/QtCore/qtranslator.h
-qt4/include/QtCore/qurl.h
-qt4/include/QtCore/quuid.h
-qt4/include/QtCore/qvariant.h
-qt4/include/QtCore/qvarlengtharray.h
-qt4/include/QtCore/qvector.h
-qt4/include/QtCore/qwaitcondition.h
-qt4/include/QtGui/qabstractbutton.h
-qt4/include/QtGui/qabstractitemdelegate.h
-qt4/include/QtGui/qabstractitemview.h
-qt4/include/QtGui/qabstractpagesetupdialog.h
-qt4/include/QtGui/qabstractprintdialog.h
-qt4/include/QtGui/qabstractproxymodel.h
-qt4/include/QtGui/qabstractscrollarea.h
-qt4/include/QtGui/qabstractslider.h
-qt4/include/QtGui/qabstractspinbox.h
-qt4/include/QtGui/qabstracttextdocumentlayout.h
-qt4/include/QtGui/qaccessible.h
-qt4/include/QtGui/qaccessiblebridge.h
-qt4/include/QtGui/qaccessibleobject.h
-qt4/include/QtGui/qaccessibleplugin.h
-qt4/include/QtGui/qaccessiblewidget.h
-qt4/include/QtGui/qaction.h
-qt4/include/QtGui/qactiongroup.h
-qt4/include/QtGui/qapplication.h
-qt4/include/QtGui/qbitmap.h
-qt4/include/QtGui/qboxlayout.h
-qt4/include/QtGui/qbrush.h
-qt4/include/QtGui/qbuttongroup.h
-qt4/include/QtGui/qcdestyle.h
-qt4/include/QtGui/qcheckbox.h
-qt4/include/QtGui/qclipboard.h
-qt4/include/QtGui/qcolor.h
-qt4/include/QtGui/qcolordialog.h
-qt4/include/QtGui/qcolormap.h
-qt4/include/QtGui/qcombobox.h
-qt4/include/QtGui/qcommonstyle.h
-qt4/include/QtGui/qcursor.h
-qt4/include/QtGui/qdatetimeedit.h
-qt4/include/QtGui/qdesktopwidget.h
-qt4/include/QtGui/qdial.h
-qt4/include/QtGui/qdialog.h
-qt4/include/QtGui/qdirmodel.h
-qt4/include/QtGui/qdockwidget.h
-qt4/include/QtGui/qdrag.h
-qt4/include/QtGui/qdrawutil.h
-qt4/include/QtGui/qerrormessage.h
-qt4/include/QtGui/qevent.h
-qt4/include/QtGui/qfiledialog.h
-qt4/include/QtGui/qfocusframe.h
-qt4/include/QtGui/qfont.h
-qt4/include/QtGui/qfontdatabase.h
-qt4/include/QtGui/qfontdialog.h
-qt4/include/QtGui/qfontinfo.h
-qt4/include/QtGui/qfontmetrics.h
-qt4/include/QtGui/qframe.h
-qt4/include/QtGui/qgridlayout.h
-qt4/include/QtGui/qgroupbox.h
-qt4/include/QtGui/qheaderview.h
-qt4/include/QtGui/qicon.h
-qt4/include/QtGui/qiconengine.h
-qt4/include/QtGui/qiconengineplugin.h
-qt4/include/QtGui/qimage.h
-qt4/include/QtGui/qimageiohandler.h
-qt4/include/QtGui/qimagereader.h
-qt4/include/QtGui/qimagewriter.h
-qt4/include/QtGui/qinputcontext.h
-qt4/include/QtGui/qinputcontextfactory.h
-qt4/include/QtGui/qinputcontextplugin.h
-qt4/include/QtGui/qinputdialog.h
-qt4/include/QtGui/qitemdelegate.h
-qt4/include/QtGui/qitemeditorfactory.h
-qt4/include/QtGui/qitemselectionmodel.h
-qt4/include/QtGui/qkeysequence.h
-qt4/include/QtGui/qlabel.h
-qt4/include/QtGui/qlayout.h
-qt4/include/QtGui/qlayoutitem.h
-qt4/include/QtGui/qlcdnumber.h
-qt4/include/QtGui/qlineedit.h
-qt4/include/QtGui/qlistview.h
-qt4/include/QtGui/qlistwidget.h
-qt4/include/QtGui/qmainwindow.h
-qt4/include/QtGui/qmatrix.h
-qt4/include/QtGui/qmenu.h
-qt4/include/QtGui/qmenubar.h
-qt4/include/QtGui/qmenudata.h
-qt4/include/QtGui/qmessagebox.h
-qt4/include/QtGui/qmime.h
-qt4/include/QtGui/qmotifstyle.h
-qt4/include/QtGui/qmovie.h
-qt4/include/QtGui/qpagesetupdialog.h
-qt4/include/QtGui/qpaintdevice.h
-qt4/include/QtGui/qpaintengine.h
-qt4/include/QtGui/qpainter.h
-qt4/include/QtGui/qpainterpath.h
-qt4/include/QtGui/qpalette.h
-qt4/include/QtGui/qpen.h
-qt4/include/QtGui/qpicture.h
-qt4/include/QtGui/qpictureformatplugin.h
-qt4/include/QtGui/qpixmap.h
-qt4/include/QtGui/qpixmapcache.h
-qt4/include/QtGui/qplastiquestyle.h
-qt4/include/QtGui/qpolygon.h
-qt4/include/QtGui/qprintdialog.h
-qt4/include/QtGui/qprintengine.h
-qt4/include/QtGui/qprinter.h
-qt4/include/QtGui/qprogressbar.h
-qt4/include/QtGui/qprogressdialog.h
-qt4/include/QtGui/qproxymodel.h
-qt4/include/QtGui/qpushbutton.h
-qt4/include/QtGui/qradiobutton.h
-qt4/include/QtGui/qregion.h
-qt4/include/QtGui/qrgb.h
-qt4/include/QtGui/qrubberband.h
-qt4/include/QtGui/qscrollarea.h
-qt4/include/QtGui/qscrollbar.h
-qt4/include/QtGui/qsessionmanager.h
-qt4/include/QtGui/qshortcut.h
-qt4/include/QtGui/qsizegrip.h
-qt4/include/QtGui/qsizepolicy.h
-qt4/include/QtGui/qslider.h
-qt4/include/QtGui/qsortfilterproxymodel.h
-qt4/include/QtGui/qsound.h
-qt4/include/QtGui/qspinbox.h
-qt4/include/QtGui/qsplashscreen.h
-qt4/include/QtGui/qsplitter.h
-qt4/include/QtGui/qstackedlayout.h
-qt4/include/QtGui/qstackedwidget.h
-qt4/include/QtGui/qstandarditemmodel.h
-qt4/include/QtGui/qstatusbar.h
-qt4/include/QtGui/qstringlistmodel.h
-qt4/include/QtGui/qstyle.h
-qt4/include/QtGui/qstylefactory.h
-qt4/include/QtGui/qstyleoption.h
-qt4/include/QtGui/qstylepainter.h
-qt4/include/QtGui/qstyleplugin.h
-qt4/include/QtGui/qsyntaxhighlighter.h
-qt4/include/QtGui/qtabbar.h
-qt4/include/QtGui/qtableview.h
-qt4/include/QtGui/qtablewidget.h
-qt4/include/QtGui/qtabwidget.h
-qt4/include/QtGui/qtextbrowser.h
-qt4/include/QtGui/qtextcursor.h
-qt4/include/QtGui/qtextdocument.h
-qt4/include/QtGui/qtextdocumentfragment.h
-qt4/include/QtGui/qtextedit.h
-qt4/include/QtGui/qtextformat.h
-qt4/include/QtGui/qtextlayout.h
-qt4/include/QtGui/qtextlist.h
-qt4/include/QtGui/qtextobject.h
-qt4/include/QtGui/qtextoption.h
-qt4/include/QtGui/qtexttable.h
-qt4/include/QtGui/qtoolbar.h
-qt4/include/QtGui/qtoolbox.h
-qt4/include/QtGui/qtoolbutton.h
-qt4/include/QtGui/qtooltip.h
-qt4/include/QtGui/qtreeview.h
-qt4/include/QtGui/qtreewidget.h
-qt4/include/QtGui/qtreewidgetitemiterator.h
-qt4/include/QtGui/qvalidator.h
-qt4/include/QtGui/qvfbhdr.h
-qt4/include/QtGui/qwhatsthis.h
-qt4/include/QtGui/qwidget.h
-qt4/include/QtGui/qwindowdefs.h
-qt4/include/QtGui/qwindowsstyle.h
-qt4/include/QtGui/qwindowsxpstyle.h
-qt4/include/QtGui/qwmatrix.h
-qt4/include/QtGui/qworkspace.h
-qt4/include/QtGui/qx11embed_x11.h
-qt4/include/QtGui/qx11info_x11.h
-qt4/include/QtNetwork/qabstractsocket.h
-qt4/include/QtNetwork/qftp.h
-qt4/include/QtNetwork/qhostaddress.h
-qt4/include/QtNetwork/qhostinfo.h
-qt4/include/QtNetwork/qhttp.h
-qt4/include/QtNetwork/qnetworkproxy.h
-qt4/include/QtNetwork/qtcpserver.h
-qt4/include/QtNetwork/qtcpsocket.h
-qt4/include/QtNetwork/qudpsocket.h
-qt4/include/QtNetwork/qurlinfo.h
-qt4/include/QtOpenGL/qgl.h
-qt4/include/QtOpenGL/qglcolormap.h
-qt4/include/QtOpenGL/qglpbuffer.h
-qt4/include/QtOpenGL/qglpixelbuffer.h
-qt4/include/QtSql/qsql.h
-qt4/include/QtSql/qsql_ibase.h
-qt4/include/QtSql/qsql_mysql.h
-qt4/include/QtSql/qsql_odbc.h
-qt4/include/QtSql/qsql_psql.h
-qt4/include/QtSql/qsql_sqlite.h
-qt4/include/QtSql/qsql_sqlite2.h
-qt4/include/QtSql/qsqldatabase.h
-qt4/include/QtSql/qsqldriver.h
-qt4/include/QtSql/qsqldriverplugin.h
-qt4/include/QtSql/qsqlerror.h
-qt4/include/QtSql/qsqlfield.h
-qt4/include/QtSql/qsqlindex.h
-qt4/include/QtSql/qsqlquery.h
-qt4/include/QtSql/qsqlquerymodel.h
-qt4/include/QtSql/qsqlrecord.h
-qt4/include/QtSql/qsqlrelationaldelegate.h
-qt4/include/QtSql/qsqlrelationaltablemodel.h
-qt4/include/QtSql/qsqlresult.h
-qt4/include/QtSql/qsqltablemodel.h
-qt4/include/QtSvg/qsvgrenderer.h
-qt4/include/QtSvg/qsvgwidget.h
-qt4/include/QtXml/qdom.h
-qt4/include/QtXml/qxml.h
 qt4/lib/libQt3Support.la
 qt4/lib/libQtCore.la
 qt4/lib/libQtGui.la
@@ -840,8 +39,10 @@ qt4/plugins/imageformats/libqmng.la
 @dirrm qt4/include/QtOpenGL
 @dirrm qt4/include/QtNetwork
 @dirrm qt4/include/QtGui
+@dirrm qt4/include/QtCore/arch
 @dirrm qt4/include/QtCore
 @dirrm qt4/include/Qt3Support
+@dirrm qt4/include/Qt/arch
 @dirrm qt4/include/Qt
 @dirrm qt4/include
 @dirrm qt4/bin
diff --git a/x11/qt4-libs/buildlink3.mk b/x11/qt4-libs/buildlink3.mk
index bbc6d6c3203..463d9a30937 100644
--- a/x11/qt4-libs/buildlink3.mk
+++ b/x11/qt4-libs/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2006/02/20 12:08:11 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2006/02/25 09:25:00 adam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 QT4_LIBS_BUILDLINK3_MK:=	${QT4_LIBS_BUILDLINK3_MK}+
@@ -19,7 +19,7 @@ BUILDLINK_LIBDIRS.qt4-libs+=	qt4/lib
 .endif	# QT4_LIBS_BUILDLINK3_MK
 
 QTDIR=	${BUILDLINK_PREFIX.qt4-libs}/qt4
-BUILDLINK_PASSTHRU_DIRS+= ${QTDIR}
+BUILDLINK_PASSTHRU_DIRS+=	${QTDIR}
 
 PTHREAD_OPTS+=	require
 
diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 180827b0686..cb0c85e391b 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/02/20 12:09:01 adam Exp $
+# $NetBSD: Makefile,v 1.2 2006/02/25 09:25:00 adam Exp $
 
 .include "../../x11/qt4-libs/Makefile.common"
 
@@ -7,9 +7,10 @@ COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 
+BUILD_TARGET=		sub-tools
+
 BUILD_QT4=		yes
 UNLIMIT_RESOURCES=	datasize
-BUILD_TARGET=		sub-tools
 
 post-configure:
 	${LN} -s ${QTPREFIX}/bin/moc ${WRKSRC}/bin/moc
@@ -24,10 +25,14 @@ do-install:
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
 		${QTPREFIX}/bin
 .endfor
-.for inc in QtAssistant QtDesigner QtTest QtUiTools
-	${INSTALL_DATA_DIR} ${QTPREFIX}/include/${inc}
-	${INSTALL_DATA} ${WRKSRC}/include/${inc}/*.h ${QTPREFIX}/include/${inc}/
-.endfor
+	cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} \
+		${MAKE_PROGRAM} -f Makefile.Release install_assistant_headers
+	cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} \
+		${MAKE_PROGRAM} -f Makefile.Release install_designer_headers
+	cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} \
+		${MAKE_PROGRAM} -f Makefile install_quitools_headers
+	cd ${WRKSRC}/tools/qtestlib/src && env ${MAKE_ENV} \
+		${MAKE_PROGRAM} -f Makefile install_qtestlib_headers
 	${INSTALL_LIB} ${WRKSRC}/lib/libQtAssistantClient.a ${QTPREFIX}/lib/
 .for lib in QtDesigner QtDesignerComponents QtTest
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index 8c71aae0dbd..23ec89e6ef7 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/02/20 12:09:01 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/02/25 09:25:00 adam Exp $
 lib/pkgconfig/QtTest.pc
 qt4/bin/assistant
 qt4/bin/designer
@@ -9,7 +9,43 @@ qt4/bin/qm2ts
 qt4/bin/qmake
 qt4/bin/qt3to4
 qt4/bin/qtconfig
+qt4/include/QtAssistant/QAssistantClient
+qt4/include/QtAssistant/QtAssistant
 qt4/include/QtAssistant/qassistantclient.h
+qt4/include/QtDesigner/QAbstractExtensionFactory
+qt4/include/QtDesigner/QAbstractExtensionManager
+qt4/include/QtDesigner/QAbstractFormBuilder
+qt4/include/QtDesigner/QDesignerActionEditorInterface
+qt4/include/QtDesigner/QDesignerComponents
+qt4/include/QtDesigner/QDesignerContainerExtension
+qt4/include/QtDesigner/QDesignerCustomWidgetCollectionInterface
+qt4/include/QtDesigner/QDesignerCustomWidgetInterface
+qt4/include/QtDesigner/QDesignerDnDItemInterface
+qt4/include/QtDesigner/QDesignerExportWidget
+qt4/include/QtDesigner/QDesignerExtraInfoExtension
+qt4/include/QtDesigner/QDesignerFormEditorInterface
+qt4/include/QtDesigner/QDesignerFormEditorPluginInterface
+qt4/include/QtDesigner/QDesignerFormWindowCursorInterface
+qt4/include/QtDesigner/QDesignerFormWindowInterface
+qt4/include/QtDesigner/QDesignerFormWindowManagerInterface
+qt4/include/QtDesigner/QDesignerFormWindowToolInterface
+qt4/include/QtDesigner/QDesignerIconCacheInterface
+qt4/include/QtDesigner/QDesignerLayoutDecorationExtension
+qt4/include/QtDesigner/QDesignerMemberSheetExtension
+qt4/include/QtDesigner/QDesignerMetaDataBaseInterface
+qt4/include/QtDesigner/QDesignerMetaDataBaseItemInterface
+qt4/include/QtDesigner/QDesignerObjectInspectorInterface
+qt4/include/QtDesigner/QDesignerPropertyEditorInterface
+qt4/include/QtDesigner/QDesignerPropertySheetExtension
+qt4/include/QtDesigner/QDesignerTaskMenuExtension
+qt4/include/QtDesigner/QDesignerWidgetBoxInterface
+qt4/include/QtDesigner/QDesignerWidgetDataBaseInterface
+qt4/include/QtDesigner/QDesignerWidgetDataBaseItemInterface
+qt4/include/QtDesigner/QDesignerWidgetFactoryInterface
+qt4/include/QtDesigner/QExtensionFactory
+qt4/include/QtDesigner/QExtensionManager
+qt4/include/QtDesigner/QFormBuilder
+qt4/include/QtDesigner/QtDesigner
 qt4/include/QtDesigner/abstractactioneditor.h
 qt4/include/QtDesigner/abstractdnditem.h
 qt4/include/QtDesigner/abstractformbuilder.h
@@ -45,6 +81,18 @@ qt4/include/QtDesigner/sdk_global.h
 qt4/include/QtDesigner/taskmenu.h
 qt4/include/QtDesigner/ui4.h
 qt4/include/QtDesigner/uilib_global.h
+qt4/include/QtTest/QSignalSpy
+qt4/include/QtTest/QTestAccessibility
+qt4/include/QtTest/QTestAccessibilityEvent
+qt4/include/QtTest/QTestData
+qt4/include/QtTest/QTestDelayEvent
+qt4/include/QtTest/QTestEvent
+qt4/include/QtTest/QTestEventList
+qt4/include/QtTest/QTestEventLoop
+qt4/include/QtTest/QTestKeyClicksEvent
+qt4/include/QtTest/QTestKeyEvent
+qt4/include/QtTest/QTestMouseEvent
+qt4/include/QtTest/QtTest
 qt4/include/QtTest/qsignalspy.h
 qt4/include/QtTest/qtest.h
 qt4/include/QtTest/qtest_global.h
@@ -58,6 +106,8 @@ qt4/include/QtTest/qtesteventloop.h
 qt4/include/QtTest/qtestkeyboard.h
 qt4/include/QtTest/qtestmouse.h
 qt4/include/QtTest/qtestsystem.h
+qt4/include/QtUiTools/QUiLoader
+qt4/include/QtUiTools/QtUiTools
 qt4/include/QtUiTools/quiloader.h
 qt4/lib/libQtAssistantClient.a
 qt4/lib/libQtDesigner.la