diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-10-12 21:42:19 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-16 17:31:31 +0200 |
| commit | 098644864713d6956d33d45cc610e2c6afb5211f (patch) | |
| tree | 40cba0b36bc94891c7b2d281fb0a3d55ff0e9aa9 /bin | |
| parent | 93e0f1223ae4c68cd7a84924d7525ac63f4395f6 (diff) | |
| download | qtbase-098644864713d6956d33d45cc610e2c6afb5211f.tar.gz | |
restore compat with old perl: don't use \h in regexps
Task-number: QTBUG-27543
Change-Id: I94a1368de69faeabe359e2c5e1f22879e9e96cc8
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/syncqt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/syncqt b/bin/syncqt index bbbbe33d50..3ca057ec6c 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -794,10 +794,10 @@ $isunix = checkUnix; #cache checkUnix my $qt_version = fileContents($qtbasedir."/mkspecs/qconfig.pri"); if (length($qt_version)) { - $qt_version =~ s,.*^QT_VERSION\h*=\h*(\S+).*,$1,sm; + $qt_version =~ s,.*^QT_VERSION[ \t]*=[ \t]*(\S+).*,$1,sm; } else { $qt_version = fileContents($basedir."/src/corelib/global/qglobal.h"); - $qt_version =~ s,.*^#\h*define\h+QT_VERSION_STR\h+"([^"]+)".*,$1,sm; + $qt_version =~ s,.*^#[ \t]*define[ \t]+QT_VERSION_STR[ \t]+"([^"]+)".*,$1,sm; } foreach my $lib (@modules_to_sync) { die "No such module: $lib" unless(defined $modules{$lib}); @@ -808,7 +808,7 @@ foreach my $lib (@modules_to_sync) { my $project = $dir; $project =~ s,/([^/]+)$,/$1/$1.pro,; my $module_version = fileContents($project); - $module_version = $qt_version unless ($module_version =~ s,.*^VERSION\h*=\h*(\S+).*,$1,sm); + $module_version = $qt_version unless ($module_version =~ s,.*^VERSION[ \t]*=[ \t]*(\S+).*,$1,sm); # Backwards compatibility for modules with checked in .pri files. if (defined $modulepris{$lib} and -e "$modulepris{$lib}") { |