From c1a0a3eb9caecf9cff8bae8219ddb358734517ad Mon Sep 17 00:00:00 2001
From: Rmys <muscnsl@hotmail.com>
Date: Mon, 24 Dec 2018 14:13:36 +0300
Subject: [PATCH] =?UTF-8?q?pisi:rebuild=20qt5=20qmake-qt5\n=20qt5=20uzant?=
 =?UTF-8?q?=C4=B1s=C4=B1=20silindi?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/base/pisi/files/qt5.py | 4 +++-
 system/base/pisi/pspec.xml    | 7 +++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/system/base/pisi/files/qt5.py b/system/base/pisi/files/qt5.py
index 0789edf4..87df183d 100644
--- a/system/base/pisi/files/qt5.py
+++ b/system/base/pisi/files/qt5.py
@@ -47,7 +47,9 @@ qmldir = "%s/%s/qml" % (libdir, basename)
 testdir = "%s/share/%s" % (prefix, basename)
 translationdir = "%s/translations" % datadir
 
-qmake = "%s/qmake-qt5" % bindir
+#Temporary bindir to avoid qt4 conflicts
+#qmake = "%s/qmake-qt5" % bindir
+qmake = "%s/qmake" % bindir
 
 class ConfigureError(pisi.actionsapi.Error):
     def __init__(self, value=''):
diff --git a/system/base/pisi/pspec.xml b/system/base/pisi/pspec.xml
index c0e3ef25..7dd10de9 100644
--- a/system/base/pisi/pspec.xml
+++ b/system/base/pisi/pspec.xml
@@ -87,6 +87,13 @@
     </Package>
 
     <History>
+        <Update release="8">
+            <Date>2018-12-24</Date>
+            <Version>2.6</Version>
+            <Comment>Rebuild qt5 import ayarı</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2018-07-19</Date>
             <Version>2.6</Version>