diff options
| author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
|---|---|---|
| committer | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2010-03-19 04:06:02 (GMT) |
| commit | f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682 (patch) | |
| tree | 65f3b637a19ff47fcc97e3f22deeae7d843cad17 /translations | |
| parent | 331ad8eb0aedb4baefcaf6f08a8e0ce440a32b06 (diff) | |
| parent | 8a7de547942c9a660dfc45c176ea1a3027bbf99a (diff) | |
| download | Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.zip Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.gz Qt-f9e3b16b7e2f3ca9ecf6f05341c2a78fb561b682.tar.bz2 | |
Merge remote branch 'origin/4.7' into oslo-staging-1
Conflicts:
mkspecs/common/symbian/symbian.conf
Diffstat (limited to 'translations')
| -rw-r--r-- | translations/translations.pro | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/translations/translations.pro b/translations/translations.pro index 8f37451..ca83d07 100644 --- a/translations/translations.pro +++ b/translations/translations.pro @@ -10,7 +10,8 @@ contains(TEMPLATE_PREFIX, vc):vcproj = 1 TEMPLATE = app TARGET = qm_phony_target -CONFIG -= qt separate_debug_info +CONFIG -= qt separate_debug_info sis_targets +CONFIG += no_icon QT = LIBS = @@ -45,3 +46,8 @@ translations.files ~= s,\\.ts$,.qm,g translations.files ~= s,^,$$OUT_PWD/,g translations.CONFIG += no_check_exist INSTALLS += translations + +# Make dummy "sis" target to keep recursive "make sis" working. +sis_target.target = sis +sis_target.commands = +QMAKE_EXTRA_TARGETS += sis_target |