From 236e794fc31ca2bcba0bdc06fa133646cef39480 Mon Sep 17 00:00:00 2001
From: Liang Qi <liang.qi@nokia.com>
Date: Wed, 11 May 2011 10:05:43 +0200
Subject: Fix a bug in syncqt.

Move the generation of version header file before the sync of header
files.

Reviewed-by: TrustMe
---
 bin/syncqt | 44 ++++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'bin/syncqt')

diff --git a/bin/syncqt b/bin/syncqt
index 2ac67fe51d..3d668fa05e 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -847,6 +847,28 @@ foreach my $lib (@modules_to_sync) {
         }
     }
 
+    # create the version header files for each module
+    unless ($no_module_version_header) {
+        my $modulepri = $modulepris{$lib};
+        if (-e $modulepri) {
+            my $modulepriname = basename($modulepri);
+            my $moduleversionheader = "$modules{$lib}/" . lc($lib) . "version.h";
+            my $modulehexstring = sprintf("0x%02X%02X%02X", int($module_major_version), int($module_minor_version), int($module_patch_version));
+            open MODULE_VERSION_HEADER_FILE, ">$moduleversionheader";
+            print MODULE_VERSION_HEADER_FILE "/* This file was generated by syncqt with the info from sync.profile. */\n";
+            print MODULE_VERSION_HEADER_FILE "#ifndef QT_". uc($lib) . "_VERSION_H\n";
+            print MODULE_VERSION_HEADER_FILE "#define QT_". uc($lib) . "_VERSION_H\n";
+            print MODULE_VERSION_HEADER_FILE "\n";
+            print MODULE_VERSION_HEADER_FILE "#define " .uc($lib) . "_VERSION_STR \"" . $module_version . "\"\n";
+            print MODULE_VERSION_HEADER_FILE "\n";
+            print MODULE_VERSION_HEADER_FILE "#define " .uc($lib) . "_VERSION $modulehexstring\n", ;
+            print MODULE_VERSION_HEADER_FILE "\n";
+            print MODULE_VERSION_HEADER_FILE "#endif // QT_". uc($lib) . "_VERSION_H\n";
+        } elsif ($modulepri) {
+            print "WARNING: Module $lib\'s pri file '$modulepri' not found.\nSkipped creating module version header for $lib.\n";
+        }
+    }
+
     #create the new ones
     foreach my $current_dir (split(/;/, $dir)) {
         my $headers_dir = $current_dir;
@@ -1063,28 +1085,6 @@ foreach my $lib (@modules_to_sync) {
                 print "WARNING: Module $lib\'s pri file '$modulepri' not found.\nSkipped creating forwarding pri for $lib.\n";
             }
         }
-
-        # create the version header files for each module
-        unless ($no_module_version_header) {
-            my $modulepri = $modulepris{$lib};
-            if (-e $modulepri) {
-                my $modulepriname = basename($modulepri);
-                my $moduleversionheader = "$modules{$lib}/" . lc($lib) . "version.h";
-                my $modulehexstring = sprintf("0x%02X%02X%02X", int($module_major_version), int($module_minor_version), int($module_patch_version));
-                open MODULE_VERSION_HEADER_FILE, ">$moduleversionheader";
-                print MODULE_VERSION_HEADER_FILE "/* This file was generated by syncqt with the info from sync.profile. */\n";
-                print MODULE_VERSION_HEADER_FILE "#ifndef QT_". uc($lib) . "_VERSION_H\n";
-                print MODULE_VERSION_HEADER_FILE "#define QT_". uc($lib) . "_VERSION_H\n";
-                print MODULE_VERSION_HEADER_FILE "\n";
-                print MODULE_VERSION_HEADER_FILE "#define " .uc($lib) . "_VERSION_STR \"" . $module_version . "\"\n";
-                print MODULE_VERSION_HEADER_FILE "\n";
-                print MODULE_VERSION_HEADER_FILE "#define " .uc($lib) . "_VERSION $modulehexstring\n", ;
-                print MODULE_VERSION_HEADER_FILE "\n";
-                print MODULE_VERSION_HEADER_FILE "#endif // QT_". uc($lib) . "_VERSION_H\n";
-            } elsif ($modulepri) {
-                print "WARNING: Module $lib\'s pri file '$modulepri' not found.\nSkipped creating module version header for $lib.\n";
-            }
-        }
     }
 }
 unless($showonly || !$create_uic_class_map) {
-- 
cgit v1.2.3