Changes 4.7.1:

Qt 4.7.1 is a bug-fix release. It maintains both forward and backward
compatibility (source and binary) with Qt 4.7.0.  For more details,
refer to the online documentation included in this distribution. The
documentation is also available online:

  http://qt.nokia.com/doc/4.7

The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.


Changes 4.7.0:
Qt 4.7 introduces many new features and improvements as well as bugfixes
over the 4.6.x series. For more details, refer to the online documentation
included in this distribution. The documentation is also available online:

  http://qt.nokia.com/doc/4.7

The Qt version 4.7 series is binary compatible with the 4.6.x series.
Applications compiled for 4.6 will continue to run with 4.7.

2 files changed, 70 insertions, 30 deletions

diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 8418e6077d9..c6cf9e62902 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2010/09/14 11:01:16 wiz Exp $
+# $NetBSD: Makefile,v 1.36 2010/11/15 13:05:47 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
-PKGREVISION=	2
-
 PKGNAME=	qt4-tools-${QTVERSION}
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
@@ -37,35 +35,31 @@ post-configure:
 	ln -s ${QTPREFIX}/bin/rcc ${WRKSRC}/bin/rcc
 
 do-install:
-.for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4
+.for prog in lconvert lrelease lupdate pixeltool qdoc3 qmake qmlviewer qt3to4 qtconfig qttracereplay xmlpatterns xmlpatternsvalidator
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
 .endfor
-.for prog in assistant designer linguist qdoc3 qtconfig qhelpconverter \
-		qhelpgenerator qcollectiongenerator
+.for prog in assistant designer linguist qcollectiongenerator qhelpconverter qhelpgenerator
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
 		${DESTDIR}${QTPREFIX}/bin
 .endfor
 	cd ${WRKSRC}/tools/assistant/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
 		${MAKE_PROGRAM} install_flat_headers install_targ_headers install_class_headers
-	cd ${WRKSRC}/tools/assistant/compat/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
-		${MAKE_PROGRAM} install_assistant_headers
 	cd ${WRKSRC}/tools/designer/src/lib && env ${MAKE_ENV} ${INSTALL_ENV} \
 		${MAKE_PROGRAM} install_designer_headers
 	cd ${WRKSRC}/tools/designer/src/uitools && env ${MAKE_ENV} ${INSTALL_ENV} \
 		${MAKE_PROGRAM} install_quitools_headers
-.for lib in QtAssistantClient QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools
+.for lib in QtCLucene QtDesigner QtDesignerComponents QtHelp QtUiTools
 	${LIBTOOL} --mode=install ${INSTALL_LIB} ${WRKSRC}/lib/lib${lib}.la \
 		${DESTDIR}${QTPREFIX}/lib/
 	sed -e "s:${WRKSRC}:${QTPREFIX}:g" \
 		${WRKSRC}/lib/pkgconfig/${lib}.pc > ${WRKDIR}/${lib}.pc
 	${INSTALL_DATA} ${WRKDIR}/${lib}.pc ${DESTDIR}${PREFIX}/lib/pkgconfig/
 .endfor
+.for lib in qdeclarativeview qt3supportwidgets qwebview
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
-		${WRKSRC}/plugins/designer/libqt3supportwidgets.la \
-		${DESTDIR}${QTPREFIX}/plugins/designer/
-	${LIBTOOL} --mode=install ${INSTALL_LIB} \
-		${WRKSRC}/plugins/designer/libqwebview.la \
+		${WRKSRC}/plugins/designer/lib${lib}.la \
 		${DESTDIR}${QTPREFIX}/plugins/designer/
