Changes 5.5.1:

Qt Bluetooth
Bluetooth Low Energy API final release (5.4 was featuring tech preview).
Bluetooth Low Energy Support for Android (requires Android v18+) added.
Bluetooth Classic and Low Energy support for iOS and OS X.

Qt Core
You can now have Q_PROPERTY and Q_INVOKABLE within a Q_GADGET, and there is a way to query the QMetaObject of such gadget using the QMetaTYpe system.
Added Q_ENUM to replace Q_ENUMS which allow to get a QMetaEnum at compile time using QMetaEnum::fromType<T>. Such enums are now automatically registered as metatype, and can be converted to string within QVariant, or are printed as string by qDebug()

Qt GUI
Windows packages are all built with -opengl dynamic. No OpenGL-only or ANGLE-only builds are provided anymore.
On Windows the OpenGL implementation to use can now be configured based on the GPU vendor and driver version using JSON configuration files. This allows shipping fine-grained card and driver blacklists with the apps, when necessary.
QOpenGLWidget is now supported in iOS.
QImage: 8-bit alpha map and grayscale formats.
QImageReader: EXIF orientation can now be read though the transformation method, and applied on read to JPEGs if wanted.

Qt Multimedia
GStreamer 1.0 support. Note that the default is still 0.10. 1.0 support can be enabled by configuring Qt with '-gstreamer 1.0'.
New video filtering framework to integrate frameworks like OpenCV or compute APIs such as OpenCL or CUDA with VideoOutput elements.
New API to control camera viewfinder settings
Improved camera support on iOS (focus, zoom, exposure, viewfinder/image settings)
The QML MediaPlayer is now rendered in an OpenGL texture on iOS. This means VideoOutput supports advanced transformation, shader effects and doesn't have to be always on top of other items anymore.

Qt NFC
Neard based backend for Linux added.

Qt Network
New SSL back-end for iOS and OS X based on Secure Transport. Note that in Qt 5.6 this will become the default SSL: back-end on these platforms.
Support for libproxy
Support for TLS PSK ciphersuites
Support for elliptic curve certificates
Ability to select specific curves when using elliptic curve ciphersuites.

QPA
Added support for the Raspberry Pi 2.
Added support for the ODROID-XU3.
On supported desktops, the xcb plugin now uses the D-Bus based org.kde.StatusNotifier protocol for system tray icons, and org.freedesktop.Notifications for notifications.
KMS/DRM backend for EGLFS. This replaces the now deprecated KMS platform plugin. It allows running apps with eglfs on the console on systems with Mesa and devices that come with drm support.
EGLFS has a plugin-based backend mechanism in addition to the existing, statically compiled-in solution. Most compiled-in hooks are converted to be dynamically loaded plugins that are built based on configure time tests. This reduces the reliance on the device makespecs for RPi, i.MX6 and Mali-based devices.
Input handling is now unified for EGLFS and LinuxFB, avoiding the need to launch and configure LinuxFB-based apps differently than when using EGLFS.
tslib is now better integrated with EGLFS and LinuxFB to provide support for resistive single-touch touchscreens often used in industrial environments.
xcb is refactored to move GLX and EGL support into plugins. No more ifdefs, allowing building both backends.
Added a TUIO Touch plugin for receiving remote touch events via UDP.
Added a libinput plugin.
iOS: you can now use QFileDialog to browse system photos using a native image picker dialog by setting directory to QStandardPaths::PicturesLocation. Selected photos can be loaded using QFile.

Qt QML
It is now possible to conveniently expose custom C++ value types into the JavaScript environment of QML and QJSEngine.
Support for JavaScript typed arrays
Various performance improvements, notably QJSValue
Added convenience qJsEngine(QObject*) getter function.

Qt Quick
Windows now defaults to the threaded Qt Quick render loop when using desktop OpenGL (opengl32.dll).
QQuickWidget is now supported in iOS.
QQuickRenderControl supports threaded rendering.
Improved behavior of Flickable on OS X trackpads using pixel deltas from native gestures.
PinchArea handles native pinch gestures when the OS provides them (so far only on OS X). Otherwise it relies on touch events, as before.
Added a smart zoom signal to PinchArea to react to that gesture on an OS X trackpad.
MouseArea now has a scrollGestureEnabled property to control whether native scroll gestures from the OS will be handled by the wheel signal handler.

