8 files changed, 88 insertions, 49 deletions

diff --git a/lang/qt5-qml/Makefile b/lang/qt5-qml/Makefile
index dff964d18527..f9f495c44958 100644
--- a/lang/qt5-qml/Makefile
+++ b/lang/qt5-qml/Makefile
@@ -2,7 +2,6 @@
 
 PORTNAME=	qml
 DISTVERSION=	${QT5_VERSION}
-PORTREVISION=	1
 CATEGORIES=	lang
 PKGNAMEPREFIX=	qt5-
 
@@ -14,9 +13,15 @@ QT_DIST=	declarative
 USES=		python:build qmake
 USE_LDCONFIG=	${PREFIX}/${QT_LIBDIR_REL}
 
-WRKSRC_SUBDIR=	src/${PORTNAME}
+BUILD_WRKSRC=	${WRKSRC}/src
+INSTALL_WRKSRC=	${WRKSRC}/src
 
 post-patch:
-	${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' ${WRKSRC}/../3rdparty/masm/masm.pri
+# tools/tools.pro will be processed automatically unless it does not exist.
+	${RM} -r ${WRKSRC}/tools
+
+	${REINPLACE_CMD} 's,python,${PYTHON_CMD},g' \
+		${WRKSRC}/src/3rdparty/masm/masm.pri
+
 
 .include <bsd.port.mk>
diff --git a/lang/qt5-qml/files/patch-git_b84f08c8 b/lang/qt5-qml/files/patch-git_b84f08c8
new file mode 100644
index 000000000000..1a632b140f27
--- /dev/null
+++ b/lang/qt5-qml/files/patch-git_b84f08c8
@@ -0,0 +1,23 @@
+Fixes the build with base GCC.
+
+commit b84f08c8b7c91a979bd74840561af2391ef20666
+Author: Lars Knoll <lars.knoll@digia.com>
+Date:   Tue May 6 13:30:31 2014 +0200
+
+    Fix compiler warning
+
+    Change-Id: I26df4f1b8417c6b075d81eaf118669a4103503e2
+    Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
+
+--- src/qml/jsruntime/qv4object_p.h
++++ src/qml/jsruntime/qv4object_p.h
+@@ -168,7 +168,8 @@ struct Q_QML_EXPORT Object: Managed {
+     void defineReadonlyProperty(const StringRef name, ValueRef value);
+ 
+     void insertMember(const StringRef s, const ValueRef v, PropertyAttributes attributes = Attr_Data) {
+-        insertMember(s, Property(*v), attributes);
++        Property p(*v);
++        insertMember(s, p, attributes);
+     }
+     void insertMember(const StringRef s, const Property &p, PropertyAttributes attributes);
+ 
diff --git a/lang/qt5-qml/files/patch-jsruntime__qv4alloca_p.h b/lang/qt5-qml/files/patch-jsruntime__qv4alloca_p.h
deleted file mode 100644
index 272340c889ee..000000000000
--- a/lang/qt5-qml/files/patch-jsruntime__qv4alloca_p.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./jsruntime/qv4alloca_p.h.orig	2014-02-01 20:38:02.000000000 +0000
-+++ ./jsruntime/qv4alloca_p.h	2014-02-24 08:11:34.679454851 +0000
-@@ -49,7 +49,7 @@
- #  ifndef __GNUC__
- #    define alloca _alloca
- #  endif
--#else
-+#elif !defined(Q_OS_FREEBSD)
- #  include <alloca.h>
- #endif
- 
diff --git a/lang/qt5-qml/files/patch-jsruntime__qv4engine.cpp b/lang/qt5-qml/files/patch-jsruntime__qv4engine.cpp
deleted file mode 100644
index c73ed5c2c07e..000000000000
--- a/lang/qt5-qml/files/patch-jsruntime__qv4engine.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./jsruntime/qv4engine.cpp.orig	2014-02-01 20:38:02.000000000 +0000
-+++ ./jsruntime/qv4engine.cpp	2014-02-24 08:26:02.342458294 +0000
-@@ -109,7 +112,11 @@
- #  else
-     void* stackBottom = 0;
-     pthread_attr_t attr;
-+#if defined(Q_OS_FREEBSD)
-+    pthread_attr_init(&attr);
-+#else
-     pthread_getattr_np(pthread_self(), &attr);
-+#endif
-     size_t stackSize = 0;
-     pthread_attr_getstack(&attr, &stackBottom, &stackSize);
-     pthread_attr_destroy(&attr);
diff --git a/lang/qt5-qml/files/patch-jsruntime__qv4mm.cpp b/lang/qt5-qml/files/patch-jsruntime__qv4mm.cpp
deleted file mode 100644
index b31dde5e6103..000000000000
--- a/lang/qt5-qml/files/patch-jsruntime__qv4mm.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
---- ./jsruntime/qv4mm.cpp.orig	2013-10-22 01:49:53.000000000 -0700
-+++ ./jsruntime/qv4mm.cpp	2013-11-06 15:34:38.035186604 -0800
-@@ -218,7 +218,11 @@
- #  else
-     void* stackBottom = 0;
-     pthread_attr_t attr;
-+#    if OS(FREEBSD)
-+    pthread_attr_init(&attr);
-+#    else
-     pthread_getattr_np(pthread_self(), &attr);
-+#    endif
-     size_t stackSize = 0;
-     pthread_attr_getstack(&attr, &stackBottom, &stackSize);
-     pthread_attr_destroy(&attr);
diff --git a/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp b/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp
new file mode 100644
index 000000000000..ecc5d0572282
--- /dev/null
+++ b/lang/qt5-qml/files/patch-src__qml__jit__qv4assembler.cpp
@@ -0,0 +1,11 @@
+--- src/qml/jit/qv4assembler.cpp
++++ src/qml/jit/qv4assembler.cpp
+@@ -96,7 +96,7 @@ QV4::ExecutableAllocator::ChunkOfPages *CompilationUnit::chunkForFunction(int fu
+ /* Platform/Calling convention/Architecture specific section */
+ 
+ #if CPU(X86_64)
+-#  if OS(LINUX) || OS(MAC_OS_X)
++#  if OS(UNIX)
+ static const Assembler::RegisterID calleeSavedRegisters[] = {
+     JSC::X86Registers::ebx,
+     JSC::X86Registers::r12, // LocalsRegister
diff --git a/lang/qt5-qml/files/patch-src__src.pro b/lang/qt5-qml/files/patch-src__src.pro
new file mode 100644
index 000000000000..a8fd52f7ec42
--- /dev/null
+++ b/lang/qt5-qml/files/patch-src__src.pro
@@ -0,0 +1,24 @@
+Only enter the directories we want to build, otherwise we might fail due to
+missing dependencies.
+
+--- src/src.pro
++++ src/src.pro
+@@ -3,18 +3,7 @@
+ SUBDIRS += \
+     qml
+ 
+-qtHaveModule(gui):contains(QT_CONFIG, opengl(es1|es2)?) {
+-    SUBDIRS += \
+-        quick \
+-        qmltest \
+-        particles
+-
+-    qtHaveModule(widgets): SUBDIRS += quickwidgets
+-}
+-
+ SUBDIRS += \
+-    plugins \
+-    imports \
+     qmldevtools
+ 
+ qmldevtools.CONFIG = host_build
diff --git a/lang/qt5-qml/pkg-plist b/lang/qt5-qml/pkg-plist
index 6baa5fbb776e..7d51e93f4513 100644
--- a/lang/qt5-qml/pkg-plist
+++ b/lang/qt5-qml/pkg-plist
@@ -2,6 +2,7 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationgroupjob_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qanimationjobutil_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qbitfield_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qcontinuinganimationgroupjob_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qdebugmessageservice_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qdeletewatcher_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qfieldlist_p.h
@@ -20,6 +21,7 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qpointervaluepair_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractbinding_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractexpression_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlabstractprofileradapter_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlaccessors_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmladaptormodel_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlapplicationengine_p.h
@@ -31,15 +33,15 @@
 %%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/qqmlcodegenerator_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcompiler_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponent_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcomponentattached_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconfigurabledebugservice_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconfigurabledebugservice_p_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlconnections_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontext_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcontextwrapper_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcustomparser_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlcustomparser_p_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldata_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserver_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldebugserverconnection_p.h
@@ -50,6 +52,7 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldelegatemodel_p_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmldirparser_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlengine_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlenginecontrolservice_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlenginedebugservice_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlexpression_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlextensionplugin_p.h
@@ -62,7 +65,7 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinspectorservice_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstantiator_p_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlinstruction_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlirbuilder_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljavascriptexpression_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsast_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmljsastfwd_p.h
@@ -92,18 +95,20 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlopenmetaobject_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlplatform_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpool_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofiler_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofilerdefinitions_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlprofilerservice_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproperty_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertycache_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlpropertyvalueinterceptor_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlproxymetaobject_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlrefcount_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscript_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmlscriptstring_p.h
 %%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
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qqmltypenotavailable_p.h
@@ -123,7 +128,10 @@
 %%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/qv4arraydata_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4arrayobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4assembler_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4binop_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4booleanobject_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4codegen_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4compileddata_p.h
@@ -155,11 +163,15 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4managed_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4math_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mathobject_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4memberdata_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4mm_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4numberobject_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4object_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4objectiterator_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4objectproto_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4persistent_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4profileradapter_p.h
+%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4profiling_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4property_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qmlextensions_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4qobjectwrapper_p.h
@@ -176,15 +188,14 @@
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4ssa_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4string_p.h
 %%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv4stringobject_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_def_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/%%FULLVER%%/QtQml/private/qv8profiler_p.h
-%%QT_INCDIR%%/QtQml/%%FULLVER%%/QtQml/private/qv8profilerservice_p.h
 %%QT_INCDIR%%/QtQml/QJSEngine
 %%QT_INCDIR%%/QtQml/QJSValue
 %%QT_INCDIR%%/QtQml/QJSValueIterator
@@ -256,6 +267,10 @@
 %%QT_LIBDIR%%/libQt5Qml.so.%%SHORTVER%%
 %%QT_LIBDIR%%/libQt5Qml.so.%%FULLVER%%
 %%DEBUG%%%%QT_LIBDIR%%/libQt5Qml.so.%%FULLVER%%.debug
+%%QT_LIBDIR%%/libQt5QmlDevTools.a
+%%QT_LIBDIR%%/libQt5QmlDevTools.prl
 %%QT_MKSPECDIR%%/modules/qt_lib_qml.pri
 %%QT_MKSPECDIR%%/modules/qt_lib_qml_private.pri
+%%QT_MKSPECDIR%%/modules/qt_lib_qmldevtools_private.pri
 libdata/pkgconfig/Qt5Qml.pc
+libdata/pkgconfig/Qt5QmlDevTools.pc