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

Change-Id: Ia24cc8b86def0d9d9c17d6775cc519e491b860b1

5 files changed, 11 insertions, 11 deletions

diff --git a/src/corelib/time/qdatetime.cpp b/src/corelib/time/qdatetime.cpp
index c833c18809..979b8c9aeb 100644
--- a/src/corelib/time/qdatetime.cpp
+++ b/src/corelib/time/qdatetime.cpp
@@ -1769,7 +1769,7 @@ QDate QDate::fromString(const QString &string, const QString &format, QCalendar
     QDateTimeParser dt(QVariant::Date, QDateTimeParser::FromString, cal);
     // dt.setDefaultLocale(QLocale::c()); ### Qt 6
     if (dt.parseFormat(format))
-        dt.fromString(string, &date, 0);
+        dt.fromString(string, &date, nullptr);
 #else
     Q_UNUSED(string);
     Q_UNUSED(format);
@@ -2499,7 +2499,7 @@ QTime QTime::fromString(const QString &string, const QString &format)
     QDateTimeParser dt(QVariant::Time, QDateTimeParser::FromString, QCalendar());
     // dt.setDefaultLocale(QLocale::c()); ### Qt 6
     if (dt.parseFormat(format))
-        dt.fromString(string, 0, &time);
+        dt.fromString(string, nullptr, &time);
 #else
     Q_UNUSED(string);
     Q_UNUSED(format);
diff --git a/src/corelib/time/qdatetimeparser.cpp b/src/corelib/time/qdatetimeparser.cpp
index 2501bbaab7..a487534528 100644
--- a/src/corelib/time/qdatetimeparser.cpp
+++ b/src/corelib/time/qdatetimeparser.cpp
@@ -1152,7 +1152,7 @@ QDateTimeParser::scanString(const QDateTime &defaultValue,
         }
         pos += separator.size();
         sectionNodes[index].pos = pos;
-        int *current = 0;
+        int *current = nullptr;
         const SectionNode sn = sectionNodes.at(index);
         ParsedSection sect;
 
diff --git a/src/corelib/time/qtimezone.cpp b/src/corelib/time/qtimezone.cpp
index 410a16e3c5..3d2078087b 100644
--- a/src/corelib/time/qtimezone.cpp
+++ b/src/corelib/time/qtimezone.cpp
@@ -318,7 +318,7 @@ Q_GLOBAL_STATIC(QTimeZoneSingleton, global_tz);
 */
 
 QTimeZone::QTimeZone() noexcept
-    : d(0)
+    : d(nullptr)
 {
 }
 
diff --git a/src/corelib/time/qtimezoneprivate_icu.cpp b/src/corelib/time/qtimezoneprivate_icu.cpp
index 5570ce7571..8a92bbb387 100644
--- a/src/corelib/time/qtimezoneprivate_icu.cpp
+++ b/src/corelib/time/qtimezoneprivate_icu.cpp
@@ -273,7 +273,7 @@ static int ucalDaylightOffset(const QByteArray &id)
 
 // Create the system default time zone
 QIcuTimeZonePrivate::QIcuTimeZonePrivate()
-    : m_ucal(0)
+    : m_ucal(nullptr)
 {
     // TODO No ICU C API to obtain sysem tz, assume default hasn't been changed
     init(ucalDefaultTimeZoneId());
@@ -281,7 +281,7 @@ QIcuTimeZonePrivate::QIcuTimeZonePrivate()
 
 // Create a named time zone
 QIcuTimeZonePrivate::QIcuTimeZonePrivate(const QByteArray &ianaId)
-    : m_ucal(0)
+    : m_ucal(nullptr)
 {
     // Need to check validity here as ICu will create a GMT tz if name is invalid
     if (availableTimeZoneIds().contains(ianaId))
@@ -289,14 +289,14 @@ QIcuTimeZonePrivate::QIcuTimeZonePrivate(const QByteArray &ianaId)
 }
 
 QIcuTimeZonePrivate::QIcuTimeZonePrivate(const QIcuTimeZonePrivate &other)
-    : QTimeZonePrivate(other), m_ucal(0)
+    : QTimeZonePrivate(other), m_ucal(nullptr)
 {
     // Clone the ucal so we don't close the shared object
     UErrorCode status = U_ZERO_ERROR;
     m_ucal = ucal_clone(other.m_ucal, &status);
     if (!U_SUCCESS(status)) {
         m_id.clear();
-        m_ucal = 0;
+        m_ucal = nullptr;
     }
 }
 
@@ -322,7 +322,7 @@ void QIcuTimeZonePrivate::init(const QByteArray &ianaId)
 
     if (!U_SUCCESS(status)) {
         m_id.clear();
-        m_ucal = 0;
+        m_ucal = nullptr;
     }
 }
 
@@ -493,7 +493,7 @@ QList<QByteArray> QIcuTimeZonePrivate::availableTimeZoneIds(int offsetFromUtc) c
 // TODO Available directly in C++ api but not C api, from 4.8 onwards new filter method works
 #if U_ICU_VERSION_MAJOR_NUM >= 49 || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM == 8)
     UErrorCode status = U_ZERO_ERROR;
-    UEnumeration *uenum = ucal_openTimeZoneIDEnumeration(UCAL_ZONE_TYPE_ANY, 0,
+    UEnumeration *uenum = ucal_openTimeZoneIDEnumeration(UCAL_ZONE_TYPE_ANY, nullptr,
                                                          &offsetFromUtc, &status);
     QList<QByteArray> result;
     if (U_SUCCESS(status))
diff --git a/src/corelib/time/qtimezoneprivate_tz.cpp b/src/corelib/time/qtimezoneprivate_tz.cpp
index 3c2695a789..5e55c6897d 100644
--- a/src/corelib/time/qtimezoneprivate_tz.cpp
+++ b/src/corelib/time/qtimezoneprivate_tz.cpp
@@ -512,7 +512,7 @@ PosixZone PosixZone::parse(const char *&pos, const char *end)
     if (zoneEnd < end && (zoneEnd[0] == '+' || zoneEnd[0] == '-'))
         ++zoneEnd;
     while (zoneEnd < end) {
-        if (strchr(offsetChars, char(*zoneEnd)) == NULL)
+        if (strchr(offsetChars, char(*zoneEnd)) == nullptr)
             break;
         ++zoneEnd;
     }