summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaphael Kubo da Costa <rakuco@FreeBSD.org>2014-11-13 08:56:08 +0000
committerRaphael Kubo da Costa <rakuco@FreeBSD.org>2014-11-13 08:56:08 +0000
commit3c7333f56d3c5773110f4b72d15363d2d98f8ed8 (patch)
tree5c04a52e05b6502fc28b0a0a1b8f9ee405fd45ec
parenteditors/apel: Unbreak after EMACS update (diff)
Copy patch from lang/qt5-qml to fix the build with base GCC.
Since r372179 we are using the QML headers from the tarball, not the ones installed system-wide by qt5-qml. While this is not a problem and is kind of intended, it also means we need to apply patches like this one to both ports now.
Notes
Notes: svn path=/head/; revision=372513
-rw-r--r--x11-toolkits/qt5-quick/files/patch-git_b84f08c823
1 files changed, 23 insertions, 0 deletions
diff --git a/x11-toolkits/qt5-quick/files/patch-git_b84f08c8 b/x11-toolkits/qt5-quick/files/patch-git_b84f08c8
new file mode 100644
index 000000000000..1a632b140f27
--- /dev/null
+++ b/x11-toolkits/qt5-quick/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);
+