diff options
| author | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-06-16 15:15:48 (GMT) |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@nokia.com> | 2009-06-16 15:15:48 (GMT) |
| commit | e73e36a16bb51fa66bdccc780f177e2c4d5d8092 (patch) | |
| tree | 12b6de8d0cb5c630a05f28686d4baabe474dbfda /translations | |
| parent | 237a3e690f290fd8ef8ef2a51459caa7fdc7bef1 (diff) | |
| parent | d4ea3957a535ac522bd29b0645e614e0ccd09f82 (diff) | |
| download | Qt-e73e36a16bb51fa66bdccc780f177e2c4d5d8092.zip Qt-e73e36a16bb51fa66bdccc780f177e2c4d5d8092.tar.gz Qt-e73e36a16bb51fa66bdccc780f177e2c4d5d8092.tar.bz2 | |
Merge license header changes from 4.5
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/README | 2 | ||||
| -rw-r--r-- | translations/translations.pro | 13 |
2 files changed, 12 insertions, 3 deletions
diff --git a/translations/README b/translations/README index ffce117..3eec817 100644 --- a/translations/README +++ b/translations/README @@ -1,4 +1,4 @@ The French, German, and Simplified Chinese translation files are -supported by Qt Software. All other translations are contributed by +supported by Qt. All other translations are contributed by third parties. These are provided without guarantees and may disappear from future Qt releases. diff --git a/translations/translations.pro b/translations/translations.pro index d1962fe..6f14108 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -1,7 +1,16 @@ TRANSLATIONS = $$files(*.ts) LRELEASE = $$QT_BUILD_TREE/bin/lrelease -win32:LRELEASE ~= s|/|\|g +win32 { + LRELEASE ~= s|/|\|g +} else:!static { + path = $$QT_BUILD_TREE/lib + !macx:var = LD_LIBRARY_PATH + else:qt_no_framework:var = DYLD_LIBRARY_PATH + else:var = DYLD_FRAMEWORK_PATH + + LRELEASE = test -z \"\$\$$$var\" && $$var=$$path || $$var=$$path:\$\$$$var; export $$var; $$LRELEASE +} contains(TEMPLATE_PREFIX, vc):vcproj = 1 @@ -14,7 +23,7 @@ LIBS = updateqm.input = TRANSLATIONS updateqm.output = ${QMAKE_FILE_BASE}.qm isEmpty(vcproj):updateqm.variable_out = PRE_TARGETDEPS -updateqm.commands = $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} +updateqm.commands = @echo lrelease ${QMAKE_FILE_IN}; $$LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT} updateqm.name = LRELEASE ${QMAKE_FILE_IN} updateqm.CONFIG += no_link QMAKE_EXTRA_COMPILERS += updateqm |