168492376
/
qskinny
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

for some reason accessing QMethodInputPrivate makes the sanitizer complaining

This commit is contained in:
Uwe Rathmann 2018-04-06 09:00:41 +02:00
parent 469e110f82
commit 84649f74f1
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/controls/QskControl.cpp
View File

@ -18,12 +18,15 @@
QSK_QT_PRIVATE_BEGIN QSK_QT_PRIVATE_BEGIN
#include <private/qquickitem_p.h> #include <private/qquickitem_p.h>
#include <private/qinputmethod_p.h> #include <private/qguiapplication_p.h>
#if defined( QT_DEBUG ) #if defined( QT_DEBUG )
#include <private/qquickpositioners_p.h> #include <private/qquickpositioners_p.h>
#endif #endif
QSK_QT_PRIVATE_END QSK_QT_PRIVATE_END
#include <qpa/qplatformintegration.h>
#include <qpa/qplatforminputcontext.h>
#include <limits> #include <limits>
#include <unordered_set> #include <unordered_set>
#include <unordered_map> #include <unordered_map>
@ -153,8 +156,13 @@ void qskUpdateInputMethod( const QQuickItem* item, Qt::InputMethodQueries querie
if ( !doUpdate ) if ( !doUpdate )
{ {
/*
We could also get the inputContext from QInputMethodPrivate
but for some reason the gcc sanitizer reports errors
when using it. So let's go with QGuiApplicationPrivate.
*/
const auto inputContext = const auto inputContext =
QInputMethodPrivate::get( inputMethod )->platformInputContext(); QGuiApplicationPrivate::platformIntegration()->inputContext();
if ( inputContext && inputContext->isInputPanelVisible() ) if ( inputContext && inputContext->isInputPanelVisible() )
{ {