Qt Quick Controls
Qt Quick Extras (formerly Qt Quick Enterprise Controls) was added under the QtQuick.Extras import.
TreeView control for QAbstractItemModel-derived models. Supports QItemSelectionModel selection.

Qt WebEngine
Updated Chromium snapshot to version 40
WebEngineProfile for control of storage and cache paths and related policies.
Added support for javascript Geolocation API with QtLocation as a backend
Added API for managing downloading of files
Added API for controlling cache and cookie paths and policy
Added API for WebEngine settings
Added API for injecting user scripts
Various experimental QML API has been promoted to public
Added QtWebChannel integration API over Chromium IPC

Qt WebView
Added native implementations for Mac OS X.
Added API for running JavaScript (Requires API 19+ on Android).
Added API for setting the HTML content.
Added API for load status notifications.

7 files changed, 128 insertions, 48 deletions

diff --git a/x11/qt5-qtdeclarative/Makefile b/x11/qt5-qtdeclarative/Makefile
index 4a1b40dcba1..4d3bce280f3 100644
--- a/x11/qt5-qtdeclarative/Makefile
+++ b/x11/qt5-qtdeclarative/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2015/10/10 01:57:57 ryoon Exp $
+# $NetBSD: Makefile,v 1.14 2015/10/26 19:03:59 adam Exp $
 
 DISTNAME=	qtdeclarative-opensource-src-${QTVERSION}
 PKGNAME=	qt5-qtdeclarative-${QTVERSION}
-PKGREVISION=	3
 COMMENT=	Qt5 module for declarative framework
 
 BUILD_TARGET=		sub-tools
diff --git a/x11/qt5-qtdeclarative/PLIST b/x11/qt5-qtdeclarative/PLIST
index 31dcfd38b48..a14b1e35f0b 100644
--- a/x11/qt5-qtdeclarative/PLIST
+++ b/x11/qt5-qtdeclarative/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2014/12/30 17:23:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2015/10/26 19:03:59 adam Exp $
 lib/pkgconfig/Qt5Qml.pc
 lib/pkgconfig/Qt5QmlDevTools.pc
 lib/pkgconfig/Qt5Quick.pc
 lib/pkgconfig/Qt5QuickParticles.pc
 lib/pkgconfig/Qt5QuickTest.pc
 qt5/bin/qml
-qt5/bin/qmlbundle
 qt5/bin/qmleasing
 qt5/bin/qmlimportscanner
 qt5/bin/qmllint
@@ -46,7 +45,6 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlbinding_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlboundsignal_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlboundsignalexpressionpointer_p.h
 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/qqmlcompiler_p.h
@@ -103,9 +101,10 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmllistwrapper_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmllocale_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmemoryprofiler_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmetatype_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmodelindexvaluetype_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlmodelsmodule_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlnotifier_p.h
-qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlnullablevalue_p_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlnullablevalue_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlobjectcreator_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlobjectmodel_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qqmlopenmetaobject_p.h
@@ -123,7 +122,6 @@ 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
@@ -144,6 +142,7 @@ 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/qv4arraybuffer_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
@@ -153,6 +152,7 @@ qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4codegen_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4compileddata_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4compiler_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4context_p.h
+qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4dataview_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4dateobject_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4debugging_p.h
 qt5/include/QtQml/${PKGVERSION}/QtQml/private/qv4debugservice_p.h
@@ -206,13 +206,13 @@ 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/qv4typedarray_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_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/QJSEngine
 qt5/include/QtQml/QJSValue
@@ -277,10 +277,105 @@ qt5/include/QtQml/qqmlpropertyvaluesource.h
 qt5/include/QtQml/qqmlscriptstring.h
 qt5/include/QtQml/qtqmlglobal.h
 qt5/include/QtQml/qtqmlversion.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qbitfield_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qdeletewatcher_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qfieldlist_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qfinitestack_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qflagpointer_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qhashedstring_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qhashfield_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qintrusivelist_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qlazilyallocated_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qpodvector_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qpointervaluepair_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlirbuilder_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsast_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsastfwd_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsastvisitor_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsengine_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsglobal_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsgrammar_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljskeywords_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljslexer_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsmemorypool_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmljsparser_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlnullablevalue_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlpool_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlrefcount_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmlthread_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qqmltypecompiler_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qrecursionwatcher_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qrecyclepool_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qtqmldevtoolsglobal_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4alloca_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4argumentsobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4arraybuffer_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4arraydata_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4arrayobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4booleanobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4codegen_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4compileddata_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4compiler_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4context_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4dataview_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4dateobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4debugging_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4engine_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4errorobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4executableallocator_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4function_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4functionobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4global_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4globalobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4identifier_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4identifiertable_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4include_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4instr_moth_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4internalclass_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4isel_moth_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4isel_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4isel_util_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4jsir_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4jsonobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4lookup_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4managed_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4math_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4mathobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4memberdata_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4mm_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4numberobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4object_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4objectiterator_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4objectproto_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4persistent_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4profiling_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4property_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4qmlextensions_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4qobjectwrapper_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4regexp_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4regexpobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4runtime_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4scopedvalue_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4script_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4sequenceobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4serialize_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4sparsearray_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4ssa_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4string_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4stringobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4typedarray_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4util_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4value_inl_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4value_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4variantobject_p.h
