2 files changed, 101 insertions, 30 deletions

diff --git a/lang/qt5-qml/files/patch-git_cf6e9711 b/lang/qt5-qml/files/patch-git_cf6e9711
deleted file mode 100644
index 54a4b13f6c9b..000000000000
--- a/lang/qt5-qml/files/patch-git_cf6e9711
+++ /dev/null
@@ -1,26 +0,0 @@
-commit cf6e97119df5bf17b4a952b257d05d43b7d6ca26
-Author: Alex Richardson <arichardson.kde@gmail.com>
-Date:   Wed Jan 21 09:10:01 2015 +0000
-
-    Don't crash on FreeBSD when computing stack limits
-    
-    On FreeBSD pthread_attr_t is a pointer and is dereferenced when calling
-    pthread_attr_get_np() so if we don't initialize it will probably crash.
-    This is not a problem on glibc systems since there pthread_attr_t is an
-    opaque union an doesn't need to be allocated using malloc().
-    
-    Change-Id: I227685ddf9981974ade08aee8917f7262c301787
-    Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-
---- src/qml/jsruntime/qv4engine.cpp
-+++ src/qml/jsruntime/qv4engine.cpp
-@@ -112,7 +112,8 @@ quintptr getStackLimit()
-     void* stackBottom = 0;
-     pthread_attr_t attr;
- #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
-     if (pthread_getattr_np(pthread_self(), &attr) == 0) {
- #endif
diff --git a/lang/qt5-qml/pkg-plist b/lang/qt5-qml/pkg-plist
index 5c2660163aa5..2430945ab262 100644
--- a/lang/qt5-qml/pkg-plist
+++ b/lang/qt5-qml/pkg-plist
@@ -30,7 +30,6 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignal_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlboundsignalexpressionpointer_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbuiltinfunctions_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlbundle_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlchangeset_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcleanup_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcompiler_p.h
@@ -87,9 +86,10 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmllocale_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmemoryprofiler_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmetatype_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelindexvaluetype_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlmodelsmodule_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnotifier_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnullablevalue_p_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlnullablevalue_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectcreator_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlobjectmodel_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlopenmetaobject_p.h
@@ -107,7 +107,6 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlstringconverters_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlthread_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltimer_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltrace_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypecompiler_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypeloader_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenamecache_p.h
@@ -128,6 +127,7 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qtqmlglobal_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4alloca_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4argumentsobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraybuffer_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arraydata_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arrayobject_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4assembler_p.h
@@ -137,6 +137,7 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compileddata_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compiler_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4context_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dataview_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4dateobject_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4debugging_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4debugservice_p.h
@@ -190,13 +191,13 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4string_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringobject_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4targetplatform_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4typedarray_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4unop_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4util_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_inl_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4value_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4variantobject_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4vme_moth_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8debug_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8engine_p.h
 %%QT_INCDIR%%/QtQml/QJSEngine
 %%QT_INCDIR%%/QtQml/QJSValue
@@ -261,6 +262,102 @@
 %%QT_INCDIR%%/QtQml/qqmlscriptstring.h
 %%QT_INCDIR%%/QtQml/qtqmlglobal.h
 %%QT_INCDIR%%/QtQml/qtqmlversion.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qbitfield_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qdeletewatcher_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qfieldlist_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qfinitestack_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qflagpointer_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qhashedstring_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qhashfield_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qintrusivelist_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qlazilyallocated_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qpodvector_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qpointervaluepair_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlirbuilder_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsast_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsastfwd_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsastvisitor_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsengine_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsglobal_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsgrammar_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljskeywords_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljslexer_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsmemorypool_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmljsparser_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlnullablevalue_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlpool_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlrefcount_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmlthread_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qqmltypecompiler_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qrecursionwatcher_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qrecyclepool_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qtqmldevtoolsglobal_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4alloca_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4argumentsobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4arraybuffer_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4arraydata_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4arrayobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4booleanobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4codegen_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4compileddata_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4compiler_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4context_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4dataview_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4dateobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4debugging_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4engine_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4errorobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4executableallocator_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4function_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4functionobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4global_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4globalobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4identifier_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4identifiertable_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4include_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4instr_moth_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4internalclass_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4isel_moth_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4isel_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4isel_util_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4jsir_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4jsonobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4lookup_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4managed_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4math_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4mathobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4memberdata_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4mm_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4numberobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4object_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4objectiterator_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4objectproto_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4persistent_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4profiling_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4property_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4qmlextensions_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4qobjectwrapper_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4regexp_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4regexpobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4runtime_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4scopedvalue_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4script_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4sequenceobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4serialize_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4sparsearray_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4ssa_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4string_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4stringobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4typedarray_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4util_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4value_inl_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4value_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4variantobject_p.h
+%%QT_INCDIR%%/QtQmlDevTools/%%FULLVER%%/QtQmlDevTools/private/qv4vme_moth_p.h
+%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevTools
+%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevToolsDepends
+%%QT_INCDIR%%/QtQmlDevTools/QtQmlDevToolsVersion
+%%QT_INCDIR%%/QtQmlDevTools/qtqmldevtoolsversion.h
 %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5QmlConfig.cmake
 %%QT_LIBDIR%%/cmake/Qt5Qml/Qt5QmlConfigVersion.cmake
 %%QT_LIBDIR%%/libQt5Qml.prl