Merge remote branch 'gerrit/master' into refactor

Conflicts:
	src/gui/accessible/qaccessible.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_mac.mm
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qapplication_s60.cpp
	src/gui/kernel/qapplication_win.cpp
	src/gui/kernel/qapplication_x11.cpp
	src/gui/kernel/qdnd_x11.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/widgets/qlabel.cpp

Change-Id: Ief9c75724d2cff89ed45f009bdee2ffc5e4395ba

1 files changed, 1 insertions, 1 deletions

diff --git a/bin/qtmodule-configtests b/bin/qtmodule-configtests
index 0552f8e614..ab03908c84 100755
--- a/bin/qtmodule-configtests
+++ b/bin/qtmodule-configtests
@@ -267,7 +267,7 @@ if (abs_path($out_basedir) ne abs_path($qtbasedir)) {
     while ((my $testName, my $testParameters) = each %configtests) {
         printf "  % *s: ", $maxNameLength, $testName; # right aligned, yes/no lines up
 
-        my $fatalTest = $testParameters->{"fatal"} // 0;
+        my $fatalTest = $testParameters->{"fatal"};
         my $message = $testParameters->{"message"};
 
         my $testResult = executeTest($testName);