Changes 5.4.0:

Chromium-based browser engine Qt WebEngine
Qt WebView for showing web content using the native OS web engine on mobile
Full support on Qt for Windows Store Apps, including WinRT and Windows Phone 8.1
Improved Compliance with iOS 8 and Xcode 6
Improved OS X 10.10 ‘Yosemite’ support and new Mac AppStore signing
High-DPI support for Windows and OS X
Dynamic GL switching between OpenGL and ANGLE on Windows
Mix OpenGL and Qt Quick with QOpenGLWidget
Android Look-and-Feel for Qt Quick Controls
Qt Creator 3.3 with new Qt Quick Designer
Bluetooth now supports BlueZ5 with tech preview on Bluetooth LE

9 files changed, 167 insertions, 31 deletions

diff --git a/x11/qt5-qtdeclarative/Makefile b/x11/qt5-qtdeclarative/Makefile
index 921f884b116..2eb679bbcd9 100644
--- a/x11/qt5-qtdeclarative/Makefile
+++ b/x11/qt5-qtdeclarative/Makefile
@@ -1,13 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2014/12/25 13:51:13 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2014/12/30 17:23:46 adam Exp $
 
+DISTNAME=	qtdeclarative-opensource-src-${QTVERSION}
 PKGNAME=	qt5-qtdeclarative-${QTVERSION}
-PKGREVISION=	2
 COMMENT=	Qt5 module for declarative framework
 
-USE_LIBTOOL=		yes
-CONFIGURE_ARGS+=	-I${QTDIR}/include -L${QTDIR}/lib
-
-BUILD_DIRS=		qtdeclarative
 BUILD_TARGET=		sub-tools
 INSTALL_ENV+=		INSTALL_ROOT=${DESTDIR}
 INSTALLATION_DIRS+=	lib/pkgconfig
@@ -17,9 +13,8 @@ INSTALLATION_DIRS+=	lib/pkgconfig
 post-install:
 .for i in Qt5Qml.pc Qt5QmlDevTools.pc Qt5Quick.pc Qt5QuickParticles.pc \
 		Qt5QuickTest.pc
-	${RM} -f ${DESTDIR}${PREFIX}/lib/pkgconfig/${i} && \
-		cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
-		ln -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
+	cd ${DESTDIR}${PREFIX}/lib/pkgconfig && \
+	ln -f -s ${QTPREFIX}/lib/pkgconfig/${i} ${i}
 .endfor
 
 .include "../../x11/qt5-qtxmlpatterns/buildlink3.mk"
diff --git a/x11/qt5-qtdeclarative/PLIST b/x11/qt5-qtdeclarative/PLIST
index bb408b4ade4..31dcfd38b48 100644
--- a/x11/qt5-qtdeclarative/PLIST
+++ b/x11/qt5-qtdeclarative/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2014/08/24 07:30:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2014/12/30 17:23:46 adam Exp $
 lib/pkgconfig/Qt5Qml.pc
 lib/pkgconfig/Qt5QmlDevTools.pc
 lib/pkgconfig/Qt5Quick.pc
@@ -6,7 +6,9 @@ lib/pkgconfig/Qt5QuickParticles.pc
 lib/pkgconfig/Qt5QuickTest.pc
 qt5/bin/qml
 qt5/bin/qmlbundle
+qt5/bin/qmleasing
 qt5/bin/qmlimportscanner
+qt5/bin/qmllint
 qt5/bin/qmlmin
 qt5/bin/qmlplugindump
 qt5/bin/qmlprofiler
