summaryrefslogtreecommitdiffstats
path: root/demos/shared
diff options
context:
space:
mode:
authorThomas Zander <t.zander@nokia.com>2010-02-04 14:37:24 (GMT)
committerThomas Zander <t.zander@nokia.com>2010-02-04 15:22:31 (GMT)
commit09c8071d634e043b8706f876e05e6b9e37343251 (patch)
tree717495cd18b814053261e09304df9bfdd1b7fd39 /demos/shared
parentb8705c3dd756243503fd1e469f6ac4907222b321 (diff)
downloadQt-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
Diffstat (limited to 'demos/shared')
-rw-r--r--demos/shared/shared.pri6
1 files changed, 3 insertions, 3 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