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

 Conflicts:
	.qmake.conf
	src/corelib/kernel/qeventdispatcher_cf.mm
	src/gui/kernel/qguiapplication_p.h
	src/gui/kernel/qwindowsysteminterface.cpp
	src/gui/kernel/qwindowsysteminterface.h
	src/plugins/platforms/cocoa/qcocoawindow.mm
	src/plugins/platforms/cocoa/qnswindowdelegate.mm
	src/plugins/platforms/ios/qioseventdispatcher.mm
	src/plugins/platforms/windows/qwindowsdrag.h
	src/plugins/platforms/windows/qwindowsinternalmimedata.h
	src/plugins/platforms/windows/qwindowsmime.cpp
	src/plugins/platforms/winrt/qwinrtscreen.cpp

Change-Id: Ic817f265c2386e83839d2bb9ef7419cb29705246

1 files changed, 4 insertions, 4 deletions

diff --git a/examples/widgets/tools/plugandpaint/app/plugindialog.h b/examples/widgets/tools/plugandpaint/app/plugindialog.h
index f8e5bcda24..b18b30e62c 100644
--- a/examples/widgets/tools/plugandpaint/app/plugindialog.h
+++ b/examples/widgets/tools/plugandpaint/app/plugindialog.h
@@ -68,7 +68,7 @@ class PluginDialog : public QDialog
 
 public:
     PluginDialog(const QString &path, const QStringList &fileNames,
-                 QWidget *parent = 0);
+                 QWidget *parent = nullptr);
 
 private:
     void findPlugins(const QString &path, const QStringList &fileNames);
@@ -76,9 +76,9 @@ private:
     void addItems(QTreeWidgetItem *pluginItem, const char *interfaceName,
                   const QStringList &features);
 
-    QLabel *label;
-    QTreeWidget *treeWidget;
-    QPushButton *okButton;
+    QLabel *label = nullptr;
+    QTreeWidget *treeWidget = nullptr;
+    QPushButton *okButton = nullptr;
     QIcon interfaceIcon;
     QIcon featureIcon;
 };