@@ -16,6 +18,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qabstractanimationjob_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qanimationgroupjob_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qanimationjobutil_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qbitfield_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qcontinuinganimationgroupjob_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qdebugmessageservice_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qdeletewatcher_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qfieldlist_p.h
@@ -34,6 +37,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qpodvector_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qpointervaluepair_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlabstractbinding_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlabstractexpression_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlabstractprofileradapter_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlaccessors_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmladaptormodel_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlapplicationengine_p.h
@@ -45,15 +49,15 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbuiltinfunctions_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbundle_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlchangeset_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcleanup_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcodegenerator_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcompiler_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcomponent_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcomponentattached_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlconfigurabledebugservice_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlconfigurabledebugservice_p_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlconnections_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcontext_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcontextwrapper_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcustomparser_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlcustomparser_p_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldata_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugserver_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldebugserverconnection_p.h
@@ -64,6 +68,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldelegatemodel_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldelegatemodel_p_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmldirparser_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlengine_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlenginecontrolservice_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlenginedebugservice_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlexpression_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlextensionplugin_p.h
@@ -76,7 +81,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinspectorinterface_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinspectorservice_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinstantiator_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinstantiator_p_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlinstruction_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlirbuilder_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmljavascriptexpression_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmljsast_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmljsastfwd_p.h
@@ -106,18 +111,20 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlobjectmodel_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlopenmetaobject_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlplatform_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpool_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlprofiler_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlprofilerdefinitions_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlprofilerservice_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlproperty_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertycache_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlpropertyvalueinterceptor_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlproxymetaobject_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlrefcount_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlscript_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlscriptstring_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlstringconverters_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlthread_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltimer_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltrace_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypecompiler_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypeloader_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypenamecache_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmltypenotavailable_p.h
@@ -137,7 +144,10 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qsequentialanimationgroupjob_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qtqmlglobal_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4alloca_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4argumentsobject_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4arraydata_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4arrayobject_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4assembler_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4binop_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4booleanobject_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4codegen_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4compileddata_p.h
@@ -169,17 +179,22 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4lookup_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4managed_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4math_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4mathobject_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4memberdata_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4mm_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4numberobject_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4object_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4objectiterator_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4objectproto_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4persistent_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4profileradapter_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4profiling_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4property_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4qmlextensions_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4qobjectwrapper_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4regalloc_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4regexp_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4regexpobject_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4registerinfo_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4runtime_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4scopedvalue_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4script_p.h
@@ -190,15 +205,15 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4sqlerrors_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4ssa_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4string_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4stringobject_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4targetplatform_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4unop_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4util_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_def_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_inl_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4value_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4variantobject_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4vme_moth_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8debug_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8engine_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8profiler_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv8profilerservice_p.h
 qt5/include/QtQml/QJSEngine
 qt5/include/QtQml/QJSValue
 qt5/include/QtQml/QJSValueIterator
@@ -263,7 +278,11 @@ qt5/include/QtQml/qqmlscriptstring.h
 qt5/include/QtQml/qtqmlglobal.h
 qt5/include/QtQml/qtqmlversion.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/designerwindowmanager_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickitem_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qaccessiblequickview_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qqmlaccessible_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickaccessibleattached_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickaccessiblefactory_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanchors_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanchors_p_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickanimatedimage_p.h
@@ -296,6 +315,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflickablebehavior_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickflipable_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfocusscope_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfontloader_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickfontmetrics_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickgridview_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimage_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickimage_p_p.h
@@ -317,6 +337,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickloader_p_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmousearea_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmousearea_p_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickmultipointtoucharea_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickopenglinfo_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpainteditem_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpath_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpath_p_p.h
@@ -328,9 +349,11 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpincharea_p_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpixmapcache_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpositioners_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpositioners_p_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickprofiler_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickpropertychanges_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrectangle_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrectangle_p_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrendercontrol_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrepeater_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickrepeater_p_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickscalegrid_p_p.h
@@ -361,6 +384,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextedit_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextedit_p_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextinput_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextinput_p_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextmetrics_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextnode_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextnodeengine_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicktextutil_p.h
@@ -372,7 +396,9 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickutilmodule_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickvaluetypes_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickview_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickwindow_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickwindowattached_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickwindowmodule_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgabstractrenderer_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgadaptationlayer_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgareaallocator_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgatlastexture_p.h
@@ -383,16 +409,18 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultdistancefieldglyphca
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultglyphnode_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultglyphnode_p_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultimagenode_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultlayer_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultpainternode_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdefaultrectanglenode_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdepthstencilbuffer_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdistancefieldglyphnode_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdistancefieldglyphnode_p_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgdistancefieldutil_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgengine_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsggeometry_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgmaterialshader_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgnode_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgnodeupdater_p.h
-qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgpainternode_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgrenderer_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgrenderloop_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qsgrendernode_p.h
@@ -407,15 +435,19 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qtquickglobal_p.h
 qt5/include/QtQuick/QQuickFramebufferObject
 qt5/include/QtQuick/QQuickImageProvider
 qt5/include/QtQuick/QQuickItem
