diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index b8a86ad2a7b..f766b5fbaff 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -45,8 +45,6 @@ HEADERS += \ kernel/qevent_p.h \ kernel/qinputmethod.h \ kernel/qinputmethod_p.h \ - kernel/qinputpanel.h \ - kernel/qinputpanel_p.h \ kernel/qkeysequence.h \ kernel/qkeysequence_p.h \ kernel/qkeymapper_p.h \ diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 5f4cbce73b2..bc77205e412 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -68,7 +68,7 @@ #include #include #include -#include +#include #include #include #include @@ -2372,7 +2372,7 @@ bool QGuiApplication::desktopSettingsAware() the virtual keyboard. It also provides information about the position of the current focused input element. - \sa QInputPanel + \sa QInputMethod */ QInputMethod *QGuiApplication::inputMethod() { @@ -2381,19 +2381,6 @@ QInputMethod *QGuiApplication::inputMethod() return qGuiApp->d_func()->inputMethod; } -/*! - \fn QInputPanel *QGuiApplication::inputPanel() const - returns the input panel. - - The input panel returns properties about the state and position of - the virtual keyboard. It also provides information about the position of the - current focused input element. - - \obsolete - - \sa inputMethod() - */ - /*! \fn void QGuiApplication::fontDatabaseChanged() diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index e171f81418e..9d90cde993b 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include #include @@ -131,9 +131,6 @@ public: static void setDesktopSettingsAware(bool on); static bool desktopSettingsAware(); -#if QT_DEPRECATED_SINCE(5, 0) - QT_DEPRECATED QInputPanel *inputPanel() const { return inputMethod(); } -#endif static QInputMethod *inputMethod(); static QPlatformNativeInterface *platformNativeInterface(); diff --git a/src/gui/kernel/qinputpanel.h b/src/gui/kernel/qinputpanel.h deleted file mode 100644 index 95be71d7b50..00000000000 --- a/src/gui/kernel/qinputpanel.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QINPUTPANEL_H -#define QINPUTPANEL_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -#if 0 -#pragma qt_class(QInputPanel) -#endif -#define QInputPanel QInputMethod - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif diff --git a/src/gui/kernel/qinputpanel_p.h b/src/gui/kernel/qinputpanel_p.h deleted file mode 100644 index a4f24505c6f..00000000000 --- a/src/gui/kernel/qinputpanel_p.h +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QINPUTPANEL_P_H -#define QINPUTPANEL_P_H - -#include - -QT_BEGIN_HEADER - -QT_BEGIN_NAMESPACE - -#if 0 -#pragma qt_class(QInputPanelPrivate) -#endif -#define QInputPanelPrivate QInputMethodPrivate - -QT_END_NAMESPACE - -QT_END_HEADER - -#endif diff --git a/src/gui/kernel/qplatforminputcontext.h b/src/gui/kernel/qplatforminputcontext.h index f6ff9f930cf..d93bc475f05 100644 --- a/src/gui/kernel/qplatforminputcontext.h +++ b/src/gui/kernel/qplatforminputcontext.h @@ -51,7 +51,7 @@ // source and binary incompatible with future versions of Qt. // -#include +#include QT_BEGIN_HEADER diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 3b45acfa1a4..ad6bde7b700 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -9010,13 +9010,13 @@ void tst_QWidget::focusProxyAndInputMethods() // and that the input method gets the focus proxy passed // as the focus widget instead of the child widget. // otherwise input method queries go to the wrong widget - QCOMPARE(qApp->inputPanel()->inputItem(), toplevel.data()); + QCOMPARE(qApp->inputMethod()->inputItem(), toplevel.data()); toplevel->setAttribute(Qt::WA_InputMethodEnabled, false); - QVERIFY(!qApp->inputPanel()->inputItem()); + QVERIFY(!qApp->inputMethod()->inputItem()); toplevel->setAttribute(Qt::WA_InputMethodEnabled, true); - QCOMPARE(qApp->inputPanel()->inputItem(), toplevel.data()); + QCOMPARE(qApp->inputMethod()->inputItem(), toplevel.data()); } #ifdef QT_BUILD_INTERNAL