Author: craig
Date: Sun Mar 14 17:08:37 2021
New Revision: 24562
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24562
Log:
Set minimum Qt function / deprecatiopn version to 5.14.
Fix time call in zip global
Modified:
trunk/Scribus/CMakeLists_Dependencies.cmake
trunk/Scribus/scribus/third_party/zip/zipglobal.cpp
Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24562&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake (original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake Sun Mar 14 17:08:37 2021
@@ -9,6 +9,7 @@
if (NOT WANT_QT6)
message(STATUS "Qt5 Requested")
set(QT_MIN_VERSION "5.14.0")
+ add_compile_definitions(QT_DISABLE_DEPRECATED_BEFORE=0x050E00)
find_package(Qt5Core ${QT_MIN_VERSION} REQUIRED)
if(NOT Qt5Core_FOUND)
message(FATAL_ERROR "ERROR: No QT 5 found")
Modified: trunk/Scribus/scribus/third_party/zip/zipglobal.cpp
URL:
http://scribus.net/websvn/diff.php?repname=Scribus&rev=24562&path=/trunk/Scribus/scribus/third_party/zip/zipglobal.cpp
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/zipglobal.cpp (original)
+++ trunk/Scribus/scribus/third_party/zip/zipglobal.cpp Sun Mar 14 17:08:37 2021
@@ -143,7 +143,7 @@
#elif defined(Q_OS_LINUX) || defined(Q_OS_MACX)
struct utimbuf t_buffer;
- t_buffer.actime = t_buffer.modtime = dateTime.toTime_t();
+ t_buffer.actime = t_buffer.modtime = dateTime.toSecsSinceEpoch();
return utime(fileName.toLocal8Bit().constData(), &t_buffer) == 0;
#endif
_______________________________________________
scribus-commit mailing list
[email protected]
http://lists.scribus.net/mailman/listinfo/scribus-commit
