feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Mac: Remove code that was there for 10.4 compatibility

Browse Source 
Change-Id: Ibb586513f256deb5e0e8aa7c5100055482a031a9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Eike Ziller
2013-12-09 16:59:34 +01:00
parent 397234e221
commit 5f2fe51c52
3 changed files with 8 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qtcreator.pri
View File

@@ -130,14 +130,12 @@ macx {
IDE_DOC_PATH = $$IDE_DATA_PATH/doc IDE_DOC_PATH = $$IDE_DATA_PATH/doc
IDE_BIN_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS IDE_BIN_PATH = $$IDE_APP_PATH/$${IDE_APP_TARGET}.app/Contents/MacOS
copydata = 1 copydata = 1
isEmpty(TIGER_COMPAT_MODE):TIGER_COMPAT_MODE=$$(QTC_TIGER_COMPAT)
!isEqual(QT_MAJOR_VERSION, 5) { !isEqual(QT_MAJOR_VERSION, 5) {
# Qt5 doesn't support 10.5, and will set the minimum version correctly to 10.6 or 10.7. # we use @rpath which is 10.5+
isEmpty(TIGER_COMPAT_MODE) { # 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_CXXFLAGS *= -mmacosx-version-min=10.5
QMAKE_LFLAGS *= -mmacosx-version-min=10.5 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
} }
}
} else { } else {
contains(TEMPLATE, vc.*):vcproj = 1 contains(TEMPLATE, vc.*):vcproj = 1
IDE_APP_TARGET = qtcreator IDE_APP_TARGET = qtcreator

4
src/qtcreatorplugin.pri
View File

@@ -112,12 +112,8 @@ greaterThan(QT_MAJOR_VERSION, 4) {
} }
macx { 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_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/
QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../ QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../
}
} else:linux-* { } else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
QMAKE_RPATHDIR += \$\$ORIGIN QMAKE_RPATHDIR += \$\$ORIGIN

4
src/rpath.pri
View File

@@ -1,10 +1,6 @@
macx { 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_SONAME = -Wl,-install_name,@rpath/PlugIns/
QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../ QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../
}
} else:linux-* { } else:linux-* {
#do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR #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 # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var