fix qt5 conflict

2 files changed, 5 insertions, 1 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f2851179b112..614325584171 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 # Generated by mksrcinfo v8
-# Mon Oct 24 19:39:23 UTC 2016
+# Sat Feb 11 10:46:42 UTC 2017
 pkgbase = mingw-w64-qt4
 	pkgdesc = A cross-platform application and UI framework (mingw-w64)
 	pkgver = 4.8.7
diff --git a/PKGBUILD b/PKGBUILD
index ddd961eb8ece..71f180b8c0de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -280,6 +280,10 @@ package() {
       # https://bugreports.qt.nokia.com/browse/QTBUG-14467
       sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ "${pkgdir}"/usr/${_arch}/share/qt4/mkspecs/features/win32/windows.prf
       sed -i s@'$${QT_LIBINFIX}d'@'d$${QT_LIBINFIX}'@ "${pkgdir}"/usr/${_arch}/share/qt4/mkspecs/features/qt_functions.prf
+
+      # xmlpatterns.exe, xmlpatternsvalidator.exe conflict with qt5 ones
+      mv "${pkgdir}"/usr/${_arch}/bin/xmlpatterns.exe "${pkgdir}"/usr/${_arch}/bin/xmlpatterns4.exe
+      mv "${pkgdir}"/usr/${_arch}/bin/xmlpatternsvalidator.exe "${pkgdir}"/usr/${_arch}/bin/xmlpatternsvalidator4.exe
     fi
 
     if isDebug; then