From 5f2fe51c52e11c67ab66cfad43c02c7e004cfb8c Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Mon, 9 Dec 2013 16:59:34 +0100 Subject: [PATCH] Mac: Remove code that was there for 10.4 compatibility Change-Id: Ibb586513f256deb5e0e8aa7c5100055482a031a9 Reviewed-by: Oswald Buddenhagen Reviewed-by: Eike Ziller --- qtcreator.pri | 10 ++++------ src/qtcreatorplugin.pri | 8 ++------ src/rpath.pri | 8 ++------ 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/qtcreator.pri b/qtcreator.pri index 7aa4f361da..5111639181 100644 --- a/qtcreator.pri +++ b/qtcreator.pri @@ -130,13 +130,11 @@ macx { IDE_DOC_PATH = $$IDE_DATA_PATH/doc IDE_BIN_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS copydata = 1 - isEmpty(TIGER_COMPAT_MODE):TIGER_COMPAT_MODE=$$(QTC_TIGER_COMPAT) !isEqual(QT_MAJOR_VERSION, 5) { - # Qt5 doesn't support 10.5, and will set the minimum version correctly to 10.6 or 10.7. - isEmpty(TIGER_COMPAT_MODE) { - QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5 - QMAKE_LFLAGS *= -mmacosx-version-min=10.5 - } + # we use @rpath which is 10.5+ + # Qt5 doesn't support 10.5, and will set the minimum version to 10.6 or 10.7. + QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5 + QMAKE_LFLAGS *= -mmacosx-version-min=10.5 } } else { contains(TEMPLATE, vc.*):vcproj = 1 diff --git a/src/qtcreatorplugin.pri b/src/qtcreatorplugin.pri index c243fa1180..0f482d0a3d 100644 --- a/src/qtcreatorplugin.pri +++ b/src/qtcreatorplugin.pri @@ -112,12 +112,8 @@ greaterThan(QT_MAJOR_VERSION, 4) { } macx { - !isEmpty(TIGER_COMPAT_MODE) { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/ - } else { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/ - QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../ - } + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/ + QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../ } else:linux-* { #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR QMAKE_RPATHDIR += \$\$ORIGIN diff --git a/src/rpath.pri b/src/rpath.pri index c352a823b3..de56f11ae5 100644 --- a/src/rpath.pri +++ b/src/rpath.pri @@ -1,10 +1,6 @@ macx { - !isEmpty(TIGER_COMPAT_MODE) { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/ - } else { - QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ - QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../ - } + QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/ + QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../ } else:linux-* { #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var -- 2.26.2