diff options
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qinputpanel.cpp | 16 | ||||
-rw-r--r-- | src/gui/kernel/qinputpanel_p.h | 4 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.cpp | 6 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.h | 3 |
4 files changed, 4 insertions, 25 deletions
diff --git a/src/gui/kernel/qinputpanel.cpp b/src/gui/kernel/qinputpanel.cpp index 510e2d1038..d6d58bf1c5 100644 --- a/src/gui/kernel/qinputpanel.cpp +++ b/src/gui/kernel/qinputpanel.cpp @@ -180,12 +180,8 @@ void QInputPanel::show() { Q_D(QInputPanel); QPlatformInputContext *ic = d->platformInputContext(); - if (ic && ic->handlesInputPanelVisibility()) + if (ic) ic->showInputPanel(); - else if (!d->visible) { - d->visible = true; - emit visibleChanged(); - } } /*! @@ -199,12 +195,8 @@ void QInputPanel::hide() { Q_D(QInputPanel); QPlatformInputContext *ic = d->platformInputContext(); - if (ic && ic->handlesInputPanelVisibility()) + if (ic) ic->hideInputPanel(); - else if (d->visible) { - d->visible = false; - emit visibleChanged(); - } } /*! @@ -220,10 +212,8 @@ bool QInputPanel::visible() const { Q_D(const QInputPanel); QPlatformInputContext *ic = d->platformInputContext(); - if (ic && ic->handlesInputPanelVisibility()) + if (ic) return ic->isInputPanelVisible(); - else - return d->visible; return false; } diff --git a/src/gui/kernel/qinputpanel_p.h b/src/gui/kernel/qinputpanel_p.h index cf999cdd5f..6fcf2d7243 100644 --- a/src/gui/kernel/qinputpanel_p.h +++ b/src/gui/kernel/qinputpanel_p.h @@ -56,8 +56,7 @@ QT_BEGIN_NAMESPACE class QInputPanelPrivate : public QObjectPrivate { public: - inline QInputPanelPrivate() - : visible(false), testContext(0) + inline QInputPanelPrivate() : testContext(0) {} QPlatformInputContext *platformInputContext() const { @@ -70,7 +69,6 @@ public: QTransform inputItemTransform; QWeakPointer<QObject> inputItem; - bool visible; QPlatformInputContext *testContext; }; diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp index 21f1219742..bc0bcf8f4f 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.cpp +++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp @@ -207,10 +207,4 @@ void QPlatformInputContext::emitInputPanelVisibleChanged() emit qApp->inputPanel()->visibleChanged(); } -// temporary function added to retain compatibility to old functionality, will be deprecated -bool QPlatformInputContext::handlesInputPanelVisibility() const -{ - return false; -} - QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h index ab5b6726be..76aa122720 100644 --- a/src/gui/kernel/qplatforminputcontext_qpa.h +++ b/src/gui/kernel/qplatforminputcontext_qpa.h @@ -77,9 +77,6 @@ public: virtual void hideInputPanel(); virtual bool isInputPanelVisible() const; void emitInputPanelVisibleChanged(); - - // temporary function added to retain compatibility to old functionality, will be deprecated - virtual bool handlesInputPanelVisibility() const; }; QT_END_NAMESPACE |