1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix shadow prefix framework builds

Browse Source 
Bundle data source files which don't exist at qmake time need to be
handled specially. This also required splitting the generated list of
public headers, as was already done for private ones.

Task-number: QTBUG-60413
Change-Id: I97acfa88622da6b73839b8f976f73ace3cb10223
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
This commit is contained in:
Alexandru Croitor 2017-10-23 15:42:52 +02:00
parent f4090b23b9
commit 196f295b92
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
bin/syncqt.pl
View File

@ -925,6 +925,7 @@ foreach my $lib (@modules_to_sync) {
#information used after the syncing #information used after the syncing
my $pri_install_classes = ""; my $pri_install_classes = "";
my $pri_install_files = ""; my $pri_install_files = "";
my $pri_install_ifiles = "";
my $pri_install_pfiles = ""; my $pri_install_pfiles = "";
my $pri_install_ipfiles = ""; my $pri_install_ipfiles = "";
my $pri_install_qpafiles = ""; my $pri_install_qpafiles = "";
@ -1080,11 +1081,7 @@ foreach my $lib (@modules_to_sync) {
my $pri_install_iheader = fixPaths($iheader, $dir); my $pri_install_iheader = fixPaths($iheader, $dir);
my $injection = ""; my $injection = "";
if($public_header) { if ($public_header) {
#put it into the master file
$master_contents{$public_header} = $requires if (!$shadow && shouldMasterInclude($iheader));
#deal with the install directives
foreach my $class (@classes) { foreach my $class (@classes) {
# Strip namespaces: # Strip namespaces:
$class =~ s/^.*:://; $class =~ s/^.*:://;
@ -1096,9 +1093,18 @@ foreach my $lib (@modules_to_sync) {
unless($pri_install_classes =~ $class_header); unless($pri_install_classes =~ $class_header);
$injection .= ":$class"; $injection .= ":$class";
} }
$pri_install_files.= "$pri_install_iheader ";;
if ($shadow) {
$pri_install_ifiles .= "$pri_install_iheader ";
} else {
# put it into the master file
$master_contents{$public_header} = $requires if (shouldMasterInclude($iheader));
# deal with the install directives
$pri_install_files .= "$pri_install_iheader ";
$pri_clean_files .= "$pri_install_iheader".($requires ? ":".$requires : "")." " if ($clean_header); $pri_clean_files .= "$pri_install_iheader".($requires ? ":".$requires : "")." " if ($clean_header);
} }
}
elsif ($qpa_header) { elsif ($qpa_header) {
$pri_install_qpafiles.= "$pri_install_iheader ";; $pri_install_qpafiles.= "$pri_install_iheader ";;
} }
@ -1247,6 +1253,7 @@ foreach my $lib (@modules_to_sync) {
#handle the headers.pri for each module #handle the headers.pri for each module
my $headers_pri_contents = ""; my $headers_pri_contents = "";
$headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n"; $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
$headers_pri_contents .= "SYNCQT.INJECTED_HEADER_FILES = $pri_install_ifiles\n";
$headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\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.PRIVATE_HEADER_FILES = $pri_install_pfiles\n";
$headers_pri_contents .= "SYNCQT.INJECTED_PRIVATE_HEADER_FILES = $pri_install_ipfiles\n"; $headers_pri_contents .= "SYNCQT.INJECTED_PRIVATE_HEADER_FILES = $pri_install_ipfiles\n";

2
mkspecs/features/qt_installs.prf
View File

@ -32,7 +32,7 @@ qt_install_headers {
class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME class_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
INSTALLS += class_headers INSTALLS += class_headers
targ_headers.files = $$SYNCQT.HEADER_FILES targ_headers.files = $$SYNCQT.HEADER_FILES $$SYNCQT.INJECTED_HEADER_FILES
targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME targ_headers.path = $$[QT_INSTALL_HEADERS]/$$MODULE_INCNAME
INSTALLS += targ_headers INSTALLS += targ_headers

10
mkspecs/features/qt_module.prf
View File

@ -136,9 +136,17 @@ lib_bundle {
if(if(!debug_and_release|CONFIG(release, debug|release))) { if(if(!debug_and_release|CONFIG(release, debug|release))) {
FRAMEWORK_HEADERS.version = Versions FRAMEWORK_HEADERS.version = Versions
FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES FRAMEWORK_HEADERS.files = $$SYNCQT.HEADER_FILES $$SYNCQT.HEADER_CLASSES
# Non-existing paths (yet, they will be generated) are used verbatim.
for (injected_header, SYNCQT.INJECTED_HEADER_FILES): \
FRAMEWORK_HEADERS.files += \
$$relative_path($$absolute_path($$injected_header, $$_PRO_FILE_PWD_), $$OUT_PWD)
FRAMEWORK_HEADERS.path = Headers FRAMEWORK_HEADERS.path = Headers
FRAMEWORK_PRIVATE_HEADERS.version = Versions FRAMEWORK_PRIVATE_HEADERS.version = Versions
FRAMEWORK_PRIVATE_HEADERS.files = $$SYNCQT.PRIVATE_HEADER_FILES $$SYNCQT.INJECTED_PRIVATE_HEADER_FILES FRAMEWORK_PRIVATE_HEADERS.files = $$SYNCQT.PRIVATE_HEADER_FILES
for (injected_header, SYNCQT.INJECTED_PRIVATE_HEADER_FILES): \
FRAMEWORK_PRIVATE_HEADERS.files += \
$$relative_path($$absolute_path($$injected_header, $$_PRO_FILE_PWD_), $$OUT_PWD)
FRAMEWORK_PRIVATE_HEADERS.path = Headers/$$VERSION/$$MODULE_INCNAME/private FRAMEWORK_PRIVATE_HEADERS.path = Headers/$$VERSION/$$MODULE_INCNAME/private
FRAMEWORK_QPA_HEADERS.version = Versions FRAMEWORK_QPA_HEADERS.version = Versions
FRAMEWORK_QPA_HEADERS.files = $$SYNCQT.QPA_HEADER_FILES FRAMEWORK_QPA_HEADERS.files = $$SYNCQT.QPA_HEADER_FILES