From a2f2c87f320873d1968d931ad69a0f640c5545b1 Mon Sep 17 00:00:00 2001
From: Miikka Heikkinen <miikka.heikkinen@digia.com>
Date: Wed, 24 Mar 2010 12:15:34 +0200
Subject: 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
---
 src/corelib/corelib.pro | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src/corelib/corelib.pro')

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index efee610400..717b95ee67 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -38,7 +38,6 @@ symbian: {
 
     # Partial upgrade SIS file
     vendorinfo = \
-        "&EN" \
         "; Localised Vendor name" \
         "%{\"Nokia, Qt\"}" \
         " " \
-- 
cgit v1.2.3