From c34abdb08b3923e46b1997fb557f26f6614fbb82 Mon Sep 17 00:00:00 2001
From: Johan Klokkhammer Helsing <johan.helsing@qt.io>
Date: Wed, 28 Feb 2018 12:30:33 +0100
Subject: [PATCH] Member init for some variables that are not covered by
 constructors

Where it makes sense, default init variables to sensible values

Change-Id: Ie2aa6ab79a6a3c8322bb0ff804f340f7ffd1c1d1
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
---
 .../hardwareintegration/qwaylandserverbufferintegration_p.h | 2 +-
 src/plugins/platforms/wayland/qwaylanddisplay_p.h           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
index 7439087d885..632429befa3 100644
--- a/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
+++ b/src/plugins/platforms/wayland/hardwareintegration/qwaylandserverbufferintegration_p.h
@@ -85,7 +85,7 @@ public:
     void *userData() const;
 
 protected:
-    Format m_format;
+    Format m_format = RGBA32;
     QSize m_size;
 
 private:
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay_p.h b/src/plugins/platforms/wayland/qwaylanddisplay_p.h
index e9439d1be85..41ad7025fb1 100644
--- a/src/plugins/platforms/wayland/qwaylanddisplay_p.h
+++ b/src/plugins/platforms/wayland/qwaylanddisplay_p.h
@@ -224,10 +224,10 @@ private:
     QScopedPointer<QWaylandHardwareIntegration> mHardwareIntegration;
     QScopedPointer<QtWayland::zxdg_output_manager_v1> mXdgOutputManager;
     QSocketNotifier *mReadNotifier = nullptr;
-    int mFd;
-    int mWritableNotificationFd;
+    int mFd = -1;
+    int mWritableNotificationFd = -1;
     QList<RegistryGlobal> mGlobals;
-    int mCompositorVersion;
+    int mCompositorVersion = -1;
     uint32_t mLastInputSerial = 0;
     QWaylandInputDevice *mLastInputDevice = nullptr;
     QPointer<QWaylandWindow> mLastInputWindow;