Merge remote-tracking branch 'origin/api_changes'

Conflicts:
	src/corelib/global/qglobal.cpp
	src/corelib/global/qlogging.cpp
	src/gui/kernel/qguiapplication.h
	src/gui/kernel/qwindow.cpp
	src/gui/kernel/qwindow.h
	tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp

Change-Id: I62a8805577a7940d4d36bed985eb3e7019d22f2e

1 files changed, 13 insertions, 5 deletions

diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp
index e7c2b60305..8fd4d4a2b3 100644
--- a/src/gui/kernel/qguiapplication.cpp
+++ b/src/gui/kernel/qguiapplication.cpp
@@ -2154,12 +2154,20 @@ bool QGuiApplication::desktopSettingsAware()
     return QGuiApplicationPrivate::obey_desktop_settings;
 }
 
-QInputMethod *QGuiApplication::inputMethod() const
+/*!
+  returns the input method.
+
+  The input method returns properties about the state and position of
+  the virtual keyboard. It also provides information about the position of the
+  current focused input element.
+
+  \sa QInputPanel
+  */
+QInputMethod *QGuiApplication::inputMethod()
 {
-    Q_D(const QGuiApplication);
-    if (!d->inputMethod)
-        const_cast<QGuiApplicationPrivate *>(d)->inputMethod = new QInputMethod();
-    return d->inputMethod;
+    if (!qGuiApp->d_func()->inputMethod)
+        qGuiApp->d_func()->inputMethod = new QInputMethod();
+    return qGuiApp->d_func()->inputMethod;
 }
 
 /*!