diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 18:16:02 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 18:16:02 (GMT) |
| commit | 3b1a0c4877faa9d1d50372f2128c06530ae4b2d4 (patch) | |
| tree | e17d236663216e1240636e4c7780b5315cb473ff /bin | |
| parent | cfac0f3a89bd92955047bf15908a2e7bedd91db0 (diff) | |
| parent | 422b29993b9ad87a72030fc95ba82797451ae6d2 (diff) | |
| download | Qt-3b1a0c4877faa9d1d50372f2128c06530ae4b2d4.zip Qt-3b1a0c4877faa9d1d50372f2128c06530ae4b2d4.tar.gz Qt-3b1a0c4877faa9d1d50372f2128c06530ae4b2d4.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Documentation: clarified RVCT support for Symbian
Update Symbian OS def files for 4.6.2
Don't remove all dependencies when patching the pkg.
Workaround for abld toolchain issue with s60main
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/patch_capabilities.pl | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl index 8afe776..f82c48f 100755 --- a/bin/patch_capabilities.pl +++ b/bin/patch_capabilities.pl @@ -131,9 +131,13 @@ if (@ARGV) } } - # Remove all dependencies to other packages to reduce unnecessary error messages - # from depended packages that are also patched and therefore have different UID. - if ($line =~ m/^\(0x[0-9|a-f|A-F]*\).*\{.*\}$/) + # Remove dependencies to known problem packages (i.e. packages that are likely to be patched, also) + # to reduce unnecessary error messages. + if ($line =~ m/^\(0x2002af5f\).*\{.*\}$/) + { + $newLine = "\n" + } + if ($line =~ m/^\(0x2001E61C\).*\{.*\}$/) { $newLine = "\n" } |