Merge branch '5.11' into dev

Conflicts:
	qmake/library/qmakebuiltins.cpp
	src/plugins/platforms/windows/qwindowstabletsupport.h
	src/plugins/platforms/xcb/qxcbconnection.cpp
	src/plugins/platforms/xcb/qxcbconnection.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/plugins/platforms/xcb/qxcbwindow.cpp
	src/widgets/styles/qstylesheetstyle.cpp
	tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp

Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e

6 files changed, 14 insertions, 8 deletions

diff --git a/src/gui/kernel/qevent.cpp b/src/gui/kernel/qevent.cpp
index e8f3cdd504..2362b93bf0 100644
--- a/src/gui/kernel/qevent.cpp
+++ b/src/gui/kernel/qevent.cpp
@@ -5031,7 +5031,9 @@ void QTouchEvent::TouchPoint::setLastNormalizedPos(const QPointF &lastNormalized
 }
 
 // ### remove the following 3 setRect functions and their usages soon
-/*! \internal \obsolete */
+/*! \internal
+    \obsolete
+*/
 void QTouchEvent::TouchPoint::setRect(const QRectF &rect)
 {
     if (d->ref.load() != 1)
@@ -5040,7 +5042,9 @@ void QTouchEvent::TouchPoint::setRect(const QRectF &rect)
     d->ellipseDiameters = rect.size();
 }
 
-/*! \internal \obsolete */
+/*! \internal
+    \obsolete
+*/
 void QTouchEvent::TouchPoint::setSceneRect(const QRectF &sceneRect)
 {
     if (d->ref.load() != 1)
@@ -5049,7 +5053,9 @@ void QTouchEvent::TouchPoint::setSceneRect(const QRectF &sceneRect)
     d->ellipseDiameters = sceneRect.size();
 }
 
-/*! \internal \obsolete */
+/*! \internal
+    \obsolete
+*/
 void QTouchEvent::TouchPoint::setScreenRect(const QRectF &screenRect)
 {
     if (d->ref.load() != 1)
diff --git a/src/gui/kernel/qinputdevicemanager_p.h b/src/gui/kernel/qinputdevicemanager_p.h
index d73c5526d0..74494d712b 100644
--- a/src/gui/kernel/qinputdevicemanager_p.h
+++ b/src/gui/kernel/qinputdevicemanager_p.h
@@ -72,7 +72,7 @@ public:
         DeviceTypeTablet
     };
 
-    QInputDeviceManager(QObject *parent = 0);
+    QInputDeviceManager(QObject *parent = nullptr);
 
     int deviceCount(DeviceType type) const;
 
diff --git a/src/gui/kernel/qplatforminputcontextplugin_p.h b/src/gui/kernel/qplatforminputcontextplugin_p.h
index 3f45df922e..2228d5c8d6 100644
--- a/src/gui/kernel/qplatforminputcontextplugin_p.h
+++ b/src/gui/kernel/qplatforminputcontextplugin_p.h
@@ -66,7 +66,7 @@ class Q_GUI_EXPORT QPlatformInputContextPlugin : public QObject
 {
     Q_OBJECT
 public:
-    explicit QPlatformInputContextPlugin(QObject *parent = 0);
+    explicit QPlatformInputContextPlugin(QObject *parent = nullptr);
     ~QPlatformInputContextPlugin();
 
     virtual QPlatformInputContext *create(const QString &key, const QStringList &paramList) = 0;
diff --git a/src/gui/kernel/qplatformintegrationplugin.h b/src/gui/kernel/qplatformintegrationplugin.h
index f1136965b7..6a0b9dc9a7 100644
--- a/src/gui/kernel/qplatformintegrationplugin.h
+++ b/src/gui/kernel/qplatformintegrationplugin.h
@@ -64,7 +64,7 @@ class Q_GUI_EXPORT QPlatformIntegrationPlugin : public QObject
 {
     Q_OBJECT
 public:
-    explicit QPlatformIntegrationPlugin(QObject *parent = 0);
+    explicit QPlatformIntegrationPlugin(QObject *parent = nullptr);
     ~QPlatformIntegrationPlugin();
 
     virtual QPlatformIntegration *create(const QString &key, const QStringList &paramList);
diff --git a/src/gui/kernel/qplatformsharedgraphicscache.h b/src/gui/kernel/qplatformsharedgraphicscache.h
index e11d2f41a9..b3b5488139 100644
--- a/src/gui/kernel/qplatformsharedgraphicscache.h
+++ b/src/gui/kernel/qplatformsharedgraphicscache.h
@@ -69,7 +69,7 @@ public:
         OpenGLTexture
     };
 
-    explicit QPlatformSharedGraphicsCache(QObject *parent = 0) : QObject(parent) {}
+    explicit QPlatformSharedGraphicsCache(QObject *parent = nullptr) : QObject(parent) {}
 
     virtual void beginRequestBatch() = 0;
     virtual void ensureCacheInitialized(const QByteArray &cacheId, BufferType bufferType,
diff --git a/src/gui/kernel/qplatformthemeplugin.h b/src/gui/kernel/qplatformthemeplugin.h
index 7b56879940..0f88806b0b 100644
--- a/src/gui/kernel/qplatformthemeplugin.h
+++ b/src/gui/kernel/qplatformthemeplugin.h
@@ -63,7 +63,7 @@ class Q_GUI_EXPORT QPlatformThemePlugin : public QObject
 {
     Q_OBJECT
 public:
-    explicit QPlatformThemePlugin(QObject *parent = 0);
+    explicit QPlatformThemePlugin(QObject *parent = nullptr);
     ~QPlatformThemePlugin();
 
     virtual QPlatformTheme *create(const QString &key, const QStringList &paramList) = 0;