From 197bed092d8d88446d3708cd393c8f9c3a8d0491 Mon Sep 17 00:00:00 2001
From: Rainer Keller <Rainer.Keller@qt.io>
Date: Mon, 24 Oct 2016 15:52:03 +0200
Subject: Fix compile error: 0 is not allowed for pointer initialization
 anymore

Change-Id: Ic8b789a46dafd379fdd48279d6eb138f978e80a5
Reviewed-by: Risto Avila <risto.avila@qt.io>
Reviewed-by: Kimmo Ollila <kimmo.ollila@theqtcompany.com>
Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com>
Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
---
 src/displaysettings/displaysettings.h   | 2 +-
 src/displaysettings/displaysettings_p.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/displaysettings')

diff --git a/src/displaysettings/displaysettings.h b/src/displaysettings/displaysettings.h
index c0032d8..04cd3fd 100644
--- a/src/displaysettings/displaysettings.h
+++ b/src/displaysettings/displaysettings.h
@@ -42,7 +42,7 @@ class Q_DECL_EXPORT DisplaySettings : public QObject
     Q_PROPERTY(bool physicalScreenSizeOverride READ physicalScreenSizeOverride WRITE setPhysicalScreenSizeOverride NOTIFY physicalScreenSizeOverrideChanged)
 
 public:
-    DisplaySettings(QObject *parent = 0);
+    DisplaySettings(QObject *parent = Q_NULLPTR);
     ~DisplaySettings();
 
     int displayBrightness();
diff --git a/src/displaysettings/displaysettings_p.h b/src/displaysettings/displaysettings_p.h
index 672eb95..b1c0e4d 100644
--- a/src/displaysettings/displaysettings_p.h
+++ b/src/displaysettings/displaysettings_p.h
@@ -37,7 +37,7 @@ class PhysicalScreenSize : public QObject
     Q_OBJECT
 
 public:
-    explicit PhysicalScreenSize(QObject *parent=0);
+    explicit PhysicalScreenSize(QObject *parent = Q_NULLPTR);
     virtual ~PhysicalScreenSize();
 
     void setSize(int inches);
-- 
cgit v1.2.3