diff options
| author | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-04 12:07:26 +0100 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2009-03-04 12:07:26 +0100 |
| commit | 3601c2a1dcbe56e5e5c46c418b0a0a23f2231f2e (patch) | |
| tree | 27ec8c92ff21d3c77c5cd3cd37b0cdf28449d651 | |
| parent | 7c80cfaed5513d0f0e2d7332e40ad853939d5de0 (diff) | |
qmake: drop obsolete patch 0008-backport-qt-lib-infix.patch
| -rw-r--r-- | packages/qmake/files/0008-backport-qt-lib-infix.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/packages/qmake/files/0008-backport-qt-lib-infix.patch b/packages/qmake/files/0008-backport-qt-lib-infix.patch deleted file mode 100644 index f87576a07b..0000000000 --- a/packages/qmake/files/0008-backport-qt-lib-infix.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf -index 32a7fd5..48d584f 100644 ---- a/mkspecs/features/qt_functions.prf -+++ b/mkspecs/features/qt_functions.prf -@@ -28,7 +28,7 @@ defineTest(qtAddLibrary) { - INCLUDEPATH -= $$FRAMEWORK_INCLUDE - INCLUDEPATH = $$FRAMEWORK_INCLUDE $$INCLUDEPATH - } -- LINKAGE = -framework $${LIB_NAME} -+ LINKAGE = -framework $${LIB_NAME}$${QT_LIBINFIX} - } else:!qt_no_framework { #detection - for(frmwrk_dir, $$list($$QMAKE_LIBDIR_QT $$QMAKE_LIBDIR $$(DYLD_FRAMEWORK_PATH) /Library/Frameworks)) { - exists($${frmwrk_dir}/$${LIB_NAME}.framework) { -@@ -46,15 +46,15 @@ defineTest(qtAddLibrary) { - } - isEmpty(LINKAGE) { - CONFIG(debug, debug|release) { -- win32:LINKAGE = -l$${LIB_NAME}d -- mac:LINKAGE = -l$${LIB_NAME}_debug -+ win32:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}d -+ mac:LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX}_debug - } -- isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME} -+ isEmpty(LINKAGE):LINKAGE = -l$${LIB_NAME}$${QT_LIBINFIX} - } - !isEmpty(QMAKE_LSB) { - QMAKE_LFLAGS *= --lsb-libpath=$$$$QMAKE_LIBDIR_QT - QMAKE_LFLAGS *= -L/opt/lsb/lib -- QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME} -+ QMAKE_LFLAGS *= --lsb-shared-libs=$${LIB_NAME}${QT_LIBINFIX} - } - LIBS += $$LINKAGE - export(LIBS) |