diff options
| author | David Boddie <dboddie@trolltech.com> | 2010-06-21 17:02:54 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2010-06-21 17:02:54 (GMT) |
| commit | 84ce7cc25b925d493a048ce5b00290483cd974f4 (patch) | |
| tree | 0f4e709ca90e9bf3e683668460734282f426089d /src/gui/kernel/qapplication.cpp | |
| parent | a2a5a8c5e203fe9d55f9addba1533a30c6f2ba19 (diff) | |
| parent | 32e532743dc6243612ade017e8c326ca0e7e0dec (diff) | |
| download | Qt-84ce7cc25b925d493a048ce5b00290483cd974f4.zip Qt-84ce7cc25b925d493a048ce5b00290483cd974f4.tar.gz Qt-84ce7cc25b925d493a048ce5b00290483cd974f4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/kernel/qapplication.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index 52767b8..1680ef4 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -5313,6 +5313,7 @@ void QApplication::setInputContext(QInputContext *inputContext) } delete QApplicationPrivate::inputContext; QApplicationPrivate::inputContext = inputContext; + QApplicationPrivate::inputContext->setParent(this); } /*! |