diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-24 10:15:34 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-03-24 10:47:36 (GMT) |
| commit | a2f2c87f320873d1968d931ad69a0f640c5545b1 (patch) | |
| tree | 80a946d0f28922043c5e4d96b5ba3e039609e514 /src/gui | |
| parent | 6fc92ea90a078938ced596059981a120dc9ff57d (diff) | |
| download | Qt-a2f2c87f320873d1968d931ad69a0f640c5545b1.zip Qt-a2f2c87f320873d1968d931ad69a0f640c5545b1.tar.gz Qt-a2f2c87f320873d1968d931ad69a0f640c5545b1.tar.bz2 | |
Made it possible to define more than one language using pkg_prerules
The pkg statements were generated in invalid order if user used
pkg_prerules to redefine languages supported by the pkg file.
Also made it possible to override dependency statements autogenerated
for Qt and QtWebkit, as these statements need to be user defined in
case of multiple languages.
Defining the following in .pro removes all dependencies from pkg rules:
default_deployment.pkg_prerules -= \
pkg_depends_webkit \
pkg_depends_qt \
pkg_platform_dependencies
Task-number: QTBUG-9279
Reviewed-by: Janne Anttila
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/gui.pro | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/gui/gui.pro b/src/gui/gui.pro index d46f3b4..d2401f4 100644 --- a/src/gui/gui.pro +++ b/src/gui/gui.pro @@ -60,7 +60,6 @@ symbian: { # Partial upgrade SIS file vendorinfo = \ - "&EN" \ "; Localised Vendor name" \ "%{\"Nokia, Qt\"}" \ " " \ |