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

Conflicts:
	src/corelib/global/global.pri
	src/corelib/global/qcompilerdetection.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qdatetime.cpp
	src/plugins/platforms/xcb/qxcbscreen.h
	src/plugins/platforms/xcb/qxcbwindow.h
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qcolordialog_p.h
	tools/configure/configureapp.cpp

Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af

1 files changed, 14 insertions, 27 deletions

diff --git a/tests/auto/test.pl b/tests/auto/test.pl
index 7c3708472c..48166e1c30 100755
--- a/tests/auto/test.pl
+++ b/tests/auto/test.pl
@@ -138,35 +138,22 @@ sub handleDir {
     my ($dir) = @_;
     my $currentDir = getcwd();
 
-    chdir($dir) || die("Could not chdir to $dir");
-    my @components;
-    my $command;
-    @components = split(/\//, $dir);
-    my $component = $components[$#components];
-
-    $command = "tst_".$component;
-
-    if ( -e $command.$EXE_SUFFIX )
-    {
-        executeTestCurrentDir($command);
-    } else {
-        opendir(DIR, $dir);
-        my @files = readdir(DIR);
-        closedir DIR;
-        my $file;
-        foreach $file (@files)
-        {
-            #skip hidden files
-            next if (substr($file,0,1) eq ".");
-
-            if ( -d $dir."/".$file)
-            {
-                handleDir($dir."/".$file)
-            }
-
+    opendir(DIR, $dir);
+    my @files = readdir(DIR);
+    closedir DIR;
+    my $file;
+    foreach $file (@files) {
+        #skip hidden files
+        next if (substr($file,0,1) eq ".");
+
+        if ( -d $dir."/".$file) {
+            handleDir($dir."/".$file)
+        } elsif ( $file =~ /^tst_/ and -x $dir."/".$file ) {
+            chdir($dir) || die("Could not chdir to $dir");
+            executeTestCurrentDir($file);
+            chdir($currentDir);
         }
     }
-    chdir($currentDir);
 }
 
 sub executeTestCurrentDir {