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>

diff --git a/bin/syncqt b/bin/syncqt
index a10117b..896ee74 100755 (executable)
--- 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});
 

diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index eb46481..0b6ad86 100644 (file)
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -35,14 +35,6 @@ else: \
 MODULE_DEFINES = $$MODULE_DEFINE $$MODULE_DEFINES
 
 load(qt_build_paths)
-
-# This check will be removed soon. Weird indentation to avoid reindenting the code later.
-!isEmpty(MODULE_PRI) {
-    !build_pass:warning("$$_PRO_FILE_ still sets MODULE_PRI. Not auto-generating module .pri file.")
-    MODULE_PRI = $$absolute_path($$MODULE_PRI, $$_PRO_FILE_PWD_)
-    exists($$MODULE_PRI)|error("Specified module pri file $$MODULE_PRI does not exist.")
-} else {
-
 MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
 
 !build_pass {
@@ -97,8 +89,6 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri
 
 } # !build_pass
 
-} # isEmpty(MODULE_PRI)
-
 load(qt_module_fwdpri)
 
 INCLUDEPATH *= $$eval(QT.$${MODULE}.includes) $$eval(QT.$${MODULE}.private_includes)