Merge pull request #4283 from Rmys/master

libkgapi-17.12.0:ver.bum
2017-12-17 21:09:06 +03:00
parent 8085949e5b 8a2ea94134
commit fdf60a6c69
3 changed files with 26 additions and 2 deletions
@@ -0,0 +1,11 @@
+diff -Nuar a/src/latitude/latitudeservice.h b/src/latitude/latitudeservice.h
+--- a/src/latitude/latitudeservice.h	2017-12-07 14:46:25.000000000 +0300
+++ b/src/latitude/latitudeservice.h	2017-12-17 20:58:53.474070032 +0300
+@@ -26,6 +26,7 @@
+ #include "latitude.h"
+ #include "kgapilatitude_export.h"
+ 
+#include <QVariantMap>
+ 
+ namespace KGAPI2
+ {
@@ -0,0 +1,12 @@
+diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-12-08 04:04:05.000000000 +0300
+++ b/CMakeLists.txt	2017-12-16 16:43:16.638931364 +0300
+@@ -34,7 +34,7 @@
+ )
+ 
+ ############## Find Packages ##############
+-set(REQUIRED_QT_VERSION "5.8.0")
+set(REQUIRED_QT_VERSION "5.7.1")
+ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS
+     Core
+     Network
@@ -38,7 +38,8 @@
            <Dependency>qt5-webengine-devel</Dependency>
        </BuildDependencies>
        <Patches>
-<!--             <Patch level="1">DateTime.patch</Patch> -->
+            <Patch>qt5.patch</Patch>
+            <Patch>latitudeservice.patch</Patch>
        </Patches>
    </Source>

@@ -86,7 +87,7 @@

    <History>
        <Update release="9">
-            <Date>2017-12-15</Date>
+            <Date>2017-12-17</Date>
            <Version>17.12.0</Version>
            <Comment>Version bump.</Comment>
            <Name>Mustafa Cinasal</Name>