+qt5/include/QtQmlDevTools/${PKGVERSION}/QtQmlDevTools/private/qv4vme_moth_p.h
+qt5/include/QtQmlDevTools/QtQmlDevTools
+qt5/include/QtQmlDevTools/QtQmlDevToolsDepends
+qt5/include/QtQmlDevTools/QtQmlDevToolsVersion
+qt5/include/QtQmlDevTools/qtqmldevtoolsversion.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
@@ -362,6 +457,7 @@ qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffect_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffectmesh_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffectnode_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshadereffectsource_p.h
+qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickshortcut_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksmoothedanimation_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquicksmoothedanimation_p_p.h
 qt5/include/QtQuick/${PKGVERSION}/QtQuick/private/qquickspringanimation_p.h
@@ -553,8 +649,6 @@ qt5/lib/cmake/Qt5Qml/Qt5QmlConfig.cmake
 qt5/lib/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake
 qt5/lib/cmake/Qt5Qml/Qt5Qml_QTcpServerConnection.cmake
 qt5/lib/cmake/Qt5Qml/Qt5Qml_QtQuick2Plugin.cmake
-qt5/lib/cmake/Qt5QmlDevTools/Qt5QmlDevToolsConfig.cmake
-qt5/lib/cmake/Qt5QmlDevTools/Qt5QmlDevToolsConfigVersion.cmake
 qt5/lib/cmake/Qt5Quick/Qt5QuickConfig.cmake
 qt5/lib/cmake/Qt5Quick/Qt5QuickConfigVersion.cmake
 qt5/lib/cmake/Qt5QuickTest/Qt5QuickTestConfig.cmake
@@ -581,7 +675,6 @@ 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
 qt5/mkspecs/modules/qt_lib_qmldevtools_private.pri
 qt5/mkspecs/modules/qt_lib_qmltest.pri
 qt5/mkspecs/modules/qt_lib_qmltest_private.pri
@@ -599,6 +692,7 @@ qt5/qml/Qt/labs/settings/libqmlsettingsplugin.la
 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/plugins.qmltypes
 qt5/qml/QtQml/Models.2/qmldir
 qt5/qml/QtQml/StateMachine/libqtqmlstatemachine.la
 qt5/qml/QtQml/StateMachine/plugins.qmltypes
diff --git a/x11/qt5-qtdeclarative/buildlink3.mk b/x11/qt5-qtdeclarative/buildlink3.mk
index 083e316a206..44863db9d9e 100644
--- a/x11/qt5-qtdeclarative/buildlink3.mk
+++ b/x11/qt5-qtdeclarative/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.9 2015/04/25 14:25:17 tnn Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2015/10/26 19:03:59 adam Exp $
 
 BUILDLINK_TREE+=	qt5-qtdeclarative
 
 .if !defined(QT5_QTDECLARATIVE_BUILDLINK3_MK)
 QT5_QTDECLARATIVE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.qt5-qtdeclarative+=	qt5-qtdeclarative>=5.4.0
-BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+=	qt5-qtdeclarative>=5.4.0nb2
+BUILDLINK_API_DEPENDS.qt5-qtdeclarative+=	qt5-qtdeclarative>=5.5.1
+BUILDLINK_ABI_DEPENDS.qt5-qtdeclarative+=	qt5-qtdeclarative>=5.5.1
 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
