summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xbin/syncqt82
-rw-r--r--mkspecs/features/qt_module_headers.prf28
-rw-r--r--sync.profile10
3 files changed, 30 insertions, 90 deletions
diff --git a/bin/syncqt b/bin/syncqt
index eb7d9f0533..4b1338ef36 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -87,7 +87,7 @@ my $qtbasedir = dirname(dirname($0));
normalizePath(\$qtbasedir) if (defined $qtbasedir);
# will be defined based on the modules sync.profile
-our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %mastercontent, %modulepris, %explicitheaders, %deprecatedheaders);
+our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %modulepris, %explicitheaders, %deprecatedheaders);
# global variables (modified by options)
my $isunix = 0;
@@ -180,30 +180,6 @@ sub checkRelative {
}
######################################################################
-# Syntax: shouldMasterInclude(iheader)
-# Params: iheader, string, filename to verify inclusion
-#
-# Purpose: Determines if header should be in the master include file.
-# Returns: 0 if file contains "#pragma qt_no_master_include" or not
-# able to open, else 1.
-######################################################################
-sub shouldMasterInclude {
- my ($iheader) = @_;
- return 0 if(basename($iheader) =~ /_/);
- return 0 if(basename($iheader) =~ /qconfig/);
- if(open(F, "<$iheader")) {
- while(<F>) {
- chomp;
- return 0 if(/^\#pragma qt_no_master_include$/);
- }
- close(F);
- } else {
- return 0;
- }
- return 1;
-}
-
-######################################################################
# Syntax: classNames(iheader)
# Params: iheader, string, filename to parse for classname "symlinks"
#
@@ -845,28 +821,6 @@ foreach my $lib (@modules_to_sync) {
my $pri_install_pfiles = "";
my $pri_install_qpafiles = "";
- my $libcapitals = $lib;
- $libcapitals =~ y/a-z/A-Z/;
- my $master_contents = "#ifndef QT_".$libcapitals."_MODULE_H\n#define QT_".$libcapitals."_MODULE_H\n";
-
- #get dependencies
- if(-e "$dir/" . basename($dir) . ".pro") {
- if(open(F, "<$dir/" . basename($dir) . ".pro")) {
- while(my $line = <F>) {
- chomp $line;
- if($line =~ /^ *QT *\+?= *([^\r\n]*)/) {
- foreach(split(/ /, $1)) {
- $_ =~ s/-private$//;
- my $content = $mastercontent{$_};
- $master_contents .= $content if ($content);
- }
- last; #consecutive appearances are assumed to be private dependencies
- }
- }
- close(F);
- }
- }
-
push @{$inject_headers{$dir}}, lc($lib)."version.h";
$classnames{lc($lib)."version.h"} = $lib."Version";
@@ -1026,9 +980,6 @@ foreach my $lib (@modules_to_sync) {
}
if($public_header) {
- #put it into the master file
- $master_contents .= "#include \"$public_header\"\n" if(shouldMasterInclude($iheader));
-
#deal with the install directives
if($public_header) {
my $pri_install_iheader = fixPaths($iheader, $current_dir);
@@ -1086,9 +1037,6 @@ foreach my $lib (@modules_to_sync) {
}
}
- # close the master include:
- $master_contents .= "#endif\n";
-
unless($showonly) {
# create deprecated headers
my $first = 1;
@@ -1151,35 +1099,9 @@ foreach my $lib (@modules_to_sync) {
print " }\n" unless ($first);
}
- my @master_includes;
- push @master_includes, "$out_basedir/include/$lib/$lib";
- foreach my $master_include (@master_includes) {
- #generate the "master" include file
- my @tmp = split(/;/,$modules{$lib});
- $pri_install_files .= fixPaths($master_include, $tmp[0]) . " "; #get the master file installed too
- if($master_include && -e $master_include) {
- open MASTERINCLUDE, "<$master_include";
- local $/;
- binmode MASTERINCLUDE;
- my $oldmaster = <MASTERINCLUDE>;
- close MASTERINCLUDE;
- $oldmaster =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
- $master_include = 0 if($oldmaster eq $master_contents);
- }
- if($master_include && $master_contents) {
- my $master_dir = dirname($master_include);
- make_path($master_dir, $lib, $verbose_level);
- open MASTERINCLUDE, ">$master_include";
- print MASTERINCLUDE $master_contents;
- close MASTERINCLUDE;
- print "$lib: created header (master) file\n" if($verbose_level);
- }
- }
-
# KDE-Compat master header for Phonon
if ($lib eq "phonon") {
syncHeader($lib, "$out_basedir/include/phonon_compat/Phonon/Phonon", "$out_basedir/include/phonon/phonon", 0);
- $pri_install_files .= fixPaths("$out_basedir/include/phonon/phonon", "$basedir/src/phonon") . " ";
}
#handle the headers.pri for each module
@@ -1198,7 +1120,7 @@ foreach my $lib (@modules_to_sync) {
$old_headers_pri_contents =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
$headers_pri_file = 0 if($old_headers_pri_contents eq $headers_pri_contents);
}
- if($headers_pri_file && $master_contents) {
+ if($headers_pri_file) {
my $headers_pri_dir = dirname($headers_pri_file);
make_path($headers_pri_dir, $lib, $verbose_level);
open HEADERS_PRI_FILE, ">$headers_pri_file";
diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf
index 37146ff6ec..6a1854a771 100644
--- a/mkspecs/features/qt_module_headers.prf
+++ b/mkspecs/features/qt_module_headers.prf
@@ -4,6 +4,15 @@ include($$MODULE_BASE_OUTDIR/include/$$TARGET/headers.pri, "", true)
lctarget = $$lower($$TARGET)
uctarget = $$upper($$TARGET)
+defineTest(shouldMasterInclude) {
+ bn = $$basename(1)
+ contains(bn, .*_.*):return(false)
+ contains(bn, ^qconfig.*):return(false)
+ lines = $$cat($$_PRO_FILE_PWD_/$$1, lines)
+ contains(lines, $${LITERAL_HASH}pragma qt_no_master_include):return(false)
+ return(true)
+}
+
# Create module version header
MODULE_VERSION_HEADER = $$find(SYNCQT.HEADER_FILES, (^|/)$${lctarget}version\\.h$)
count(MODULE_VERSION_HEADER, 1) {
@@ -30,4 +39,23 @@ count(MODULE_VERSION_HEADER, 1) {
HEADERS += $$MODULE_VERSION_HEADER
}
+# Create a module master header
+MODULE_MASTER_HEADER = $$MODULE_BASE_OUTDIR/include/$$TARGET/$$TARGET
+!build_pass {
+ MODULE_MASTER_HEADER_CONT = \
+ "/* This file was generated by qmake with the info from $${_PRO_FILE_}. */" \
+ "$${LITERAL_HASH}ifndef QT_$${ucmodule}_MODULE_H" \
+ "$${LITERAL_HASH}define QT_$${ucmodule}_MODULE_H"
+ for(dep, MODULE_DEPENDS) {
+ depname = $$eval(QT.$${dep}.name)
+ MODULE_MASTER_HEADER_CONT += "$${LITERAL_HASH}include <$$depname/$$depname>"
+ }
+ for(hdr, SYNCQT.HEADER_FILES): \
+ shouldMasterInclude($$hdr): \
+ MODULE_MASTER_HEADER_CONT += "$${LITERAL_HASH}include \"$$replace(hdr, .*/, )\""
+ MODULE_MASTER_HEADER_CONT += "$${LITERAL_HASH}endif"
+ write_file($$MODULE_MASTER_HEADER, MODULE_MASTER_HEADER_CONT)|error("Aborting.")
+}
+SYNCQT.HEADER_FILES += $$MODULE_MASTER_HEADER
+
CONFIG += qt_install_headers
diff --git a/sync.profile b/sync.profile
index 95ef1fd729..ee3014532a 100644
--- a/sync.profile
+++ b/sync.profile
@@ -32,16 +32,6 @@
"qtconcurrentfilter.h" => "QtConcurrentFilter",
"qtconcurrentrun.h" => "QtConcurrentRun",
);
-%mastercontent = (
- "core" => "#include <QtCore/QtCore>\n",
- "gui" => "#include <QtGui/QtGui>\n",
- "printsupport" => "#include <QtPrintSupport/QtPrintSupport>\n",
- "widgets" => "#include <QtWidgets/QtWidgets>\n",
- "network" => "#include <QtNetwork/QtNetwork>\n",
- "opengl" => "#include <QtOpenGL/QtOpenGL>\n",
- "xml" => "#include <QtXml/QtXml>\n",
- "concurrent" => "#include <QtConcurrent/QtConcurrent>\n",
-);
%deprecatedheaders = (
"QtGui" => {
"qplatformaccessibility_qpa.h" => "qpa/qplatformaccessibility.h",
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-23 06:06:28 +0000