AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Partially revert 25a0cf881e

Browse Source 
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>
This commit is contained in:
Aaron McCarthy 2011-09-07 12:00:04 +10:00 committed by Qt by Nokia
parent bc2eac1ef3
commit 0bcb2262d0
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/qtmodule-configtests
View File

@ -299,10 +299,9 @@ if (abs_path($out_basedir) ne abs_path($qtbasedir)) {
# Generate the new contents # Generate the new contents
my $newContents = $existingContents; 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/^config_test_[^\$]*$//gm;
$newContents =~ s/^# Compile time test results[^\$]*$//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 # Add any remaining content and make sure we start on a new line
if ($newContents and chop $newContents ne '\n') { if ($newContents and chop $newContents ne '\n') {
@ -322,9 +321,6 @@ if (abs_path($out_basedir) ne abs_path($qtbasedir)) {
# Remove blank lines # Remove blank lines
$newContents =~ s/^[\s]*$//gms; $newContents =~ s/^[\s]*$//gms;
# Include top level .qmake.cache
$newContents = $newContents . "include(\$\$PWD/../.qmake.cache)\n";
# and open the file # and open the file
open my $cacheFileHandle, ">$qmakeCachePath" or die "Unable to open $qmakeCachePath for writing: $!\n"; open my $cacheFileHandle, ">$qmakeCachePath" or die "Unable to open $qmakeCachePath for writing: $!\n";