Merge pull request #4253 from Rmys/master

kholidays:ver.bump
2017-12-16 13:48:37 +03:00
parent e439a73925 84957c6955
commit 1fd6fe5ead
2 changed files with 13 additions and 1 deletions
@@ -0,0 +1,12 @@
+diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-12-08 04:01:31.000000000 +0300
+++ b/CMakeLists.txt	2017-12-16 13:45:06.592702705 +0300
+@@ -32,7 +32,7 @@
+ )
+ 
+ ########### Find packages ###########
+-set(QT_REQUIRED_VERSION 5.8.0)
+set(QT_REQUIRED_VERSION 5.7.1)
+ find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Core Qml)
+ 
+ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII)
@@ -30,7 +30,7 @@
            <Dependency>extra-cmake-modules</Dependency>
        </BuildDependencies>
        <Patches>
-<!--             <Patch level="1">sunrise-fix.patch</Patch> -->
+            <Patch>qt5.patch</Patch>
        </Patches>
    </Source>