summaryrefslogtreecommitdiffstats
path: root/qmake/generators
diff options
context:
space:
mode:
authoraxis <qt-info@nokia.com>2009-12-11 08:57:27 (GMT)
committeraxis <qt-info@nokia.com>2009-12-11 08:57:27 (GMT)
commit19e406c08fdaa30fd101cd017cc01b2397b67ee3 (patch)
treed93dd980de23b9ca0a53d18fa6af086b98647857 /qmake/generators
parente355ade4712fa63794403dae3fda807a58e8b88d (diff)
parentb62c6de3eae005da146a9009f86851a1431b1892 (diff)
downloadQt-19e406c08fdaa30fd101cd017cc01b2397b67ee3.zip
Qt-19e406c08fdaa30fd101cd017cc01b2397b67ee3.tar.gz
Qt-19e406c08fdaa30fd101cd017cc01b2397b67ee3.tar.bz2
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Conflicts: src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'qmake/generators')
-rw-r--r--qmake/generators/unix/unixmake.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp
index faa6415..44a461e 100644
--- a/qmake/generators/unix/unixmake.cpp
+++ b/qmake/generators/unix/unixmake.cpp
@@ -88,7 +88,7 @@ UnixMakefileGenerator::init()
if(project->isEmpty("QMAKE_LIBTOOL"))
project->values("QMAKE_LIBTOOL").append("libtool --silent");
if(project->isEmpty("QMAKE_SYMBOLIC_LINK"))
- project->values("QMAKE_SYMBOLIC_LINK").append("ln -sf");
+ project->values("QMAKE_SYMBOLIC_LINK").append("ln -f -s");
/* this should probably not be here, but I'm using it to wrap the .t files */
if(project->first("TEMPLATE") == "app")