From 100881d8868d4cfe81330d06bdb891e70161f1cc Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Wed, 24 Feb 2021 13:10:33 +0100
Subject: [PATCH] Assert that either both or neither pointer are nullptr

Identical change to qmetatype.cpp

Fixes static analyzer warning 0267bc9b3ba521cf8bf0a7fea8981ee5

Change-Id: Id6219f5025d703dd43b1742a067aa934d6aacd8c
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 3be3848338040f4178ed5a450d98eed883b79cb3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/gui/kernel/qguivariant.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/gui/kernel/qguivariant.cpp b/src/gui/kernel/qguivariant.cpp
index c8200aedf16..1b455a57bfd 100644
--- a/src/gui/kernel/qguivariant.cpp
+++ b/src/gui/kernel/qguivariant.cpp
@@ -117,6 +117,8 @@ static const struct : QMetaTypeModuleHelper
         Q_ASSERT(fromTypeId != toTypeId);
 
         bool onlyCheck = (from == nullptr && to == nullptr);
+        // either two nullptrs from canConvert, or two valid pointers
+        Q_ASSERT(onlyCheck || (bool(from) && bool(to)));
 
         using Int = int;
         switch (makePair(toTypeId, fromTypeId)) {