+.endfor
 	${INSTALL_DATA} ${WRKSRC}/tools/linguist/phrasebooks/*.qph \
 		${DESTDIR}${QTPREFIX}/phrasebooks/
 	cp -R ${WRKSRC}/mkspecs ${DESTDIR}${QTPREFIX}
diff --git a/x11/qt4-tools/PLIST b/x11/qt4-tools/PLIST
index b713b25afb5..76e46010794 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,13 +1,12 @@
-@comment $NetBSD: PLIST,v 1.22 2010/07/04 06:00:15 adam Exp $
-lib/pkgconfig/QtAssistantClient.pc
+@comment $NetBSD: PLIST,v 1.23 2010/11/15 13:05:47 adam Exp $
 lib/pkgconfig/QtCLucene.pc
 lib/pkgconfig/QtDesigner.pc
 lib/pkgconfig/QtDesignerComponents.pc
 lib/pkgconfig/QtHelp.pc
 lib/pkgconfig/QtUiTools.pc
 qt4/bin/assistant
-qt4/bin/assistant_adp
 qt4/bin/designer
+qt4/bin/lconvert
 qt4/bin/linguist
 qt4/bin/lrelease
 qt4/bin/lupdate
@@ -17,8 +16,12 @@ qt4/bin/qdoc3
 qt4/bin/qhelpconverter
 qt4/bin/qhelpgenerator
 qt4/bin/qmake
+qt4/bin/qmlviewer
 qt4/bin/qt3to4
 qt4/bin/qtconfig
+qt4/bin/qttracereplay
+qt4/bin/xmlpatterns
+qt4/bin/xmlpatternsvalidator
 qt4/include/Qt/QtHelp
 qt4/include/Qt/qhelp_global.h
 qt4/include/Qt/qhelpcontentwidget.h
@@ -28,10 +31,6 @@ qt4/include/Qt/qhelpindexwidget.h
 qt4/include/Qt/qhelpsearchengine.h
 qt4/include/Qt/qhelpsearchquerywidget.h
 qt4/include/Qt/qhelpsearchresultwidget.h
-qt4/include/QtAssistant/QAssistantClient
-qt4/include/QtAssistant/QtAssistant
-qt4/include/QtAssistant/qassistantclient.h
-qt4/include/QtAssistant/qassistantclient_global.h
 qt4/include/QtDesigner/QAbstractExtensionFactory
 qt4/include/QtDesigner/QAbstractExtensionManager
 qt4/include/QtDesigner/QAbstractFormBuilder
@@ -135,7 +134,6 @@ qt4/include/QtHelp/qhelpsearchresultwidget.h
 qt4/include/QtUiTools/QUiLoader
 qt4/include/QtUiTools/QtUiTools
 qt4/include/QtUiTools/quiloader.h
-qt4/lib/libQtAssistantClient.la
 qt4/lib/libQtCLucene.la
 qt4/lib/libQtDesigner.la
 qt4/lib/libQtDesignerComponents.la
@@ -149,16 +147,41 @@ qt4/mkspecs/aix-xlc-64/qmake.conf
 qt4/mkspecs/aix-xlc-64/qplatformdefs.h
 qt4/mkspecs/aix-xlc/qmake.conf
 qt4/mkspecs/aix-xlc/qplatformdefs.h
+qt4/mkspecs/common/aix/qplatformdefs.h
+qt4/mkspecs/common/armcc.conf
+qt4/mkspecs/common/c89/qplatformdefs.h
 qt4/mkspecs/common/g++.conf
 qt4/mkspecs/common/linux.conf
 qt4/mkspecs/common/llvm.conf
 qt4/mkspecs/common/mac-g++.conf
 qt4/mkspecs/common/mac-llvm.conf
 qt4/mkspecs/common/mac.conf
+qt4/mkspecs/common/posix/qplatformdefs.h
 qt4/mkspecs/common/qmake.conf
 qt4/mkspecs/common/qws.conf
+qt4/mkspecs/common/symbian/header-wrappers/AknBitmapAnimation.h
+qt4/mkspecs/common/symbian/header-wrappers/AknDoc.h
+qt4/mkspecs/common/symbian/header-wrappers/AknFontAccess.h
+qt4/mkspecs/common/symbian/header-wrappers/AknInputLanguageInfo.h
+qt4/mkspecs/common/symbian/header-wrappers/AknLayoutFont.h
+qt4/mkspecs/common/symbian/header-wrappers/AknPopupFader.h
+qt4/mkspecs/common/symbian/header-wrappers/AknServerApp.h
+qt4/mkspecs/common/symbian/header-wrappers/AknUtils.h
+qt4/mkspecs/common/symbian/header-wrappers/AknsBasicBackgroundControlContext.h
+qt4/mkspecs/common/symbian/header-wrappers/AknsConstants.h
+qt4/mkspecs/common/symbian/header-wrappers/AknsDrawUtils.h
+qt4/mkspecs/common/symbian/header-wrappers/AknsItemID.h
+qt4/mkspecs/common/symbian/header-wrappers/AknsSkinInstance.h
+qt4/mkspecs/common/symbian/header-wrappers/AknsUtils.h
+qt4/mkspecs/common/symbian/header-wrappers/ApAccessPointItem.h
+qt4/mkspecs/common/symbian/header-wrappers/ApDataHandler.h
+qt4/mkspecs/common/symbian/header-wrappers/ApUtils.h
+qt4/mkspecs/common/symbian/header-wrappers/CDirectoryLocalizer.h
+qt4/mkspecs/common/symbian/header-wrappers/DocumentHandler.h
 qt4/mkspecs/common/symbian/qplatformdefs.h
 qt4/mkspecs/common/symbian/stl-off/new
+qt4/mkspecs/common/symbian/symbian-makefile.conf
+qt4/mkspecs/common/symbian/symbian-mmp.conf
 qt4/mkspecs/common/symbian/symbian.conf
 qt4/mkspecs/common/unix.conf
 qt4/mkspecs/common/wince/qmake.conf
@@ -168,7 +191,6 @@ qt4/mkspecs/cygwin-g++/qplatformdefs.h
 qt4/mkspecs/darwin-g++/qmake.conf
 qt4/mkspecs/darwin-g++/qplatformdefs.h
 qt4/mkspecs/default
-qt4/mkspecs/features/assistant.prf
 qt4/mkspecs/features/build_pass.prf
 qt4/mkspecs/features/dbusadaptors.prf
 qt4/mkspecs/features/dbusinterfaces.prf
@@ -217,16 +239,27 @@ qt4/mkspecs/features/symbian/add_mmp_rules.prf
 qt4/mkspecs/features/symbian/application_icon.prf
 qt4/mkspecs/features/symbian/armcc_warnings.prf
 qt4/mkspecs/features/symbian/data_caging_paths.prf
+qt4/mkspecs/features/symbian/debug.prf
 qt4/mkspecs/features/symbian/def_files.prf
 qt4/mkspecs/features/symbian/def_files_disabled.prf
 qt4/mkspecs/features/symbian/default_post.prf
 qt4/mkspecs/features/symbian/default_pre.prf
+qt4/mkspecs/features/symbian/do_not_build_as_thumb.prf
 qt4/mkspecs/features/symbian/epocallowdlldata.prf
 qt4/mkspecs/features/symbian/moc.prf
+qt4/mkspecs/features/symbian/nested_exceptions.prf
+qt4/mkspecs/features/symbian/opengl.prf
 qt4/mkspecs/features/symbian/platform_paths.prf
 qt4/mkspecs/features/symbian/qt.prf
+qt4/mkspecs/features/symbian/qt_config.prf
+qt4/mkspecs/features/symbian/release.prf
+qt4/mkspecs/features/symbian/run_on_phone.prf
+qt4/mkspecs/features/symbian/sis_targets.prf
 qt4/mkspecs/features/symbian/stl.prf
 qt4/mkspecs/features/symbian/stl_off.prf
+qt4/mkspecs/features/symbian/symbian_building.prf
+qt4/mkspecs/features/symbian/thread.prf
+qt4/mkspecs/features/testcase.prf
 qt4/mkspecs/features/uic.prf
 qt4/mkspecs/features/uitools.prf
 qt4/mkspecs/features/unix/bsymbolic_functions.prf
@@ -254,6 +287,7 @@ qt4/mkspecs/features/win32/embed_manifest_exe.prf
 qt4/mkspecs/features/win32/exceptions.prf
 qt4/mkspecs/features/win32/exceptions_off.prf
 qt4/mkspecs/features/win32/ltcg.prf
+qt4/mkspecs/features/win32/msvc_mp.prf
 qt4/mkspecs/features/win32/opengl.prf
 qt4/mkspecs/features/win32/openvg.prf
 qt4/mkspecs/features/win32/qaxcontainer.prf
@@ -358,6 +392,9 @@ qt4/mkspecs/macx-xcode/qmake.conf
 qt4/mkspecs/macx-xcode/qplatformdefs.h
 qt4/mkspecs/macx-xlc/qmake.conf
 qt4/mkspecs/macx-xlc/qplatformdefs.h
+qt4/mkspecs/modules/README
+qt4/mkspecs/modules/qmake.conf
+qt4/mkspecs/modules/qt_webkit_version.pri
 qt4/mkspecs/netbsd-g++/qmake.conf
 qt4/mkspecs/netbsd-g++/qplatformdefs.h
 qt4/mkspecs/openbsd-g++/qmake.conf
@@ -367,6 +404,8 @@ qt4/mkspecs/qws/freebsd-generic-g++/qmake.conf
 qt4/mkspecs/qws/freebsd-generic-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-arm-g++/qmake.conf
 qt4/mkspecs/qws/linux-arm-g++/qplatformdefs.h
+qt4/mkspecs/qws/linux-arm-gnueabi-g++/qmake.conf
+qt4/mkspecs/qws/linux-arm-gnueabi-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-armv6-g++/qmake.conf
 qt4/mkspecs/qws/linux-armv6-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-avr32-g++/qmake.conf
@@ -431,6 +470,13 @@ qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_store_build.flm
 qt4/mkspecs/symbian-sbsv2/flm/qt/qt.xml
 qt4/mkspecs/symbian-sbsv2/qmake.conf
 qt4/mkspecs/symbian-sbsv2/qplatformdefs.h
+qt4/mkspecs/symbian/linux-armcc/features/default_post.prf
+qt4/mkspecs/symbian/linux-armcc/qmake.conf
+qt4/mkspecs/symbian/linux-armcc/qplatformdefs.h
+qt4/mkspecs/symbian/linux-gcce/features/default_post.prf
+qt4/mkspecs/symbian/linux-gcce/qmake.conf
+qt4/mkspecs/symbian/linux-gcce/qplatformdefs.h
+qt4/mkspecs/symbian/qmake.conf
 qt4/mkspecs/tru64-cxx/qmake.conf
 qt4/mkspecs/tru64-cxx/qplatformdefs.h
 qt4/mkspecs/tru64-g++/qmake.conf
@@ -446,6 +492,8 @@ qt4/mkspecs/unsupported/linux-scratchbox2-g++/qplatformdefs.h
 qt4/mkspecs/unsupported/qmake.conf
 qt4/mkspecs/unsupported/qnx-g++/qmake.conf
 qt4/mkspecs/unsupported/qnx-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/qws/qnx-641/qmake.conf
+qt4/mkspecs/unsupported/qws/qnx-641/qplatformdefs.h
 qt4/mkspecs/unsupported/qws/qnx-generic-g++/qmake.conf
 qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
 qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
@@ -460,26 +508,22 @@ qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qmake.conf
 qt4/mkspecs/unsupported/vxworks-simpentium-dcc/qplatformdefs.h
 qt4/mkspecs/unsupported/vxworks-simpentium-g++/qmake.conf
 qt4/mkspecs/unsupported/vxworks-simpentium-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/win32-g++-cross/qmake.conf
+qt4/mkspecs/unsupported/win32-g++-cross/qplatformdefs.h
 qt4/mkspecs/win32-borland/qmake.conf
 qt4/mkspecs/win32-borland/qplatformdefs.h
 qt4/mkspecs/win32-g++/qmake.conf
 qt4/mkspecs/win32-g++/qplatformdefs.h
 qt4/mkspecs/win32-icc/qmake.conf
 qt4/mkspecs/win32-icc/qplatformdefs.h
-qt4/mkspecs/win32-msvc.net/qmake.conf
-qt4/mkspecs/win32-msvc.net/qplatformdefs.h
-qt4/mkspecs/win32-msvc/features/incremental.prf
-qt4/mkspecs/win32-msvc/features/incremental_off.prf
-qt4/mkspecs/win32-msvc/qmake.conf
-qt4/mkspecs/win32-msvc/qplatformdefs.h
-qt4/mkspecs/win32-msvc2002/qmake.conf
-qt4/mkspecs/win32-msvc2002/qplatformdefs.h
 qt4/mkspecs/win32-msvc2003/qmake.conf
 qt4/mkspecs/win32-msvc2003/qplatformdefs.h
 qt4/mkspecs/win32-msvc2005/qmake.conf
 qt4/mkspecs/win32-msvc2005/qplatformdefs.h
 qt4/mkspecs/win32-msvc2008/qmake.conf
 qt4/mkspecs/win32-msvc2008/qplatformdefs.h
+qt4/mkspecs/win32-msvc2010/qmake.conf
+qt4/mkspecs/win32-msvc2010/qplatformdefs.h
 qt4/mkspecs/wince50standard-armv4i-msvc2005/default_post.prf
 qt4/mkspecs/wince50standard-armv4i-msvc2005/qmake.conf
 qt4/mkspecs/wince50standard-armv4i-msvc2005/qplatformdefs.h
@@ -545,6 +589,7 @@ qt4/phrasebooks/dutch.qph
 qt4/phrasebooks/finnish.qph
 qt4/phrasebooks/french.qph
 qt4/phrasebooks/german.qph
+qt4/phrasebooks/hungarian.qph
 qt4/phrasebooks/italian.qph
 qt4/phrasebooks/japanese.qph
 qt4/phrasebooks/norwegian.qph
@@ -552,5 +597,6 @@ qt4/phrasebooks/polish.qph
 qt4/phrasebooks/russian.qph
 qt4/phrasebooks/spanish.qph
 qt4/phrasebooks/swedish.qph
+qt4/plugins/designer/libqdeclarativeview.la
 qt4/plugins/designer/libqt3supportwidgets.la
 qt4/plugins/designer/libqwebview.la