Changes 4.6.1:

* Optimized empty QUrl creation
* Improve performance of getting the canonical filename on Linux
  and Symbian by using realpath() system call.
* Avoid stat() when opening a file.
* Do not look at the Qt patch-level version embedded in plugins'
  buildkeys when trying to determine if the plugin is compatible
* Bug-fixes
* load() and loadFromData() can now support compressed GL textures
  in the DDS, ETC1, PVRTC2, and PVRTC4 formats if the OpenGL graphics
  system is active and the appropriate extensions are present in the
  GL implementation.
* Fixed a small leak when using the new QPixmapCache::Key based API.

2 files changed, 87 insertions, 14 deletions

diff --git a/x11/qt4-tools/Makefile b/x11/qt4-tools/Makefile
index 8d9f6295c09..74d68dd6382 100644
--- a/x11/qt4-tools/Makefile
+++ b/x11/qt4-tools/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.28 2010/01/18 09:59:44 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2010/01/29 18:19:09 adam Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../x11/qt4-libs/Makefile.common"
 
 PKGNAME=	qt4-tools-${QTVERSION}
-PKGREVISION=	2
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
@@ -13,14 +12,21 @@ DEPENDS+=	libtool-base-[0-9]*:../../devel/libtool-base
 CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
 CONFIGURE_ARGS+=	-DQT_NO_DBUS
 
-BUILD_TARGET=		sub-tools sub-tools-qdoc3
+# XXX this is to test what really gets installed when 'do-install' is disabled
+INSTALL_DIRS+=		tools
+
+BUILD_TARGET=		sub-tools-bootstrap sub-tools
 
 BUILD_QT4=		yes
 UNLIMIT_RESOURCES=	datasize
 
-INSTALLATION_DIRS=	${QTPREFIX}/bin ${QTPREFIX}/lib lib/pkgconfig \
-	${QTPREFIX}/plugins/designer ${QTPREFIX}/phrasebooks \
-	${QTPREFIX}/mkspecs ${QTPREFIX}/tools/qdoc3
+INSTALLATION_DIRS=	lib/pkgconfig
+INSTALLATION_DIRS+=	${QTPREFIX}/bin
+INSTALLATION_DIRS+=	${QTPREFIX}/lib
+INSTALLATION_DIRS+=	${QTPREFIX}/phrasebooks
+INSTALLATION_DIRS+=	${QTPREFIX}/plugins/designer
+INSTALLATION_DIRS+=	${QTPREFIX}/mkspecs
+INSTALLATION_DIRS+=	${QTPREFIX}/tools/qdoc3
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 
 post-configure:
@@ -32,13 +38,11 @@ do-install:
 .for prog in assistant_adp lrelease lupdate pixeltool qmake qt3to4
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} ${DESTDIR}${QTPREFIX}/bin/
 .endfor
-.for prog in assistant designer linguist qtconfig qhelpconverter \
+.for prog in assistant designer linguist qdoc3 qtconfig qhelpconverter \
 		qhelpgenerator qcollectiongenerator
 	${LIBTOOL} --mode=install ${INSTALL_PROGRAM} ${WRKSRC}/bin/${prog} \
 		${DESTDIR}${QTPREFIX}/bin
 .endfor
-	${INSTALL_PROGRAM} ${WRKSRC}/tools/qdoc3/qdoc3 \
-		${DESTDIR}${QTPREFIX}/tools/qdoc3/
 	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} \
@@ -57,6 +61,9 @@ do-install:
 	${LIBTOOL} --mode=install ${INSTALL_LIB} \
 		${WRKSRC}/plugins/designer/libqt3supportwidgets.la \
 		${DESTDIR}${QTPREFIX}/plugins/designer/
