From 4315545f89b26a102bcbf68805e0360c731a9efd Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 30 Nov 2012 21:16:25 +0100 Subject: remove support for hand-written module pri files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit all modules have been migrated to auto-generation Change-Id: Ie7b3ebfd735a22f8e0b0339909b6385508d7a6b3 Reviewed-by: Joerg Bornemann Reviewed-by: Tor Arne Vestbø --- bin/syncqt | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'bin') diff --git a/bin/syncqt b/bin/syncqt index a10117bf2e..896ee742c5 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -87,7 +87,7 @@ my $mkspecsdir = dirname(dirname($0)); normalizePath(\$mkspecsdir) if (defined $mkspecsdir); # will be defined based on the modules sync.profile -our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %modulepris, %explicitheaders, %deprecatedheaders); +our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %explicitheaders, %deprecatedheaders); our @qpa_headers = (); # global variables (modified by options) @@ -810,19 +810,6 @@ foreach my $lib (@modules_to_sync) { my $module_version = fileContents($project); $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}") { - my $content = fileContents($modulepris{$lib}); - my @version_rows = grep(/QT\..*\.VERSION/, split('\n', $content)); - if(@version_rows) { - # We only pick the first one, since each module need a separate .pri file - $module_version = $version_rows[0]; - chomp $module_version; - $module_version =~ s/^\s*QT\..*\.VERSION\s*=\s*([^#]+).*$/$1/; - $module_version =~ s/\s+$//; - } - } - my $pathtoheaders = ""; $pathtoheaders = $moduleheaders{$lib} if ($moduleheaders{$lib}); -- cgit v1.2.3