From 317888a1867f3a375ba52fe451b7c0388c6e8c4d Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Aug 16 2018 14:42:03 +0000
Subject: fixed #1405880, prefer qmake-qt5


---

diff --git a/kdevelop-5.2.3-qmake.patch b/kdevelop-5.2.3-qmake.patch
new file mode 100644
index 0000000..d18f0b4
--- /dev/null
+++ b/kdevelop-5.2.3-qmake.patch
@@ -0,0 +1,33 @@
+diff -up kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp.me kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp
+--- kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp.me	2018-08-16 16:38:38.934730806 +0200
++++ kdevelop-5.2.3/plugins/qmakemanager/qmakeconfig.cpp	2018-08-16 16:39:39.222043168 +0200
+@@ -83,14 +83,14 @@ QString QMakeConfig::qmakeExecutable(con
+         }
+     }
+     if (exe.isEmpty()) {
+-        exe = QStandardPaths::findExecutable(QStringLiteral("qmake"));
+-    }
+-    if (exe.isEmpty()) {
+         exe = QStandardPaths::findExecutable(QStringLiteral("qmake-qt5"));
+     }
+     if (exe.isEmpty()) {
+         exe = QStandardPaths::findExecutable(QStringLiteral("qmake-qt4"));
+     }
++    if (exe.isEmpty()) {
++        exe = QStandardPaths::findExecutable(QStringLiteral("qmake"));
++    }
+     Q_ASSERT(!exe.isEmpty());
+     return exe;
+ }
+diff -up kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp.me kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp
+--- kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp.me	2018-08-16 16:37:36.662408159 +0200
++++ kdevelop-5.2.3/plugins/qthelp/qthelpqtdoc.cpp	2018-08-16 16:40:02.990166316 +0200
+@@ -37,7 +37,7 @@ namespace {
+ QString qmakeCandidate()
+ {
+     // return the first qmake executable we can find
+-    const QStringList candidates = {"qmake", "qmake-qt4", "qmake-qt5"};
++    const QStringList candidates = {"qmake-qt5", "qmake-qt4", "qmake"};
+     auto it = std::find_if(candidates.constBegin(), candidates.constEnd(), [](const QString& candidate) {
+         return !QStandardPaths::findExecutable(candidate).isEmpty();
+     });
diff --git a/kdevelop.spec b/kdevelop.spec
index b93ee88..7d7cd8b 100644
--- a/kdevelop.spec
+++ b/kdevelop.spec
@@ -10,6 +10,7 @@ Source0:        http://download.kde.org/stable/kdevelop/%{version}/src/kdevelop-
 
 %global rpm_macros_dir %(d=%{_rpmconfigdir}/macros.d; [ -d $d ] || d=%{_sysconfdir}/rpm; echo $d)
 Source10:       macros.kdevelop
+Patch0:         kdevelop-5.2.3-qmake.patch
 
 # upstreamable patches
 
@@ -132,7 +133,7 @@ Obsoletes: kdevplatform-libs < 5.1.80-1
 
 %prep
 %setup -q -n kdevelop-%{version}
-
+%patch0 -p1 -b .qmake
 
 %build
 mkdir %{_target_platform}
@@ -231,6 +232,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 %{rpm_macros_dir}/macros.kdevelop
 
 %changelog
+* Thu Aug 16 2018 Than Ngo <than@redhat.com> - 5.2.3-4
+- fixed #1405880, prefer qmake-qt5
+
 * Mon Jul 23 2018 Than Ngo <than@redhat.com> - 5.2.3-3
 - fixed FTBFS