From 2a09174c169f2dd937e12c29a280552667a0d55d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 4 Nov 2014 11:56:41 +0100
Subject: [PATCH] qt5: resolve file conflicts with qt.

---
 srcpkgs/qt5/template | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f835239daaa..fc5504cbfa6 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -1,7 +1,7 @@
 # Template file for 'qt5'
 pkgname=qt5
 version=5.3.2
-revision=2
+revision=3
 wrksrc="qt-everywhere-opensource-src-${version}"
 homepage="http://qt-project.com/"
 short_desc="A cross-platform application and UI framework (QT5)"
@@ -106,6 +106,8 @@ qt5-declarative_package() {
 		rm ${PKGDESTDIR}/usr/lib/*.a
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
+		# Rename conflicting file
+		mv ${PKGDESTDIR}/usr/bin/{qmlplugindump,qt5-qmlplugindump}
 	}
 }
 qt5-enginio-devel_package() {
@@ -218,6 +220,8 @@ qt5-quick1_package() {
 		rm -r ${PKGDESTDIR}/usr/lib/qt5/mkspecs
 		rm ${PKGDESTDIR}/usr/lib/*.so
 		rm ${PKGDESTDIR}/usr/lib/*.prl
+		# Rename conflicting file
+		mv ${PKGDESTDIR}/usr/bin/{qmlviewer,qt5-qmlviewer}
 	}
 }
 qt5-quickcontrols_package() {