diff options
| author | axis <qt-info@nokia.com> | 2010-03-16 09:47:16 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-03-16 09:47:16 +0100 |
| commit | 815af5a5e42f0d9eb7ee85e7e1bf1faae8d3a47c (patch) | |
| tree | 5d5e3ebc84dd6866a060b0d5416b6db873905e4e /translations | |
| parent | 7ca339be57f1b8dbf9e289fae578c110813eb767 (diff) | |
| parent | fdcb62d5d6a3e295273042555d2551eb491a5b2d (diff) | |
| download | qt4-tools-815af5a5e42f0d9eb7ee85e7e1bf1faae8d3a47c.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60
Conflicts:
demos/embedded/anomaly/anomaly.pro
demos/embedded/flightinfo/flightinfo.pro
demos/embedded/lightmaps/lightmaps.pro
demos/embedded/weatherinfo/weatherinfo.pro
examples/network/fortuneclient/fortuneclient.pro
examples/network/fortuneserver/fortuneserver.pro
examples/network/network-chat/network-chat.pro
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/platform_paths.prf
qmake/generators/symbian/symmake.cpp
qmake/generators/symbian/symmake.h
src/s60installs/s60installs.pro
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/translations.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/translations/translations.pro b/translations/translations.pro index 566458c3fc..ca83d07214 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -43,6 +43,7 @@ isEmpty(vcproj) { translations.path = $$[QT_INSTALL_TRANSLATIONS] translations.files = $$TRANSLATIONS translations.files ~= s,\\.ts$,.qm,g +translations.files ~= s,^,$$OUT_PWD/,g translations.CONFIG += no_check_exist INSTALLS += translations |