+qt5/include/QtQuick/QQuickItemGrabResult
 qt5/include/QtQuick/QQuickPaintedItem
+qt5/include/QtQuick/QQuickRenderControl
 qt5/include/QtQuick/QQuickTextDocument
 qt5/include/QtQuick/QQuickTextureFactory
 qt5/include/QtQuick/QQuickTransform
 qt5/include/QtQuick/QQuickView
 qt5/include/QtQuick/QQuickWindow
+qt5/include/QtQuick/QSGAbstractRenderer
 qt5/include/QtQuick/QSGBasicGeometryNode
 qt5/include/QtQuick/QSGClipNode
 qt5/include/QtQuick/QSGDynamicTexture
+qt5/include/QtQuick/QSGEngine
 qt5/include/QtQuick/QSGFlatColorMaterial
 qt5/include/QtQuick/QSGGeometry
 qt5/include/QtQuick/QSGGeometryNode
@@ -444,10 +476,14 @@ qt5/include/QtQuick/designersupport.h
 qt5/include/QtQuick/qquickframebufferobject.h
 qt5/include/QtQuick/qquickimageprovider.h
 qt5/include/QtQuick/qquickitem.h
+qt5/include/QtQuick/qquickitemgrabresult.h
 qt5/include/QtQuick/qquickpainteditem.h
+qt5/include/QtQuick/qquickrendercontrol.h
 qt5/include/QtQuick/qquicktextdocument.h
 qt5/include/QtQuick/qquickview.h
 qt5/include/QtQuick/qquickwindow.h
+qt5/include/QtQuick/qsgabstractrenderer.h
+qt5/include/QtQuick/qsgengine.h
 qt5/include/QtQuick/qsgflatcolormaterial.h
 qt5/include/QtQuick/qsggeometry.h
 qt5/include/QtQuick/qsgmaterial.h
@@ -505,6 +541,14 @@ qt5/include/QtQuickTest/QtQuickTestVersion
 qt5/include/QtQuickTest/qtquicktestversion.h
 qt5/include/QtQuickTest/quicktest.h
 qt5/include/QtQuickTest/quicktestglobal.h
+qt5/include/QtQuickWidgets/${PKGVERSION}/QtQuickWidgets/private/qquickwidget_p.h
+qt5/include/QtQuickWidgets/QQuickWidget
+qt5/include/QtQuickWidgets/QtQuickWidgets
+qt5/include/QtQuickWidgets/QtQuickWidgetsDepends
+qt5/include/QtQuickWidgets/QtQuickWidgetsVersion
+qt5/include/QtQuickWidgets/qquickwidget.h
+qt5/include/QtQuickWidgets/qtquickwidgetsglobal.h
+qt5/include/QtQuickWidgets/qtquickwidgetsversion.h
 qt5/lib/cmake/Qt5Qml/Qt5QmlConfig.cmake
 qt5/lib/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake
 qt5/lib/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake
@@ -515,7 +559,8 @@ qt5/lib/cmake/Qt5Quick/Qt5QuickConfig.cmake
 qt5/lib/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake
 qt5/lib/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake
 qt5/lib/cmake/Qt5QuickTest/Qt5QuickTestConfigVersion.cmake
