diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 11:39:21 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-01-13 11:39:21 +0100 |
commit | 3aca005d4721b82446922310496271ebe206a0d7 (patch) | |
tree | f71298b19bd98c6b3751bc9009b2fdb49c2ad526 /src/gui/kernel/qwidget_qws.cpp | |
parent | 6088336d9237eaa94def8c2a83901b547e682abb (diff) | |
parent | 48e08ee5718b3de855ecea626179ad5323e38fa0 (diff) | |
download | qt4-tools-3aca005d4721b82446922310496271ebe206a0d7.tar.gz |
Merge remote branch 'mainline/4.6' into 4.6
Conflicts:
tests/auto/linguist/lupdate/testlupdate.cpp
Diffstat (limited to 'src/gui/kernel/qwidget_qws.cpp')
-rw-r--r-- | src/gui/kernel/qwidget_qws.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_qws.cpp b/src/gui/kernel/qwidget_qws.cpp index e299c6e2ee..b827e8b948 100644 --- a/src/gui/kernel/qwidget_qws.cpp +++ b/src/gui/kernel/qwidget_qws.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** @@ -287,7 +287,7 @@ void QWidget::destroy(bool destroyWindow, bool destroySubWindows) } else { // release previous focus information participating with // preedit preservation of qic -- while we still have a winId - QInputContext *qic = inputContext(); + QInputContext *qic = QApplicationPrivate::inputContext; if (qic) qic->widgetDestroyed(this); } |