From 572089145207301305594f2aa8c14ae1e511be47 Mon Sep 17 00:00:00 2001 From: Oleg Korshul Date: Thu, 22 Dec 2016 18:48:28 +0300 Subject: [PATCH] macOS 10.11 --- ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro | 2 +- DesktopEditor/graphics/Timer.h | 3 ++- OfficeUtils/OfficeUtils.pro | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro b/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro index 7a688e0c18..a612e7685e 100644 --- a/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro +++ b/ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro @@ -32,7 +32,7 @@ INCLUDEPATH += \ ../../../DesktopEditor/xml/libxml2/include core_mac { - QMAKE_MAC_SDK = macosx10.11 + #QMAKE_MAC_SDK = macosx10.11 } SOURCES += \ diff --git a/DesktopEditor/graphics/Timer.h b/DesktopEditor/graphics/Timer.h index 3236dd0819..7a5409161b 100644 --- a/DesktopEditor/graphics/Timer.h +++ b/DesktopEditor/graphics/Timer.h @@ -80,12 +80,13 @@ namespace NSTimers } #endif + // CLOCK_MONOTONIC defined ONLY since macOS 10.12!!! (crash on earlier version) static DWORD GetTickCount() { #if defined(_WIN32) || defined(_WIN64) || defined(_WIN32_WCE) return ::GetTickCount(); #else -#ifdef CLOCK_MONOTONIC +#if defined(CLOCK_MONOTONIC) && !defined(_MAC) struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); diff --git a/OfficeUtils/OfficeUtils.pro b/OfficeUtils/OfficeUtils.pro index 90f0af9cd8..9f43392496 100644 --- a/OfficeUtils/OfficeUtils.pro +++ b/OfficeUtils/OfficeUtils.pro @@ -9,7 +9,7 @@ win32 { } mac { - QMAKE_MAC_SDK = macosx10.11 + #QMAKE_MAC_SDK = macosx10.11 } CORE_ROOT_DIR = $$PWD/..