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

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qglobal.h
	src/corelib/global/qsysinfo.h
	src/corelib/global/qsystemdetection.h
	src/corelib/kernel/qobjectdefs.h
	src/plugins/plugins.pro
	tests/auto/widgets/itemviews/qlistview/qlistview.pro

Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c

6 files changed, 21 insertions, 4 deletions

diff --git a/tests/auto/other/lancelot/paintcommands.cpp b/tests/auto/other/lancelot/paintcommands.cpp
index caca0f2ebd..4fc41fd649 100644
--- a/tests/auto/other/lancelot/paintcommands.cpp
+++ b/tests/auto/other/lancelot/paintcommands.cpp
@@ -2383,7 +2383,10 @@ void PaintCommands::command_surface_begin(QRegExp re)
         m_surface_glbuffer->bind();
         m_surface_glpaintdevice = new QOpenGLPaintDevice(qRound(w), qRound(h));
         m_painter = new QPainter(m_surface_glpaintdevice);
+        m_painter->save();
+        m_painter->setCompositionMode(QPainter::CompositionMode_Clear);
         m_painter->fillRect(QRect(0, 0, qRound(w), qRound(h)), Qt::transparent);
+        m_painter->restore();
 #endif
 #ifdef Q_DEAD_CODE_FROM_QT4_X11
     } else if (m_type == WidgetType) {
diff --git a/tests/auto/other/lancelot/scripts/arcs2.qps b/tests/auto/other/lancelot/scripts/arcs2.qps
index 411ff08014..a2739a8c97 100644
--- a/tests/auto/other/lancelot/scripts/arcs2.qps
+++ b/tests/auto/other/lancelot/scripts/arcs2.qps
@@ -45,3 +45,10 @@ drawArc 100 350 300 300 5440 5760
 drawArc 100 350 300 300 5600 5760
 setPen white
 drawArc 100 350 300 300 0 5760
+
+translate 400 300
+setRenderHint Antialiasing true
+setPen blue 40
+drawArc 100 100 200 200 0 4320
+setPen red 40
+drawArc 60 60 280 280 0 4320
diff --git a/tests/auto/other/lancelot/scripts/text.qps b/tests/auto/other/lancelot/scripts/text.qps
index 344c7a813d..169549a5bd 100644
--- a/tests/auto/other/lancelot/scripts/text.qps
+++ b/tests/auto/other/lancelot/scripts/text.qps
@@ -159,4 +159,11 @@ save
 
   setPen black
   drawText 0 70 "testing glyph cache textures"
-restore
\ No newline at end of file
+restore
+
+translate 0 75
+save
+  setPen black
+  setFont "sansserif" 16 normal
+  drawText 0 40 "e😃m😇o😍j😜i😸!"
+restore
diff --git a/tests/auto/other/other.pro b/tests/auto/other/other.pro
index 8c911da2e0..673e922fdd 100644
--- a/tests/auto/other/other.pro
+++ b/tests/auto/other/other.pro
@@ -58,7 +58,7 @@ wince*|!contains(QT_CONFIG, accessibility): SUBDIRS -= qaccessibility
            macplist \
            qaccessibilitymac
 
-!embedded|wince*: SUBDIRS -= \
+!embedded|wince: SUBDIRS -= \
            qdirectpainter
 
 winrt: SUBDIRS -= \
diff --git a/tests/auto/other/qaccessibility/qaccessibility.pro b/tests/auto/other/qaccessibility/qaccessibility.pro
index 70cced1dac..1d6fc6bcd1 100644
--- a/tests/auto/other/qaccessibility/qaccessibility.pro
+++ b/tests/auto/other/qaccessibility/qaccessibility.pro
@@ -7,7 +7,7 @@ HEADERS += accessiblewidgets.h
 
 unix:!mac:!haiku:LIBS+=-lm
 
-wince*: {
+wince {
 	accessneeded.files = $$QT_BUILD_TREE\\plugins\\accessible\\*.dll
 	accessneeded.path = accessible
 	DEPLOYMENT += accessneeded
diff --git a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm
index d0ff6af640..3056904dcf 100644
--- a/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm
+++ b/tests/auto/other/qaccessibilitymac/tst_qaccessibilitymac_helpers.mm
@@ -129,7 +129,7 @@ QDebug operator<<(QDebug dbg, AXErrorTag err)
 
 - (AXUIElementRef) ref { return reference; }
 - (void) print {
-    NSLog(@"Accessible Object role: '%@', title: '%@', description: '%@', value: '%@', rect: '%@'", self.role, self.title, self.description, self.value, NSStringFromRect(self.rect));
+    NSLog(@"Accessible Object role: '%@', title: '%@', description: '%@', value: '%@', rect: '%@'", self.role, self.title, self.description, self.value, NSStringFromRect(NSRectFromCGRect(self.rect)));
     NSLog(@"    Children: %ld", [[self childList] count]);
 }