From f9cfe654f2f15bf9e774f625395f7a0e9ef663d9 Mon Sep 17 00:00:00 2001 From: Nikolay Kasyanov Date: Sun, 1 Sep 2013 23:17:41 +0400 Subject: [PATCH] Workaround for https://bugreports.qt-project.org/browse/QTBUG-22154 (Qt redefines min OS X version and SDL in turn checks this version and doesn't accept version set by Qt) --- apps/launcher/graphicspage.cpp | 5 +++++ apps/launcher/main.cpp | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/apps/launcher/graphicspage.cpp b/apps/launcher/graphicspage.cpp index 1bbf7f8973..9308c1d572 100644 --- a/apps/launcher/graphicspage.cpp +++ b/apps/launcher/graphicspage.cpp @@ -3,6 +3,11 @@ #include #include #include + +#ifdef __APPLE__ +// We need to do this because of Qt: https://bugreports.qt-project.org/browse/QTBUG-22154 +#define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +#endif #include #include diff --git a/apps/launcher/main.cpp b/apps/launcher/main.cpp index dfe2d74132..f67f5edcff 100644 --- a/apps/launcher/main.cpp +++ b/apps/launcher/main.cpp @@ -3,6 +3,10 @@ #include #include +#ifdef __APPLE__ +// We need to do this because of Qt: https://bugreports.qt-project.org/browse/QTBUG-22154 +#define MAC_OS_X_VERSION_MIN_REQUIRED __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ +#endif #include #include "maindialog.hpp"