-qt5/lib/cmake/Qt5Widgets/Qt5Widgets_AccessibleQuickFactory.cmake
+qt5/lib/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfig.cmake
+qt5/lib/cmake/Qt5QuickWidgets/Qt5QuickWidgetsConfigVersion.cmake
 qt5/lib/libQt5Qml.la
 qt5/lib/libQt5Qml.prl
 qt5/lib/libQt5QmlDevTools.la
@@ -526,11 +571,14 @@ qt5/lib/libQt5QuickParticles.la
 qt5/lib/libQt5QuickParticles.prl
 qt5/lib/libQt5QuickTest.la
 qt5/lib/libQt5QuickTest.prl
+qt5/lib/libQt5QuickWidgets.la
+qt5/lib/libQt5QuickWidgets.prl
 qt5/lib/pkgconfig/Qt5Qml.pc
 qt5/lib/pkgconfig/Qt5QmlDevTools.pc
 qt5/lib/pkgconfig/Qt5Quick.pc
 qt5/lib/pkgconfig/Qt5QuickParticles.pc
 qt5/lib/pkgconfig/Qt5QuickTest.pc
+qt5/lib/pkgconfig/Qt5QuickWidgets.pc
 qt5/mkspecs/modules/qt_lib_qml.pri
 qt5/mkspecs/modules/qt_lib_qml_private.pri
 qt5/mkspecs/modules/qt_lib_qmldevtools.pri
@@ -540,7 +588,8 @@ qt5/mkspecs/modules/qt_lib_qmltest_private.pri
 qt5/mkspecs/modules/qt_lib_quick.pri
 qt5/mkspecs/modules/qt_lib_quick_private.pri
 qt5/mkspecs/modules/qt_lib_quickparticles_private.pri
-qt5/plugins/accessible/libqtaccessiblequick.la
+qt5/mkspecs/modules/qt_lib_quickwidgets.pri
+qt5/mkspecs/modules/qt_lib_quickwidgets_private.pri
 qt5/plugins/qmltooling/libqmldbg_qtquick2.la
 qt5/plugins/qmltooling/libqmldbg_tcp.la
 qt5/qml/Qt/labs/folderlistmodel/libqmlfolderlistmodelplugin.la
@@ -551,23 +600,18 @@ qt5/qml/Qt/labs/settings/plugins.qmltypes
 qt5/qml/Qt/labs/settings/qmldir
 qt5/qml/QtQml/Models.2/libmodelsplugin.la
 qt5/qml/QtQml/Models.2/qmldir
+qt5/qml/QtQml/StateMachine/libqtqmlstatemachine.la
+qt5/qml/QtQml/StateMachine/plugins.qmltypes
+qt5/qml/QtQml/StateMachine/qmldir
 qt5/qml/QtQuick.2/libqtquick2plugin.la
 qt5/qml/QtQuick.2/plugins.qmltypes
 qt5/qml/QtQuick.2/qmldir
-qt5/qml/QtQuick/Dialogs/Private/libdialogsprivateplugin.la
-qt5/qml/QtQuick/Dialogs/Private/qmldir
-qt5/qml/QtQuick/Dialogs/libdialogplugin.la
-qt5/qml/QtQuick/Dialogs/plugins.qmltypes
-qt5/qml/QtQuick/Dialogs/qmldir
 qt5/qml/QtQuick/LocalStorage/libqmllocalstorageplugin.la
 qt5/qml/QtQuick/LocalStorage/plugins.qmltypes
 qt5/qml/QtQuick/LocalStorage/qmldir
 qt5/qml/QtQuick/Particles.2/libparticlesplugin.la
 qt5/qml/QtQuick/Particles.2/plugins.qmltypes
 qt5/qml/QtQuick/Particles.2/qmldir
-qt5/qml/QtQuick/PrivateWidgets/libwidgetsplugin.la
-qt5/qml/QtQuick/PrivateWidgets/plugins.qmltypes
-qt5/qml/QtQuick/PrivateWidgets/qmldir
 qt5/qml/QtQuick/Window.2/libwindowplugin.la
 qt5/qml/QtQuick/Window.2/plugins.qmltypes
 qt5/qml/QtQuick/Window.2/qmldir
