summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGirish Ramakrishnan <girish.1.ramakrishnan@nokia.com>2012-05-08 12:29:23 -0700
committerQt by Nokia <qt-info@nokia.com>2012-05-09 06:42:25 +0200
commit33edd606ae188356e47a23619084b358496cbe70 (patch)
tree094d17778edc36b6bdbaaf117e24aed7ea01eeed
parentb58b777cb3df1df3725c601b655128ce875a8687 (diff)
Fix qpa legacy headers installation
syncqt is run twice when using the top level configure (as in the CI system). The pri_install_files and pri_install_pfiles variables are not populated if the file already exists when generating the compatibility headers. Therefore, headers.pri ends up with different content in each syncqt run. In the first run, the compatibility headers are part of SYNCQT.HEADER_FILES. In the second run, they are not part of it since the header files already exist. Change-Id: I4908fb934a639a3c9f6af1796d56a40fd4df2d50 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
-rwxr-xr-xbin/syncqt14
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/syncqt b/bin/syncqt
index 05597bbc15..6138a1cbc8 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -1179,15 +1179,15 @@ foreach my $lib (@modules_to_sync) {
} else {
print "$lib: created deprecated header $header => $include\n";
}
-
- my $addendum = fixPaths($header_path, $dir) . " ";
- if ($public_header) {
- $pri_install_files .= $addendum;
- } else {
- $pri_install_pfiles .= $addendum;
- }
$first = 0;
}
+
+ my $addendum = fixPaths($header_path, $dir) . " ";
+ if ($public_header) {
+ $pri_install_files .= $addendum;
+ } else {
+ $pri_install_pfiles .= $addendum;
+ }
}
if ($verbose_level < 3) {
print " }\n" unless ($first);