Merge pull request #4262 from Rmys/master

aplications-17.12.0:ver.bump
2017-12-16 19:14:02 +03:00
parent 07827c4e54 8c4136d2cc
commit 8f2b0336ce
2 changed files with 15 additions and 0 deletions
@@ -0,0 +1,12 @@
+diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-12-08 04:02:01.000000000 +0300
+++ b/CMakeLists.txt	2017-12-16 19:06:49.046309936 +0300
+@@ -30,7 +30,7 @@
+ set(KMIMELIB_VERSION "5.7.0")
+ set(AKONADI_VERSION "5.7.0")
+ 
+-set(QT_REQUIRED_VERSION "5.8.0")
+set(QT_REQUIRED_VERSION "5.7.1")
+ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test)
+ ########### Find packages ###########
+ find_package(KF5KIO ${KF5_VERSION} CONFIG REQUIRED)
@@ -38,6 +38,9 @@
            <Dependency>kunitconversion-devel</Dependency>
            <Dependency>grantlee-qt5-devel</Dependency>
        </BuildDependencies>
+        <Patches>
+            <Patch>qt5.patch</Patch>
+        </Patches>
    </Source>

    <Package>