AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix qpa legacy headers installation

Browse Source 
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>
This commit is contained in:
Girish Ramakrishnan 2012-05-08 12:29:23 -07:00 committed by Qt by Nokia
parent b58b777cb3
commit 33edd606ae
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bin/syncqt
View File

@ -1179,15 +1179,15 @@ foreach my $lib (@modules_to_sync) {
} else { } else {
print "$lib: created deprecated header $header => $include\n"; 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; $first = 0;
} }
my $addendum = fixPaths($header_path, $dir) . " ";
if ($public_header) {
$pri_install_files .= $addendum;
} else {
$pri_install_pfiles .= $addendum;
}
} }
if ($verbose_level < 3) { if ($verbose_level < 3) {
print " }\n" unless ($first); print " }\n" unless ($first);