summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-30 21:16:25 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-03 15:56:28 +0100
commit4315545f89b26a102bcbf68805e0360c731a9efd (patch)
treec2d5d763bf79deca58fc7219453ec88db686f85a /bin
parentd902b3a4813804c045ec0d0929e6ec3a0d1c63c1 (diff)
remove support for hand-written module pri files
all modules have been migrated to auto-generation Change-Id: Ie7b3ebfd735a22f8e0b0339909b6385508d7a6b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'bin')
-rwxr-xr-xbin/syncqt15
1 files changed, 1 insertions, 14 deletions
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});