From 9eb3015a62de9f1924c3e155e6583f0a26cc8be6 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Thu, 11 Jun 2015 17:52:54 +0200
Subject: Don't resolve the d-pointer when we don't use it.

Change-Id: Ia8551e28dcd237a536038ed7f658a3d1164706c6
Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
---
 src/quick/items/qquickitem.cpp      | 2 +-
 src/quick/items/qquicktextinput.cpp | 3 +--
 src/quick/items/qquickwindow.cpp    | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/quick/items/qquickitem.cpp b/src/quick/items/qquickitem.cpp
index e6ab69e093..94b89d0fc4 100644
--- a/src/quick/items/qquickitem.cpp
+++ b/src/quick/items/qquickitem.cpp
@@ -1304,8 +1304,8 @@ void QQuickKeysAttached::setPriority(Priority order)
 
 void QQuickKeysAttached::componentComplete()
 {
-    Q_D(QQuickKeysAttached);
 #ifndef QT_NO_IM
+    Q_D(QQuickKeysAttached);
     if (d->item) {
         for (int ii = 0; ii < d->targets.count(); ++ii) {
             QQuickItem *targetItem = d->targets.at(ii);
diff --git a/src/quick/items/qquicktextinput.cpp b/src/quick/items/qquicktextinput.cpp
index cb5df32976..2849594d34 100644
--- a/src/quick/items/qquicktextinput.cpp
+++ b/src/quick/items/qquicktextinput.cpp
@@ -1697,11 +1697,10 @@ void QQuickTextInput::invalidateFontCaches()
 
 void QQuickTextInput::ensureActiveFocus()
 {
-    Q_D(QQuickTextInput);
-
     bool hadActiveFocus = hasActiveFocus();
     forceActiveFocus();
 #ifndef QT_NO_IM
+    Q_D(QQuickTextInput);
     // re-open input panel on press if already focused
     if (hasActiveFocus() && hadActiveFocus && !d->m_readOnly)
         qGuiApp->inputMethod()->show();
diff --git a/src/quick/items/qquickwindow.cpp b/src/quick/items/qquickwindow.cpp
index 90f46d4957..6b6b86c1e2 100644
--- a/src/quick/items/qquickwindow.cpp
+++ b/src/quick/items/qquickwindow.cpp
@@ -83,8 +83,8 @@ bool QQuickWindowPrivate::defaultAlphaBuffer = false;
 
 void QQuickWindowPrivate::updateFocusItemTransform()
 {
-    Q_Q(QQuickWindow);
 #ifndef QT_NO_IM
+    Q_Q(QQuickWindow);
     QQuickItem *focus = q->activeFocusItem();
     if (focus && QGuiApplication::focusObject() == focus) {
         QQuickItemPrivate *focusPrivate = QQuickItemPrivate::get(focus);
-- 
cgit v1.2.3