index 6765f030801..d76d7d978b4 100644
--- a/x11/qt5-qtdeclarative/distinfo
+++ b/x11/qt5-qtdeclarative/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.2 2015/02/19 22:29:18 joerg Exp $
+$NetBSD: distinfo,v 1.3 2015/10/26 19:03:59 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 (qtdeclarative-opensource-src-5.5.1.tar.xz) = 57206b9ffe0485bfd35c0aad85737fb4a7b77c8b
+RMD160 (qtdeclarative-opensource-src-5.5.1.tar.xz) = 1d8939c42f4b510443365479ffe8bc525e0faac6
+SHA512 (qtdeclarative-opensource-src-5.5.1.tar.xz) = e8c25eeaca66cfb8b8bd014487ad81b8b9780e2f3e898b967d0923dbb40b54cd32c35859b7419e964319401995c27a229ed0ec9d1ec6d2aba84002b59abefddf
+Size (qtdeclarative-opensource-src-5.5.1.tar.xz) = 18627840 bytes
 SHA1 (patch-examples_quick_customitems_painteditem_painteditem.pro) = a3881ee92daae30130fa665c8686f2e1572ecc1a
 SHA1 (patch-src_3rdparty_masm_assembler_ARMAssembler.h) = fbcbe9e0fd3514d95f54a858223b20bb34f52bb2
 SHA1 (patch-src_3rdparty_masm_assembler_ARMv7Assembler.h) = 505b2a585a7ed98e63403a3cc44d839a4f80c01d
 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
+SHA1 (patch-src_qml_jsruntime_qv4engine.cpp) = 6ee219c0606a2d8e0134cf07891e712800278e18
+SHA1 (patch-src_qmldevtools_qmldevtools.pro) = 600955fcc1e0dfabe83ada9761a9a6f7e847b8a0
diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp
index 3974825c7c0..03f1587b066 100644
--- a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp
+++ b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4engine.cpp
@@ -1,18 +1,20 @@
-$NetBSD: patch-src_qml_jsruntime_qv4engine.cpp,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-src_qml_jsruntime_qv4engine.cpp,v 1.2 2015/10/26 19:03:59 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.orig	2015-06-29 20:12:38.000000000 +0000
 +++ src/qml/jsruntime/qv4engine.cpp
-@@ -118,11 +118,17 @@ quintptr getStackLimit()
-     pthread_attr_t attr;
+@@ -136,13 +136,19 @@ quintptr getStackLimit()
  #if HAVE(PTHREAD_NP_H) && OS(FREEBSD)
-     if (pthread_attr_get_np(pthread_self(), &attr) == 0) {
+     // on FreeBSD pthread_attr_init() must be called otherwise getting the attrs crashes
+     if (pthread_attr_init(&attr) == 0 && pthread_attr_get_np(pthread_self(), &attr) == 0) {
 -#else
 +#elif !OS(SOLARIS)
      if (pthread_getattr_np(pthread_self(), &attr) == 0) {
  #endif
+         void *stackBottom = Q_NULLPTR;
          size_t stackSize = 0;
+ 
 +#if OS(SOLARIS)
 +        pthread_attr_init(&attr);
 +        pthread_attr_getstackaddr(&attr, &stackBottom);
diff --git a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp b/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp
deleted file mode 100644
index a3c70a6b06a..00000000000
--- a/x11/qt5-qtdeclarative/patches/patch-src_qml_jsruntime_qv4globalobject.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$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
index 4d1f1a26d5f..ae2b8a5c721 100644
--- a/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro
+++ b/x11/qt5-qtdeclarative/patches/patch-src_qmldevtools_qmldevtools.pro
@@ -1,17 +1,17 @@
-$NetBSD: patch-src_qmldevtools_qmldevtools.pro,v 1.1 2014/12/30 17:23:46 adam Exp $
+$NetBSD: patch-src_qmldevtools_qmldevtools.pro,v 1.2 2015/10/26 19:03:59 adam Exp $
 
 * Create libQtQmlDevTools.so for qttools.
 
---- src/qmldevtools/qmldevtools.pro.orig	2014-09-11 10:48:29.000000000 +0000
+--- src/qmldevtools/qmldevtools.pro.orig	2015-06-29 20:12:36.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
+-CONFIG += static internal_module qmldevtools_build
++CONFIG += internal_module qmldevtools_build
 +target.path = $$[QT_INSTALL_LIBS]
 +INSTALLS += target
  
- MODULE_INCLUDES = \
-     \$\$QT_MODULE_INCLUDE_BASE \
+ # Don't use pch because the auto-generated header refers to QtBootstrap,
+ # which doesn't exist