diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-05 11:23:36 (GMT) |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-12-05 11:23:36 (GMT) |
commit | 9093d6c498f1b70c7ec58fc52bb9d5f0a4302540 (patch) | |
tree | 5bb0e87be487d80c76a16c23ee94e7f97fcc95c6 /qmake/generators | |
parent | cbdf3dc7508131e31f1d221e7b6f44d4714d3caa (diff) | |
parent | 291a26abae4b7e1e4b77baf42964ccb77edf4adf (diff) | |
download | Qt-9093d6c498f1b70c7ec58fc52bb9d5f0a4302540.zip Qt-9093d6c498f1b70c7ec58fc52bb9d5f0a4302540.tar.gz Qt-9093d6c498f1b70c7ec58fc52bb9d5f0a4302540.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'qmake/generators')
-rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index ec3b5d8..124bc0f 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") |