summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-02-28 00:17:30 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-02-28 00:17:30 (GMT)
commitf8ca41ab91748a4b847892af642c1a5a1cdeb105 (patch)
tree0df10ddf13de6b7ca590c0b5257befc3001e69a2
parentf54d9e2ea84c59b7767696a64e9f02e0ad940275 (diff)
parentce167d2a38e4cb95d55279d35cc679e6f9e2045b (diff)
downloadQt-f8ca41ab91748a4b847892af642c1a5a1cdeb105.zip
Qt-f8ca41ab91748a4b847892af642c1a5a1cdeb105.tar.gz
Qt-f8ca41ab91748a4b847892af642c1a5a1cdeb105.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Fixed wrong reference to bld.inf in the package_definition.xml file
-rw-r--r--config.profiles/symbian/package_definition.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/config.profiles/symbian/package_definition.xml b/config.profiles/symbian/package_definition.xml
index f0c6652..1c3c1d3 100644
--- a/config.profiles/symbian/package_definition.xml
+++ b/config.profiles/symbian/package_definition.xml
@@ -5,7 +5,7 @@
<package id="qt" name="Qt" levels="tool mw app">
<collection id="qtconf" name="Qt Config" level="tool">
<component id="qt_deviceconfiguration" name="Qt Device Configuration" class="config tool" filter="s60,qt_tools" introduced="^2">
- <unit bldFile="src/config.profiles/symbian"/>
+ <unit bldFile="config.profiles/symbian"/>
</component>
</collection>
<collection id="qt_info" name="Qt Info" level="mw">
@@ -16,7 +16,7 @@
<collection id="qtlocalization" name="Qt Localization" level="app">
<component id="qtlocalization_build" name="Qt localization Build" introduced="^2" filter="s60">
- <unit bldFile="src/config.profiles/symbian/translations_symbian" qt:proFile="translations.pro"/>
+ <unit bldFile="config.profiles/symbian/translations_symbian" qt:proFile="translations.pro"/>
</component>
</collection>