diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-02-04 14:37:24 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-02-04 15:22:31 (GMT) |
| commit | 09c8071d634e043b8706f876e05e6b9e37343251 (patch) | |
| tree | 717495cd18b814053261e09304df9bfdd1b7fd39 | |
| parent | b8705c3dd756243503fd1e469f6ac4907222b321 (diff) | |
| download | Qt-09c8071d634e043b8706f876e05e6b9e37343251.zip Qt-09c8071d634e043b8706f876e05e6b9e37343251.tar.gz Qt-09c8071d634e043b8706f876e05e6b9e37343251.tar.bz2 | |
Fix linking for armlink
using
LIBS += -LanyDir
is wrong as that depends on 'ld' accepting -L
the correct cross-platform approach is to use
QMAKE_LIBDIR += anyDir
| -rw-r--r-- | demos/shared/shared.pri | 6 | ||||
| -rw-r--r-- | src/tools/bootstrap/bootstrap.pri | 6 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/assistant.pro | 2 | ||||
| -rw-r--r-- | tools/designer/src/designer/designer.pro | 6 |
4 files changed, 9 insertions, 11 deletions
diff --git a/demos/shared/shared.pri b/demos/shared/shared.pri index 1541fa7..fb7b04c 100644 --- a/demos/shared/shared.pri +++ b/demos/shared/shared.pri @@ -6,12 +6,12 @@ build_all:!build_pass { } contains(CONFIG, debug_and_release_target) { CONFIG(debug, debug|release) { - LIBS+=-L$$SHARED_FOLDER/debug + QMAKE_LIBDIR += $$SHARED_FOLDER/debug } else { - LIBS+=-L$$SHARED_FOLDER/release + QMAKE_LIBDIR += $$SHARED_FOLDER/release } } else { - LIBS += -L$$SHARED_FOLDER + QMAKE_LIBDIR += $$SHARED_FOLDER } hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a diff --git a/src/tools/bootstrap/bootstrap.pri b/src/tools/bootstrap/bootstrap.pri index b3ee948..4cdb329 100644 --- a/src/tools/bootstrap/bootstrap.pri +++ b/src/tools/bootstrap/bootstrap.pri @@ -42,12 +42,12 @@ hpux-acc*|hpuxi-acc* { } else { contains(CONFIG, debug_and_release_target) { CONFIG(debug, debug|release) { - LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/debug + QMAKE_LIBDIR += $$QT_BUILD_TREE/src/tools/bootstrap/debug } else { - LIBS+=-L$$QT_BUILD_TREE/src/tools/bootstrap/release + QMAKE_LIBDIR += $QT_BUILD_TREE/src/tools/bootstrap/release } } else { - LIBS += -L$$QT_BUILD_TREE/src/tools/bootstrap + QMAKE_LIBDIR += $QT_BUILD_TREE/src/tools/bootstrap } LIBS += -lbootstrap } diff --git a/tools/assistant/tools/assistant/assistant.pro b/tools/assistant/tools/assistant/assistant.pro index 1a7e874..2a654fc 100644 --- a/tools/assistant/tools/assistant/assistant.pro +++ b/tools/assistant/tools/assistant/assistant.pro @@ -20,7 +20,7 @@ INSTALLS += target ### Work around a qmake issue when statically linking to ### not-yet-installed plugins -LIBS += -L$$QT_BUILD_TREE/plugins/sqldrivers +QMAKE_LIBDIR += $$QT_BUILD_TREE/plugins/sqldrivers HEADERS += helpviewer.h \ mainwindow.h \ diff --git a/tools/designer/src/designer/designer.pro b/tools/designer/src/designer/designer.pro index 2050c72..8590c7b 100644 --- a/tools/designer/src/designer/designer.pro +++ b/tools/designer/src/designer/designer.pro @@ -14,10 +14,8 @@ INCLUDEPATH += \ ../lib/uilib \ extra -LIBS += -L../../lib \ - -L../../../../lib \ - -lQtDesignerComponents \ - -lQtDesigner +QMAKE_LIBDIR += ../../lib ../../../../lib +LIBS += -lQtDesignerComponents -lQtDesigner RESOURCES += designer.qrc |