diff options
| author | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-18 10:32:06 (GMT) |
| commit | 2fb8ea9aa787d59ac16250eade0adfea08f1ca9d (patch) | |
| tree | c274575bb148c9755a901094fc94d4553a84653c /qmake/generators/unix | |
| parent | ab8508380d6e5875ed871196eb09642380ac1aef (diff) | |
| parent | bf819a04b0c60c64912f72b613c1546d8be7dc50 (diff) | |
| download | Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.zip Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.gz Qt-2fb8ea9aa787d59ac16250eade0adfea08f1ca9d.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
configure
src/gui/text/qfontdatabase_s60.cpp
Diffstat (limited to 'qmake/generators/unix')
| -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 7c8e173..e6134f8 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -92,7 +92,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") |