diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-18 11:07:51 +0200 |
| commit | 0ca4fcbc36527ce02b604aa88e8bd0d37d40baf4 (patch) | |
| tree | 6adf165fb783272d720416a49a51d9ad169d16de /src/plugins/platforms/cocoa/qcocoainputcontext.mm | |
| parent | 9aeaa363e533e1486e6e9d7526bbab7c2472be5e (diff) | |
| parent | 748aa6b06462804a9671997302df292ae9788d5c (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/xcb/qxcbintegration.cpp
Change-Id: I2d71d06a55f730df19ace0dd3304238584a0497f
Diffstat (limited to 'src/plugins/platforms/cocoa/qcocoainputcontext.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoainputcontext.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.mm b/src/plugins/platforms/cocoa/qcocoainputcontext.mm index 24dc8ab42a..04d6d6b806 100644 --- a/src/plugins/platforms/cocoa/qcocoainputcontext.mm +++ b/src/plugins/platforms/cocoa/qcocoainputcontext.mm @@ -137,8 +137,8 @@ void QCocoaInputContext::updateLocale() m_locale = locale; emitLocaleChanged(); } - CFRelease(langRef); } + CFRelease(source); } QT_END_NAMESPACE |