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

Conflicts:
	src/network/access/qnetworkreply.cpp
	tests/auto/corelib/kernel/qmetaobject/tst_qmetaobject.cpp

Change-Id: Iadf766269454087e69fb216fc3857d85b0ddfaad

1 files changed, 138 insertions, 0 deletions

diff --git a/util/includemocs/includemocs.pl b/util/includemocs/includemocs.pl
new file mode 100755
index 0000000000..ce04d961d8
--- /dev/null
+++ b/util/includemocs/includemocs.pl
@@ -0,0 +1,138 @@
+#!/usr/bin/perl
+#############################################################################
+##
+## Copyright (C) 2017 Intel Corporation.
+## Contact: https://www.qt.io/licensing/
+##
+## This file is the build configuration utility of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:GPL-EXCEPT$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and The Qt Company. For licensing terms
+## and conditions see https://www.qt.io/terms-conditions. For further
+## information use the contact form at https://www.qt.io/contact-us.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3 as published by the Free Software
+## Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
+## included in the packaging of this file. Please review the following
+## information to ensure the GNU General Public License requirements will
+## be met: https://www.gnu.org/licenses/gpl-3.0.html.
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+use strict;
+
+MAKEFILE: while ($_ = shift @ARGV) {
+    chdir($ENV{PWD});
+    open MAKEFILE, "<", $_
+        or die("Could not open Makefile");
+    print "includemocs.pl: Processing $_\n";
+
+    my $srcdir;
+    my $sourcesline;
+
+    # Find "SOURCES =" line
+    while (<MAKEFILE>) {
+        $srcdir = $1 if m,^# Project:\s+(.*)/[^/]+.pro,;
+        if (/^# Template:\s+(\w+)/) {
+            next MAKEFILE if $1 eq "subdirs";
+        }
+        if (/^SOURCES\s*=\s*(.*)/) {
+            $sourcesline = $1;
+            last;
+        }
+    }
+    if ($sourcesline =~ s/\s+\\//) {
+        # continuation
+        while (<MAKEFILE>) {
+            chomp;
+            /^\s*([^ ]+)/;
+            $sourcesline .= " $1";
+            last unless m/\\$/;
+        }
+    }
+    close MAKEFILE;
+
+    # Now parse the sources
+    my @mocs;
+    my @sources;
+    for (split(/ /, $sourcesline)) {
+        if (/\.moc\/(moc_.*\.cpp)/) {
+            push @mocs, $1;
+        } elsif (/^\.(rcc|uic)/) {
+            # ignore
+        } else {
+            push @sources, $_;
+        }
+    }
+
+    chdir($srcdir) or die("Where's $srcdir? $!");
+    for my $moc (@mocs) {
+        my $include = "#include \"$moc\"\n";
+
+        # Find a corresponding .cpp file to host the new #include
+        my $basename = ($moc =~ s/^moc_//r);
+        $basename =~ s/\.[^.]+//;
+        my @candidates = grep { m,\Q/$basename.\E, } @sources;
+
+        if (scalar @candidates == 0) {
+            # Try without a _p suffix
+            $basename =~ s/_p$//;
+            @candidates = grep { m,\Q/$basename.\E, } @sources;
+        }
+        if (scalar @candidates == 0) {
+            print STDERR "includemocs.pl: Cannot find .cpp file for $moc\n";
+            next;
+        }
+
+        my $cpp = $candidates[0];
+        undef @candidates;
+
+        #print "$moc -> $cpp\n";
+        open CPP, "<", $cpp
+            or die("Cannot open source $cpp: $!");
+
+        my @lines;
+        while (<CPP>) {
+            push @lines, $_;
+            next unless defined($include);
+
+            # Print the new include next to a pre-existing moc include
+            if (/#include \"moc_/ || /#include ".*\.moc"/) {
+                push @lines, $include;
+                undef $include;
+            }
+        }
+        close CPP;
+
+        if (defined($include)) {
+            # Try to insert the new #include between QT_END_NAMESPACE and any #endif lines
+            my $n = 0;
+            my $extrablank = "";
+            while (defined($include)) {
+                --$n;
+                $_ = $lines[$n];
+                if (/^#endif/) {
+                    $extrablank = "\n";
+                    next;
+                }
+
+                $_ .= "\n" unless /^$/;
+                splice @lines, $n, 1, ($_, $include, $extrablank);
+                undef $include;
+            }
+        }
+
+        # Write the file again
+        open CPP, ">", $cpp
+            or die("Cannot open source $cpp for writing: $!");
+        map { print CPP $_; } @lines;
+        close CPP;
+    }
+}