Merge branch 'master' into refactor

Conflicts:
	src/gui/kernel/qapplication_qpa.cpp
	src/gui/kernel/qcursor_qpa.cpp
	src/gui/kernel/qwindowsysteminterface_qpa.cpp
	src/gui/kernel/qwindowsysteminterface_qpa.h
	src/gui/kernel/qwindowsysteminterface_qpa_p.h
	src/gui/text/qtextcontrol.cpp
	src/plugins/platforms/wayland/wayland.pro
	src/widgets/accessible/qaccessible2.h
	src/widgets/widgets/qwidgetlinecontrol_p.h

Change-Id: I5e6f4eb184159dccc67e8f13673edb884d179c74

2 files changed, 3 insertions, 3 deletions

diff --git a/bin/qtmodule-configtests b/bin/qtmodule-configtests
index f6cc2052da..0552f8e614 100755
--- a/bin/qtmodule-configtests
+++ b/bin/qtmodule-configtests
@@ -262,7 +262,7 @@ if (abs_path($out_basedir) ne abs_path($qtbasedir)) {
     $| = 1;
 
     # Now run the configuration tests
-    print "Configuration tests:\n";
+    print "Configuration tests:\n" if (%configtests);
 
     while ((my $testName, my $testParameters) = each %configtests) {
         printf "  % *s: ", $maxNameLength, $testName; # right aligned, yes/no lines up
diff --git a/bin/syncqt b/bin/syncqt
index 0dcbc4d58e..4eab929b30 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -777,8 +777,8 @@ die "Cannot automatically detect/use provided path to QtBase's build directory!\
 # if we have no $basedir we cannot be sure which sources you want, so die
 die "Could not find any sync.profile for your module!\nPass <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir);
 
-my @ignore_headers = ();
 my $class_lib_map_contents = "";
+our @ignore_headers = ();
 our @ignore_for_master_contents = ();
 our @ignore_for_include_check = ();
 our @ignore_for_qt_begin_header_check = ();
@@ -900,7 +900,7 @@ foreach my $lib (@modules_to_sync) {
             # FIXME: this creates a file in the source location for shadow-builds
             my $moduleversionheader = "$modules{$lib}/" . lc($lib) . "version.h";
             my $modulehexstring = sprintf("0x%02X%02X%02X", int($module_major_version), int($module_minor_version), int($module_patch_version));
-            open MODULE_VERSION_HEADER_FILE, ">$moduleversionheader";
+            open MODULE_VERSION_HEADER_FILE, ">$moduleversionheader" or die "Can't open $moduleversionheader for writing";
             print MODULE_VERSION_HEADER_FILE "/* This file was generated by syncqt with the info from sync.profile. */\n";
             print MODULE_VERSION_HEADER_FILE "#ifndef QT_". uc($lib) . "_VERSION_H\n";
             print MODULE_VERSION_HEADER_FILE "#define QT_". uc($lib) . "_VERSION_H\n";