diff options
author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-06-19 13:21:35 -0700 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-03 01:55:37 +0200 |
commit | 037238022f3a91a5619709b2c7cf4b38cd4d294b (patch) | |
tree | c33f6c04d69e32765649b5ae2cb7f8e09131966d /bin | |
parent | fe37ae066fdfad313215937aab2428b74892b746 (diff) |
Make QWindowSystemInterface part of QPA API
As discussed on mailing list and QtCS 2012.
Any file starting with qwindowsystem is now marked as
QPA API.
This change drops _qpa from the filenames and adds gui-private
where required for the code to compile. This change is backward
compatible otherwise and compat headers are created for
the old inclusion headers.
Change-Id: I72ea0f394dee74f46e614fcf11ab5500ac9fef2a
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/syncqt | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt index 5f8bbe248a..23230c2c4b 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -88,6 +88,7 @@ normalizePath(\$qtbasedir) if (defined $qtbasedir); # will be defined based on the modules sync.profile our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %modulepris, %explicitheaders, %deprecatedheaders); +our @qpa_headers = (); # global variables (modified by options) my $isunix = 0; @@ -584,6 +585,15 @@ sub locateSyncProfile } } +sub isQpaHeader +{ + my ($header) = @_; + foreach my $qpa_header (@qpa_headers) { + return 1 if ($header =~ $qpa_header); + } + return 0; +} + # check if this is an in-source build, and if so use that as the basedir too $basedir = locateSyncProfile($out_basedir); if ($basedir) { @@ -910,7 +920,7 @@ foreach my $lib (@modules_to_sync) { #figure out if it is a public header my $public_header = $header; my $qpa_header = 0; - if($public_header =~ /^qplatform/) { + if(isQpaHeader($public_header)) { $public_header = 0; $qpa_header = 1; } elsif($allheadersprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { @@ -1200,7 +1210,7 @@ if($check_includes) { my $public_header = $header; if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) { $public_header = 0; - } elsif ($public_header =~ /^qplatform/) { + } elsif (isQpaHeader($public_header)) { $public_header = 0; } else { foreach (@ignore_for_master_contents) { |