diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 08:55:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-15 08:55:22 (GMT) |
| commit | 03c01176ebf423085e56ceabcf8335ca5027a786 (patch) | |
| tree | b953a59cc70118fca377534b66546276a493677a /bin | |
| parent | 792835df3051f73b11d5a27313a9b4439af49911 (diff) | |
| parent | 518a8ab0fe67965555973788e3eea643882cb80c (diff) | |
| download | Qt-03c01176ebf423085e56ceabcf8335ca5027a786.zip Qt-03c01176ebf423085e56ceabcf8335ca5027a786.tar.gz Qt-03c01176ebf423085e56ceabcf8335ca5027a786.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
fix for looping crash log on data abort
Allow commenting of individual files in generated pkg files.
Removed README.s60-mkspec.
Fixed install docs for Qt for Symbian on Linux.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/patch_capabilities.pl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl index 501939a..7d6f5dc 100755 --- a/bin/patch_capabilities.pl +++ b/bin/patch_capabilities.pl @@ -186,7 +186,7 @@ if (@ARGV) } # If the line specifies a file, parse the source and destination locations. - if ($line =~ m|\"([^\"]+)\"\s*\-\s*\"([^\"]+)\"|) + if ($line =~ m|^ *\"([^\"]+)\"\s*\-\s*\"([^\"]+)\"|) { my $sourcePath = $1; |