Merge branch 'master' into refactor

Conflicts:
	src/3rdparty/v8
	src/gui/text/qfont_qpa.cpp
	src/gui/widgets/qlinecontrol.cpp
	src/plugins/platforms/fontdatabases/fontconfig/qfontconfigdatabase.cpp
	tests/auto/gui.pro
	tests/auto/network.pro
	tests/auto/qstring/tst_qstring.cpp

Change-Id: Id118c172645303ccf06a207050d5bf1462ff57fe

1 files changed, 1 insertions, 5 deletions

diff --git a/bin/qtmodule-configtests b/bin/qtmodule-configtests
index 4b4c5ae96c..d823b37278 100755
--- a/bin/qtmodule-configtests
+++ b/bin/qtmodule-configtests
@@ -299,10 +299,9 @@ if (abs_path($out_basedir) ne abs_path($qtbasedir)) {
         # Generate the new contents
         my $newContents = $existingContents;
 
-        # Strip out any existing config test results or include statements
+        # Strip out any existing config test results
         $newContents =~ s/^config_test_[^\$]*$//gm;
         $newContents =~ s/^# Compile time test results[^\$]*$//gm;
-        $newContents =~ s/include\(\$\$PWD\/..\/.qmake.cache\)$//gm;
 
         # Add any remaining content and make sure we start on a new line
         if ($newContents and chop $newContents ne '\n') {
@@ -322,9 +321,6 @@ if (abs_path($out_basedir) ne abs_path($qtbasedir)) {
         # Remove blank lines
         $newContents =~ s/^[\s]*$//gms;
 
-        # Include top level .qmake.cache
-        $newContents = $newContents . "include(\$\$PWD/../.qmake.cache)\n";
-
         # and open the file
         open my $cacheFileHandle, ">$qmakeCachePath" or die "Unable to open $qmakeCachePath for writing: $!\n";