kholidays-purpose:frameworka aktarma

2018-05-14 16:30:41 +03:00
parent 8fd443882d
commit 3fb388e60d
11 changed files with 165824 additions and 165696 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)
@@ -0,0 +1,21 @@
+--- a/src/sunriseset.cpp
+++ b/src/sunriseset.cpp
+@@ -180,7 +180,7 @@
+     double hourAngle = calcHourAngleSunrise(latitude, solarDec);
+     double delta = longitude + radToDeg(hourAngle);
+     QTime timeUTC(0, 0);
+-    if (isnan(delta))
+    if (std::isnan(delta))
+         return timeUTC;
+     timeUTC = timeUTC.addSecs((720 - (4.0 * delta) - eqTime) * 60);
+     return QTime(timeUTC.hour(),
+@@ -199,7 +199,7 @@
+     double hourAngle = -calcHourAngleSunrise(latitude, solarDec);
+     double delta = longitude + radToDeg(hourAngle);
+     QTime timeUTC(0, 0);
+-    if (isnan(delta))
+    if (std::isnan(delta))
+         return timeUTC;
+     timeUTC = timeUTC.addSecs((720 - (4.0 * delta) - eqTime) * 60);
+     return QTime(timeUTC.hour(),
+