diff --git a/Patches/Qt/5.11.2/Patch.cmake b/Patches/Qt/5.11.2/Patch.cmake index ade6308b..5cf5764f 100644 --- a/Patches/Qt/5.11.2/Patch.cmake +++ b/Patches/Qt/5.11.2/Patch.cmake @@ -32,3 +32,13 @@ endif() file(COPY ${Qt_patch}/qtbase/src/corelib/tools/qbytearraymatcher.h DESTINATION ${Qt_source}/qtbase/src/corelib/tools/ ) + +# Fix a build issues on Mac. +# Can't use futimens on MacOS < 10.3 which is controlled by +# the QMAKE_MACOSX_DEPLOYMENT_TARGET value in qmake.conf +# not by the actual system version. +if (APPLE) + file(COPY ${Qt_patch}/qtbase/mkspecs/macx-clang/qmake.conf + DESTINATION ${Qt_source}/qtbase/mkspecs/macx-clang/ + ) +endif() diff --git a/Patches/Qt/5.11.2/qtbase/mkspecs/macx-clang/qmake.conf b/Patches/Qt/5.11.2/qtbase/mkspecs/macx-clang/qmake.conf new file mode 100644 index 00000000..bc27985f --- /dev/null +++ b/Patches/Qt/5.11.2/qtbase/mkspecs/macx-clang/qmake.conf @@ -0,0 +1,36 @@ +# +# qmake configuration for Clang on OS X +# + +QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.13 + +QMAKE_APPLE_DEVICE_ARCHS = x86_64 + +# Opt-in xcb QPA support with XQuartz: +# +# configure \ +# -pkg-config \ +# -fontconfig -system-freetype \ +# -system-xcb -no-opengl +# +# Ensure that pkg-config is properly configured, or that +# PKG_CONFIG_PATH=/opt/X11/lib/pkgconfig:/opt/X11/share/pkgconfig +# is set in your build environment. +# +# If you don't want to use pkg-config, you can add: +# -L/opt/X11/lib -I/opt/X11/include +# to the configure options. +# +# Due to irreconcilable differences between Cocoa +# and X11, OpenGL is currently not supported. + +QMAKE_LIBS_X11 = -lX11 -lXext -lm +QMAKE_LIBDIR_X11 = /opt/X11/lib +QMAKE_INCDIR_X11 = /opt/X11/include + +include(../common/macx.conf) +include(../common/gcc-base-mac.conf) +include(../common/clang.conf) +include(../common/clang-mac.conf) + +load(qt_config)