diff options
author | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-11-04 14:07:29 +0100 |
---|---|---|
committer | Maurice Kalinowski <maurice.kalinowski@theqtcompany.com> | 2015-11-04 13:17:00 +0000 |
commit | 39639694c897def9161360277eb39bc871ac53f9 (patch) | |
tree | a6a0f788572a4c18f920ac752385b664b1fb40a2 /src/plugins/platforms/winrt | |
parent | 439a7136432113fa3ff6aa6ea8119ab67d251484 (diff) |
winrt: move input context creation into xaml thread
This way we ensure that creation always works and we can access the
input pane statics.
Task-number: QTBUG-49034
Change-Id: I5d0340a7f6304b717f17f2106134fa9d083a7fde
Reviewed-by: Samuel Nevala <samuel.nevala@intopalo.com>
Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
Diffstat (limited to 'src/plugins/platforms/winrt')
-rw-r--r-- | src/plugins/platforms/winrt/qwinrtintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/winrt/qwinrtintegration.cpp b/src/plugins/platforms/winrt/qwinrtintegration.cpp index dabb2603b6..23bb6c16ec 100644 --- a/src/plugins/platforms/winrt/qwinrtintegration.cpp +++ b/src/plugins/platforms/winrt/qwinrtintegration.cpp @@ -134,10 +134,10 @@ QWinRTIntegration::QWinRTIntegration() : d_ptr(new QWinRTIntegrationPrivate) QEventDispatcherWinRT::runOnXamlThread([d]() { d->mainScreen = new QWinRTScreen; + d->inputContext.reset(new QWinRTInputContext(d->mainScreen)); return S_OK; }); - d->inputContext.reset(new QWinRTInputContext(d->mainScreen)); screenAdded(d->mainScreen); d->platformServices = new QWinRTServices; } |