+	${LIBTOOL} --mode=install ${INSTALL_LIB} \
+		${WRKSRC}/plugins/designer/libqwebview.la \
+		${DESTDIR}${QTPREFIX}/plugins/designer/
 	${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 253dcd5ec3b..ae83f713da6 100644
--- a/x11/qt4-tools/PLIST
+++ b/x11/qt4-tools/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2009/10/17 23:32:52 wiz Exp $
+@comment $NetBSD: PLIST,v 1.20 2010/01/29 18:19:10 adam Exp $
 lib/pkgconfig/QtAssistantClient.pc
 lib/pkgconfig/QtCLucene.pc
 lib/pkgconfig/QtDesigner.pc
@@ -13,6 +13,7 @@ qt4/bin/lrelease
 qt4/bin/lupdate
 qt4/bin/pixeltool
 qt4/bin/qcollectiongenerator
+qt4/bin/qdoc3
 qt4/bin/qhelpconverter
 qt4/bin/qhelpgenerator
 qt4/bin/qmake
@@ -156,8 +157,12 @@ qt4/mkspecs/common/mac-llvm.conf
 qt4/mkspecs/common/mac.conf
 qt4/mkspecs/common/qmake.conf
 qt4/mkspecs/common/qws.conf
+qt4/mkspecs/common/symbian/qplatformdefs.h
+qt4/mkspecs/common/symbian/stl-off/new
+qt4/mkspecs/common/symbian/symbian.conf
 qt4/mkspecs/common/unix.conf
-qt4/mkspecs/common/wince.conf
+qt4/mkspecs/common/wince/qmake.conf
+qt4/mkspecs/common/wince/qplatformdefs.h
 qt4/mkspecs/cygwin-g++/qmake.conf
 qt4/mkspecs/cygwin-g++/qplatformdefs.h
 qt4/mkspecs/darwin-g++/qmake.conf
@@ -173,6 +178,7 @@ qt4/mkspecs/features/default_post.prf
 qt4/mkspecs/features/default_pre.prf
 qt4/mkspecs/features/designer.prf
 qt4/mkspecs/features/dll.prf
+qt4/mkspecs/features/egl.prf
 qt4/mkspecs/features/exclusive_builds.prf
 qt4/mkspecs/features/help.prf
 qt4/mkspecs/features/include_source_dir.prf
@@ -207,6 +213,17 @@ qt4/mkspecs/features/silent.prf
 qt4/mkspecs/features/static.prf
 qt4/mkspecs/features/static_and_shared.prf
 qt4/mkspecs/features/staticlib.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/default_post.prf
+qt4/mkspecs/features/symbian/default_pre.prf
+qt4/mkspecs/features/symbian/epocallowdlldata.prf
+qt4/mkspecs/features/symbian/moc.prf
+qt4/mkspecs/features/symbian/platform_paths.prf
+qt4/mkspecs/features/symbian/qt.prf
+qt4/mkspecs/features/symbian/stl.prf
+qt4/mkspecs/features/symbian/stl_off.prf
 qt4/mkspecs/features/uic.prf
 qt4/mkspecs/features/uitools.prf
 qt4/mkspecs/features/unix/bsymbolic_functions.prf
@@ -214,6 +231,7 @@ qt4/mkspecs/features/unix/dylib.prf
 qt4/mkspecs/features/unix/hide_symbols.prf
 qt4/mkspecs/features/unix/largefile.prf
 qt4/mkspecs/features/unix/opengl.prf
+qt4/mkspecs/features/unix/openvg.prf
 qt4/mkspecs/features/unix/separate_debug_info.prf
 qt4/mkspecs/features/unix/thread.prf
 qt4/mkspecs/features/unix/x11.prf
@@ -221,6 +239,7 @@ qt4/mkspecs/features/unix/x11inc.prf
 qt4/mkspecs/features/unix/x11lib.prf
 qt4/mkspecs/features/unix/x11sm.prf
 qt4/mkspecs/features/use_c_linker.prf
+qt4/mkspecs/features/vxworks.prf
 qt4/mkspecs/features/warn_off.prf
 qt4/mkspecs/features/warn_on.prf
 qt4/mkspecs/features/win32/console.prf
@@ -233,6 +252,7 @@ qt4/mkspecs/features/win32/exceptions.prf
 qt4/mkspecs/features/win32/exceptions_off.prf
 qt4/mkspecs/features/win32/ltcg.prf
 qt4/mkspecs/features/win32/opengl.prf
+qt4/mkspecs/features/win32/openvg.prf
 qt4/mkspecs/features/win32/qaxcontainer.prf
 qt4/mkspecs/features/win32/qaxserver.prf
 qt4/mkspecs/features/win32/qt_dll.prf
@@ -288,6 +308,8 @@ qt4/mkspecs/linux-g++-32/qmake.conf
 qt4/mkspecs/linux-g++-32/qplatformdefs.h
 qt4/mkspecs/linux-g++-64/qmake.conf
 qt4/mkspecs/linux-g++-64/qplatformdefs.h
+qt4/mkspecs/linux-g++-maemo/qmake.conf
+qt4/mkspecs/linux-g++-maemo/qplatformdefs.h
 qt4/mkspecs/linux-g++/qmake.conf
 qt4/mkspecs/linux-g++/qplatformdefs.h
 qt4/mkspecs/linux-icc-32/qmake.conf
@@ -310,6 +332,10 @@ qt4/mkspecs/macx-g++/Info.plist.app
 qt4/mkspecs/macx-g++/Info.plist.lib
 qt4/mkspecs/macx-g++/qmake.conf
 qt4/mkspecs/macx-g++/qplatformdefs.h
+qt4/mkspecs/macx-g++40/Info.plist.app
+qt4/mkspecs/macx-g++40/Info.plist.lib
+qt4/mkspecs/macx-g++40/qmake.conf
+qt4/mkspecs/macx-g++40/qplatformdefs.h
 qt4/mkspecs/macx-g++42/Info.plist.app
 qt4/mkspecs/macx-g++42/Info.plist.lib
 qt4/mkspecs/macx-g++42/qmake.conf
@@ -358,8 +384,8 @@ qt4/mkspecs/qws/linux-lsb-g++/qmake.conf
 qt4/mkspecs/qws/linux-lsb-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-mips-g++/qmake.conf
 qt4/mkspecs/qws/linux-mips-g++/qplatformdefs.h
-qt4/mkspecs/qws/linux-ppc-g++/qmake.conf
-qt4/mkspecs/qws/linux-ppc-g++/qplatformdefs.h
+qt4/mkspecs/qws/linux-powerpc-g++/qmake.conf
+qt4/mkspecs/qws/linux-powerpc-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-sh-g++/qmake.conf
 qt4/mkspecs/qws/linux-sh-g++/qplatformdefs.h
 qt4/mkspecs/qws/linux-sh4al-g++/qmake.conf
@@ -381,14 +407,25 @@ qt4/mkspecs/sco-cc/qmake.conf
 qt4/mkspecs/sco-cc/qplatformdefs.h
 qt4/mkspecs/sco-g++/qmake.conf
 qt4/mkspecs/sco-g++/qplatformdefs.h
+qt4/mkspecs/solaris-cc-64-stlport/qmake.conf
+qt4/mkspecs/solaris-cc-64-stlport/qplatformdefs.h
 qt4/mkspecs/solaris-cc-64/qmake.conf
 qt4/mkspecs/solaris-cc-64/qplatformdefs.h
+qt4/mkspecs/solaris-cc-stlport/qmake.conf
+qt4/mkspecs/solaris-cc-stlport/qplatformdefs.h
 qt4/mkspecs/solaris-cc/qmake.conf
 qt4/mkspecs/solaris-cc/qplatformdefs.h
 qt4/mkspecs/solaris-g++-64/qmake.conf
 qt4/mkspecs/solaris-g++-64/qplatformdefs.h
 qt4/mkspecs/solaris-g++/qmake.conf
 qt4/mkspecs/solaris-g++/qplatformdefs.h
+qt4/mkspecs/symbian-abld/qmake.conf
+qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_emulator_deployment.flm
+qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_extra_pre_targetdep.flm
+qt4/mkspecs/symbian-sbsv2/flm/qt/qmake_post_link.flm
+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/tru64-cxx/qmake.conf
 qt4/mkspecs/tru64-cxx/qplatformdefs.h
 qt4/mkspecs/tru64-g++/qmake.conf
@@ -397,6 +434,27 @@ qt4/mkspecs/unixware-cc/qmake.conf
 qt4/mkspecs/unixware-cc/qplatformdefs.h
 qt4/mkspecs/unixware-g++/qmake.conf
 qt4/mkspecs/unixware-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/linux-host-g++/qmake.conf
+qt4/mkspecs/unsupported/linux-host-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf
+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-generic-g++/qmake.conf
+qt4/mkspecs/unsupported/qws/qnx-generic-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/qws/qnx-i386-g++/qmake.conf
+qt4/mkspecs/unsupported/qws/qnx-i386-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qmake.conf
+qt4/mkspecs/unsupported/qws/qnx-ppc-g++/qplatformdefs.h
+qt4/mkspecs/unsupported/vxworks-ppc-dcc/qmake.conf
+qt4/mkspecs/unsupported/vxworks-ppc-dcc/qplatformdefs.h
+qt4/mkspecs/unsupported/vxworks-ppc-g++/qmake.conf
+qt4/mkspecs/unsupported/vxworks-ppc-g++/qplatformdefs.h
+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/win32-borland/qmake.conf
 qt4/mkspecs/win32-borland/qplatformdefs.h
 qt4/mkspecs/win32-g++/qmake.conf
@@ -445,6 +503,8 @@ qt4/mkspecs/wince50standard-x86-msvc2008/qmake.conf
 qt4/mkspecs/wince50standard-x86-msvc2008/qplatformdefs.h
 qt4/mkspecs/wince60standard-armv4i-msvc2005/qmake.conf
 qt4/mkspecs/wince60standard-armv4i-msvc2005/qplatformdefs.h
+qt4/mkspecs/wince60standard-x86-msvc2005/qmake.conf
+qt4/mkspecs/wince60standard-x86-msvc2005/qplatformdefs.h
 qt4/mkspecs/wincewm50pocket-msvc2005/default_post.prf
 qt4/mkspecs/wincewm50pocket-msvc2005/qmake.conf
 qt4/mkspecs/wincewm50pocket-msvc2005/qplatformdefs.h
@@ -469,6 +529,12 @@ qt4/mkspecs/wincewm60standard-msvc2005/qplatformdefs.h
 qt4/mkspecs/wincewm60standard-msvc2008/default_post.prf
 qt4/mkspecs/wincewm60standard-msvc2008/qmake.conf
 qt4/mkspecs/wincewm60standard-msvc2008/qplatformdefs.h
+qt4/mkspecs/wincewm65professional-msvc2005/default_post.prf
+qt4/mkspecs/wincewm65professional-msvc2005/qmake.conf
+qt4/mkspecs/wincewm65professional-msvc2005/qplatformdefs.h
+qt4/mkspecs/wincewm65professional-msvc2008/default_post.prf
+qt4/mkspecs/wincewm65professional-msvc2008/qmake.conf
+qt4/mkspecs/wincewm65professional-msvc2008/qplatformdefs.h
 qt4/phrasebooks/danish.qph
 qt4/phrasebooks/dutch.qph
 qt4/phrasebooks/finnish.qph
@@ -482,4 +548,4 @@ qt4/phrasebooks/russian.qph
 qt4/phrasebooks/spanish.qph
 qt4/phrasebooks/swedish.qph
 qt4/plugins/designer/libqt3supportwidgets.la
-qt4/tools/qdoc3/qdoc3
+qt4/plugins/designer/libqwebview.la