aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/util/qquickglobal.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-01-14 11:28:06 +0100
committerJ-P Nurmi <jpnurmi@theqtcompany.com>2015-01-17 10:50:04 +0100
commitf09f3655e4d6076b5b35563fc485fd102a6fc903 (patch)
tree6ee9b104afce498cd09dfc65e7aeb3fd7cd1b8a9 /src/quick/util/qquickglobal.cpp
parentb974fac576b620436af64ad8b617f2276b756a05 (diff)
Fix Qt.inputMethod ownership
Change-Id: Ic51f9daf17742a421a810d95b2a510caf657e08f Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/quick/util/qquickglobal.cpp')
-rw-r--r--src/quick/util/qquickglobal.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/quick/util/qquickglobal.cpp b/src/quick/util/qquickglobal.cpp
index c75c87f8ef..146b6d73e2 100644
--- a/src/quick/util/qquickglobal.cpp
+++ b/src/quick/util/qquickglobal.cpp
@@ -926,7 +926,9 @@ public:
#ifndef QT_NO_IM
QInputMethod *inputMethod()
{
- return qGuiApp->inputMethod();
+ QInputMethod *im = qGuiApp->inputMethod();
+ QQmlEngine::setObjectOwnership(im, QQmlEngine::CppOwnership);
+ return im;
}
#endif