Merge remote-tracking branch 'origin/5.11' into dev

 Conflicts:
	src/plugins/platforms/cocoa/qnsview.mm
	src/plugins/platforms/cocoa/qnsview_dragging.mm
	src/plugins/platforms/ios/qiosinputcontext.mm
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/tools/androiddeployqt/main.cpp
		Was moved from qttools into qtbase in 5.11.
		So re-apply 32398e4d here.
	tests/auto/corelib/global/qlogging/test/test.pro
	tests/auto/corelib/global/qlogging/tst_qlogging.cpp
	tests/auto/corelib/io/qfile/tst_qfile.cpp
	tests/auto/corelib/kernel/qtimer/tst_qtimer.cpp
	tests/auto/corelib/thread/qthreadstorage/test/test.pro
	tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp
	tests/auto/widgets/kernel/qapplication/test/test.pro

Done-with: Gatis Paeglis <gatis.paeglis@qt.io>
Done-with: Mårten Nordheim <marten.nordheim@qt.io>
Done-with: Oliver Wolff <oliver.wolff@qt.io>
Change-Id: Id970486c5315a1718c540f00deb2633533e8fc7b

1 files changed, 13 insertions, 2 deletions

diff --git a/bin/syncqt.pl b/bin/syncqt.pl
index 78fe0663b5..8890b31770 100755
--- a/bin/syncqt.pl
+++ b/bin/syncqt.pl
@@ -84,7 +84,7 @@ $INPUT_RECORD_SEPARATOR = "\r\n" if ($^O eq "msys");
 
 # will be defined based on the modules sync.profile
 our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %deprecatedheaders);
-our @qpa_headers = ();
+our (@qpa_headers, @private_headers);
 
 # will be derived from sync.profile
 our %reverse_classnames = ();
@@ -659,6 +659,8 @@ sub loadSyncProfile {
             $reverse_classnames{$cn} = $fn;
         }
     }
+
+    push @private_headers, qr/_p(ch)?\.h$/;
 }
 
 sub basePrettify {
@@ -701,6 +703,15 @@ sub isQpaHeader
     return 0;
 }
 
+sub isPrivateHeader
+{
+    my ($header) = @_;
+    foreach my $private_header (@private_headers) {
+        return 1 if ($header =~ $private_header);
+    }
+    return 0;
+}
+
 sub globosort($$) {
     my ($a, $b) = @_;
     if ($a =~ /^q(.*)global\.h$/) {
@@ -1021,7 +1032,7 @@ foreach my $lib (@modules_to_sync) {
                         if(isQpaHeader($public_header)) {
                             $public_header = 0;
                             $qpa_header = 1;
-                        } elsif ($allheadersprivate || $thisprivate || $public_header =~ /_p(ch)?\.h$/) {
+                        } elsif ($allheadersprivate || $thisprivate || isPrivateHeader($public_header)) {
                             $public_header = 0;
                         }