diff options
author | Aaron McCarthy <aaron.mccarthy@nokia.com> | 2011-09-07 12:00:04 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-09-07 07:17:08 +0200 |
commit | 0bcb2262d079f88e2c9e38eefaab36ba9aa0d7d3 (patch) | |
tree | f343183192ef5cf611fa9618260359e39b7d8abf | |
parent | bc2eac1ef3e6902f8fed65f72b70b582f93bcb19 (diff) |
Partially revert 25a0cf881e6ca6dc8bd969e7047c3967796fcd94
After the regexs in qtmodule-tests were fixed in the same commit it is
no longer necessary to explicitly add the include statement. Any
existing content unrelated to config tests is preserved.
Change-Id: I90bab6b838191f050204992aa45262212b937059
Reviewed-on: http://codereview.qt.nokia.com/4296
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
-rwxr-xr-x | bin/qtmodule-configtests | 6 |
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"; |