diff --git a/x11/qt5-qtdeclarative/buildlink3.mk b/x11/qt5-qtdeclarative/buildlink3.mk
index e9806be6636..e5fd90cbe3c 100644
--- a/x11/qt5-qtdeclarative/buildlink3.mk
+++ b/x11/qt5-qtdeclarative/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.6 2014/10/07 16:47:16 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2014/12/30 17:23:46 adam Exp $
 
 BUILDLINK_TREE+=	qt5-qtdeclarative
 
 .if !defined(QT5_QTDECLARATIVE_BUILDLINK3_MK)
 QT5_QTDECLARATIVE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt5-qtdeclarative+=	qt5-qtdeclarative>=5.2.0
-BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative?=	qt5-qtdeclarative>=5.2.1nb2
+BUILDLINK_API_DEPENDS.qt5-qtdeclarative+=	qt5-qtdeclarative>=5.4.0
+BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+=	qt5-qtdeclarative>=5.4.0
 BUILDLINK_PKGSRCDIR.qt5-qtdeclarative?=	../../x11/qt5-qtdeclarative
 
 BUILDLINK_INCDIRS.qt5-qtdeclarative+=	qt5/include
diff --git a/x11/qt5-qtdeclarative/distinfo b/x11/qt5-qtdeclarative/distinfo
new file mode 100644
index 00000000000..725e78f2404
--- /dev/null
+++ b/x11/qt5-qtdeclarative/distinfo
@@ -0,0 +1,10 @@
+$NetBSD: distinfo,v 1.1 2014/12/30 17:23:46 adam Exp $
+
+SHA1 (qtdeclarative-opensource-src-5.4.0.tar.xz) = 12c12d50c71cfb1f18c7fabfabe4ad4b364b09fe
+RMD160 (qtdeclarative-opensource-src-5.4.0.tar.xz) = b2c19c9bf472f375d78358b11042823964b42774
+Size (qtdeclarative-opensource-src-5.4.0.tar.xz) = 18401844 bytes
+SHA1 (patch-examples_quick_customitems_painteditem_painteditem.pro) = a3881ee92daae30130fa665c8686f2e1572ecc1a
+SHA1 (patch-src_3rdparty_masm_wtf_MathExtras.h) = 4b86cfe54867a376ea6267e53566e457b577de7b
+SHA1 (patch-src_qml_jsruntime_qv4engine.cpp) = 05c365003ae8e83a34b3a51ecb3164f55b8e8809
+SHA1 (patch-src_qml_jsruntime_qv4globalobject.cpp) = 814b0caf6356d687e96e7e4f1ffcc85e64c86348
+SHA1 (patch-src_qmldevtools_qmldevtools.pro) = 647ee5cabb5e63a89c5c49db8d19be05556cf3cf
diff --git a/x11/qt5-qtdeclarative/patches/patch-examples_quick_customitems_painteditem_painteditem.pro b/x11/qt5-qtdeclarative/patches/patch-examples_quick_customitems_painteditem_painteditem.pro
new file mode 100644
index 00000000000..39f751bfec4
--- /dev/null
+++ b/x11/qt5-qtdeclarative/patches/patch-examples_quick_customitems_painteditem_painteditem.pro
@@ -0,0 +1,15 @@
+$NetBSD: patch-examples_quick_customitems_painteditem_painteditem.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
+
+* Avoid conflict between "cp -R" and "libtool --mode=install"
+
+--- examples/quick/customitems/painteditem/painteditem.pro.orig	2013-11-27 01:01:54.000000000 +0000
++++ examples/quick/customitems/painteditem/painteditem.pro
+@@ -11,7 +11,7 @@ SOURCES += textballoon.cpp
+ 
+ RESOURCES += painteditem.qrc
+ 
+-DESTDIR = TextBalloonPlugin
++DESTDIR = TextBalloonPlugin_DEST
+ 
+ target.path = $$[QT_INSTALL_EXAMPLES]/quick/customitems/painteditem/TextBalloonPlugin
+ qmldir.files = TextBalloonPlugin/qmldir
diff --git a/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h b/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h
new file mode 100644
index 00000000000..dd39e9f71b4
--- /dev/null
+++ b/x11/qt5-qtdeclarative/patches/patch-src_3rdparty_masm_wtf_MathExtras.h
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_3rdparty_masm_wtf_MathExtras.h,v 1.1 2014/12/30 17:23:46 adam Exp $
+
+Skip bad section for SunOS, at least newer releases.
+
+--- src/3rdparty/masm/wtf/MathExtras.h.orig	2014-02-01 20:38:03.000000000 +0000
++++ src/3rdparty/masm/wtf/MathExtras.h
+@@ -88,7 +88,7 @@ inline double wtf_ceil(double x) { retur
+ 
+ #endif
+ 
+-#if OS(SOLARIS)
++#if OS(notSOLARIS)
+ 
+ namespace std {
+ 
diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp
new file mode 100644
index 00000000000..3974825c7c0
--- /dev/null
+++ b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_qml_jsruntime_qv4engine.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
+
+Get stack address/size on SunOS.
+
+--- src/qml/jsruntime/qv4engine.cpp.orig	2014-09-11 10:48:29.000000000 +0000
++++ src/qml/jsruntime/qv4engine.cpp
+@@ -118,11 +118,17 @@ quintptr getStackLimit()
+     pthread_attr_t attr;
+ #if HAVE(PTHREAD_NP_H) && OS(FREEBSD)
+     if (pthread_attr_get_np(pthread_self(), &attr) == 0) {
+-#else
++#elif !OS(SOLARIS)
+     if (pthread_getattr_np(pthread_self(), &attr) == 0) {
+ #endif
+         size_t stackSize = 0;
++#if OS(SOLARIS)
++        pthread_attr_init(&attr);
++        pthread_attr_getstackaddr(&attr, &stackBottom);
++        pthread_attr_getstacksize(&attr, &stackSize);
++#else
+         pthread_attr_getstack(&attr, &stackBottom, &stackSize);
++#endif
+         pthread_attr_destroy(&attr);
+ 
+ #        if defined(Q_OS_ANDROID)
diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp
new file mode 100644
index 00000000000..a3c70a6b06a
--- /dev/null
+++ b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_qml_jsruntime_qv4globalobject.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
+
+Avoid "error: call of overloaded <func> is ambiguous"
+
+--- src/qml/jsruntime/qv4globalobject.cpp.orig	2014-02-01 20:38:02.000000000 +0000
++++ src/qml/jsruntime/qv4globalobject.cpp
+@@ -534,7 +534,7 @@ ReturnedValue GlobalFunctions::method_pa
+     }
+ 
+     if (overflow) {
+-        double result = (double) v_overflow * pow(R, overflow_digit_count);
++        double result = (double) v_overflow * pow((double)R, overflow_digit_count);
+         result += v;
+         return Encode(sign * result);
+     } else {
diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro b/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro
new file mode 100644
index 00000000000..4d1f1a26d5f
--- /dev/null
+++ b/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_qmldevtools_qmldevtools.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
+
+* Create libQtQmlDevTools.so for qttools.
+
+--- src/qmldevtools/qmldevtools.pro.orig	2014-09-11 10:48:29.000000000 +0000
++++ src/qmldevtools/qmldevtools.pro
+@@ -1,7 +1,8 @@
+-option(host_build)
+ TARGET     = QtQmlDevTools
+ QT         = core
+-CONFIG += static no_module_headers internal_module qmldevtools_build
++CONFIG += no_module_headers qmldevtools_build
++target.path = $$[QT_INSTALL_LIBS]
++INSTALLS += target
+ 
+ MODULE_INCLUDES = \
+     \$\$QT_MODULE_INCLUDE_BASE \