From 4840ec7c68476c95d2d762ed5591f5e0b71ae3e3 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Mon, 9 Apr 2018 12:06:57 -0700 Subject: [PATCH] QNSView: Remove useless QWindow pointer check MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that's the only place we were doing any check. We can remove it since it's not supposed to happen, and it would have crashed already if it had. Change-Id: Ic2034d2d278899f30a7d07284057e63a12e8eb10 Reviewed-by: Tor Arne Vestbø --- src/plugins/platforms/cocoa/qnsview_complextext.mm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/plugins/platforms/cocoa/qnsview_complextext.mm b/src/plugins/platforms/cocoa/qnsview_complextext.mm index f0d544c63d..d357082d33 100644 --- a/src/plugins/platforms/cocoa/qnsview_complextext.mm +++ b/src/plugins/platforms/cocoa/qnsview_complextext.mm @@ -257,6 +257,7 @@ { Q_UNUSED(aRange) Q_UNUSED(actualRange) + QObject *fo = m_platformWindow->window()->focusObject(); if (!fo) return NSZeroRect; @@ -267,9 +268,6 @@ if (!queryEvent.value(Qt::ImEnabled).toBool()) return NSZeroRect; - if (!m_platformWindow->window()) - return NSZeroRect; - // The returned rect is always based on the internal cursor. QRect mr = qApp->inputMethod()->cursorRectangle().toRect(); mr.moveBottomLeft(m_platformWindow->window()->mapToGlobal(mr.bottomLeft()));