Bump the minimum supported OS X and iOS versions
As per mailing list discussion: http://lists.qt-project.org/pipermail/development/2016-February/024889.html Change-Id: Ie4e226c454d8f736dbf1545440ca200104fd947c Reviewed-by: Jake Petroules <jake.petroules@qt.io>
This commit is contained in:
parent
31c6bee4d5
commit
e81ba336e9
@ -7,7 +7,7 @@ include(../common/gcc-base-mac.conf)
|
|||||||
include(../common/clang.conf)
|
include(../common/clang.conf)
|
||||||
include(../common/clang-mac.conf)
|
include(../common/clang-mac.conf)
|
||||||
|
|
||||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
||||||
|
|
||||||
QMAKE_CFLAGS += -arch i386
|
QMAKE_CFLAGS += -arch i386
|
||||||
QMAKE_CXXFLAGS += -arch i386
|
QMAKE_CXXFLAGS += -arch i386
|
||||||
|
@ -7,6 +7,6 @@ include(../common/gcc-base-mac.conf)
|
|||||||
include(../common/clang.conf)
|
include(../common/clang.conf)
|
||||||
include(../common/clang-mac.conf)
|
include(../common/clang-mac.conf)
|
||||||
|
|
||||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
||||||
|
|
||||||
load(qt_config)
|
load(qt_config)
|
||||||
|
@ -14,7 +14,7 @@ include(../common/macx.conf)
|
|||||||
include(../common/gcc-base-mac.conf)
|
include(../common/gcc-base-mac.conf)
|
||||||
include(../common/g++-macx.conf)
|
include(../common/g++-macx.conf)
|
||||||
|
|
||||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
||||||
|
|
||||||
QMAKE_CFLAGS += -arch i386
|
QMAKE_CFLAGS += -arch i386
|
||||||
QMAKE_CXXFLAGS += -arch i386
|
QMAKE_CXXFLAGS += -arch i386
|
||||||
|
@ -14,6 +14,6 @@ include(../common/macx.conf)
|
|||||||
include(../common/gcc-base-mac.conf)
|
include(../common/gcc-base-mac.conf)
|
||||||
include(../common/g++-macx.conf)
|
include(../common/g++-macx.conf)
|
||||||
|
|
||||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
||||||
|
|
||||||
load(qt_config)
|
load(qt_config)
|
||||||
|
@ -14,7 +14,7 @@ include(../common/macx.conf)
|
|||||||
include(../common/gcc-base-mac.conf)
|
include(../common/gcc-base-mac.conf)
|
||||||
include(../common/g++-macx.conf)
|
include(../common/g++-macx.conf)
|
||||||
|
|
||||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
||||||
|
|
||||||
QMAKE_CC = gcc-4.0
|
QMAKE_CC = gcc-4.0
|
||||||
QMAKE_CXX = g++-4.0
|
QMAKE_CXX = g++-4.0
|
||||||
|
@ -14,7 +14,7 @@ include(../common/macx.conf)
|
|||||||
include(../common/gcc-base-mac.conf)
|
include(../common/gcc-base-mac.conf)
|
||||||
include(../common/g++-macx.conf)
|
include(../common/g++-macx.conf)
|
||||||
|
|
||||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
||||||
|
|
||||||
QMAKE_CC = gcc-4.2
|
QMAKE_CC = gcc-4.2
|
||||||
QMAKE_CXX = g++-4.2
|
QMAKE_CXX = g++-4.2
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
QMAKE_MACOSX_DEPLOYMENT_TARGET =
|
QMAKE_MACOSX_DEPLOYMENT_TARGET =
|
||||||
QMAKE_IOS_DEPLOYMENT_TARGET = 6.0
|
QMAKE_IOS_DEPLOYMENT_TARGET = 7.0
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/ios
|
INCLUDEPATH += $$PWD/ios
|
||||||
DEFINES += DARWIN_NO_CARBON QT_NO_PRINTER QT_NO_PRINTDIALOG
|
DEFINES += DARWIN_NO_CARBON QT_NO_PRINTER QT_NO_PRINTDIALOG
|
||||||
|
@ -14,7 +14,7 @@ include(../common/macx.conf)
|
|||||||
include(../common/gcc-base-mac.conf)
|
include(../common/gcc-base-mac.conf)
|
||||||
include(../common/llvm.conf)
|
include(../common/llvm.conf)
|
||||||
|
|
||||||
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.8
|
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.9
|
||||||
|
|
||||||
QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
|
QMAKE_XCODE_GCC_VERSION = com.apple.compilers.llvmgcc42
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user