diff options
Diffstat (limited to 'src/widgets/kernel/qwidget_p.h')
-rw-r--r-- | src/widgets/kernel/qwidget_p.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 43c3eaeff0..0da0c65aaa 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -1,8 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: http://www.qt-project.org/ ** ** This file is part of the QtGui module of the Qt Toolkit. ** @@ -35,6 +34,7 @@ ** ** ** +** ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -59,7 +59,7 @@ #include "QtCore/qlocale.h" #include "QtCore/qset.h" #include "QtGui/qregion.h" -#include "QtGui/qinputpanel.h" +#include "QtGui/qinputmethod.h" #include "QtWidgets/qsizepolicy.h" #include "QtWidgets/qstyle.h" #include "QtWidgets/qapplication.h" @@ -416,7 +416,7 @@ public: void syncBackingStore(); void syncBackingStore(const QRegion ®ion); - // tells the input panel about the widgets transform + // tells the input method about the widgets transform void updateWidgetTransform(); void reparentFocusWidgets(QWidget *oldtlw); @@ -573,7 +573,7 @@ public: QStyle::RequestSoftwareInputPanel behavior = QStyle::RequestSoftwareInputPanel( q->style()->styleHint(QStyle::SH_RequestSoftwareInputPanel)); if (!clickCausedFocus || behavior == QStyle::RSIP_OnMouseClick) { - qApp->inputPanel()->show(); + qApp->inputMethod()->show(); } } } |