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

Fix qpa files installation

Browse Source 
qpa header files were not installed under qpa/.

Change-Id: I243c3a7e83a342f7485791a1a29b65c9a8f25d6b
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Girish Ramakrishnan 2012-05-08 03:50:50 -07:00 committed by Qt by Nokia
parent bf82547b82
commit 4a58853aea
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/syncqt
View File

@ -860,6 +860,7 @@ foreach my $lib (@modules_to_sync) {
my $pri_install_classes = "";
my $pri_install_files = "";
my $pri_install_pfiles = "";
my $pri_install_qpafiles = "";
my $libcapitals = $lib;
$libcapitals =~ y/a-z/A-Z/;
@ -1087,6 +1088,10 @@ foreach my $lib (@modules_to_sync) {
$pri_install_files.= "$pri_install_iheader ";;
}
}
elsif ($qpa_header) {
my $pri_install_iheader = fixPaths($iheader, $current_dir);
$pri_install_qpafiles.= "$pri_install_iheader ";;
}
else {
my $pri_install_iheader = fixPaths($iheader, $current_dir);
$pri_install_pfiles.= "$pri_install_iheader ";;
@ -1219,6 +1224,7 @@ foreach my $lib (@modules_to_sync) {
$headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
$headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\n";
$headers_pri_contents .= "SYNCQT.PRIVATE_HEADER_FILES = $pri_install_pfiles\n";
$headers_pri_contents .= "SYNCQT.QPA_HEADER_FILES = $pri_install_qpafiles\n";
my $headers_pri_file = "$out_basedir/include/$lib/headers.pri";
if(-e $headers_pri_file) {
open HEADERS_PRI_FILE, "<$headers_pri_file";

4
mkspecs/features/qt_installs.prf
View File

@ -33,5 +33,9 @@ qt_install_headers {
private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES
private_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/$$eval(QT.$${MODULE}.VERSION)/$$TARGET/private
INSTALLS += private_headers
qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES
qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/$$eval(QT.$${MODULE}.VERSION)/$$TARGET/qpa
INSTALLS += qpa_headers
}