generate the module version header directly in the include directory

... instead of having a forward from the include dir to the (shadowed)
source dir of the module.

Change-Id: I967227950e8aeb1b9f62befbf9fff3746a0486b6
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>

1 files changed, 7 insertions, 3 deletions

diff --git a/bin/syncqt b/bin/syncqt
index 98709928a7..359e854d05 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -807,9 +807,6 @@ foreach my $lib (@modules_to_sync) {
     my $pri_install_pfiles = "";
     my $pri_install_qpafiles = "";
 
-    push @{$inject_headers{$dir}}, lc($lib)."version.h";
-    $classnames{lc($lib)."version.h"} = $lib."Version";
-
     #remove the old files
     if($remove_stale) {
         my %injections = ();
@@ -1085,6 +1082,13 @@ foreach my $lib (@modules_to_sync) {
             print " }\n" unless ($first);
         }
 
+        # module version header
+        my $vheader = "$out_basedir/include/$lib/".lc($lib)."version.h";
+        my $VHeader = "$out_basedir/include/$lib/${lib}Version";
+        syncHeader($lib, $VHeader, $vheader, 0);
+        $pri_install_files .= fixPaths($vheader, $dir) . " ";
+        $pri_install_classes .= fixPaths($VHeader, $dir) . " ";
+
         # KDE-Compat master header for Phonon
         if ($lib eq "phonon") {
             syncHeader($lib, "$out_basedir/include/phonon_compat/Phonon/Phonon", "$out_basedir/include/phonon/phonon", 0);