36547f4eff
The main reasons for doing this are:
1. _qpa.h end up in the master QtGui include file. QtGui is meant for
userland applications. qpa code is neither binary nor source compatible.
Inadvertant use of QPA api makes the user code binary-incompatible.
2. syncqt creates forwarding headers for non-private header files. This
gives people the impression that this is public API.
As discussed on the mailing list, even though QPA api is internal and subject
to change, it needs to treated differently from private headers since they
will be used by in-qtbase and out-of-qtbase plugins.
This commit does the following:
1. The _qpa in QPA header files is dropped.
2. syncqt now treats any file with qplatform prefix as a special file and
moves it to qpa/ directory. The recommended way of using QPA API in plugins
is: #include <qpa/qplatformfoo.h>. This allows the user include QPA API
from multiple modules (for example, qplatformfoo might be in QtPrintSupport)
3. The user needs to explicitly add QT += <module>-private to get access to
the qpa api.
4. Creates compat headers for the olden style qplatformfoo_qpa.h and QPlatformFoo
includes.
This commit does not change the cpp filenames. This requires a more careful
merging of existing non qpa cpp files and existing cpp files on a case by
case basis. This can be done at anytime.
The following files are not renamed as part of this changed but will be fixed
as part of a future change:
src/gui/kernel/qgenericpluginfactory_qpa.h
src/gui/kernel/qgenericplugin_qpa.h
src/gui/kernel/qwindowsysteminterface_qpa.h
files were renamed using
for x in `find . -name "qplatform*_qpa.h"`; do git mv $x "${x/_qpa.h/.h}"; done
for x in `find . -name "qplatform*_qpa_p.h"`; do git mv $x "${x/_qpa_p.h/_p.h}"; done
includes were renamed using script
for file in `find . -name "*.h" -or -name "*.cpp" -or -name "*.mm"`; do
sed -i -e 's,.*#.*include.*<\(Qt.*/\)\?\(QPlatform.*\)>,#include <qpa/\L\2.h>,g' \
-e 's,.*#.*include.*"\(Qt.*/\)\?\(QPlatform.*\)",#include <qpa/\L\2.h>,g' \
-e 's,.*#.*include.* "\(qplatform.*\)_qpa.h",#include <qpa/\L\1.h>,g' \
-e 's,.*#.*include.*"\(qplatform.*\)_qpa_p.h",#include <qpa/\L\1_p.h>,g' \
-e 's,.*#.*include.*<\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include <qpa/\2\3>,g' \
-e 's,.*#.*include.*"\(Qt.*/\|Qt.*/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include <qpa/\2\3>,g' \
$file
done
Change-Id: I04a350314a45746e3911f54b3b21ad03315afb67
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
136 lines
4.2 KiB
C++
136 lines
4.2 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
|
|
** Contact: http://www.qt-project.org/
|
|
**
|
|
** This file is part of the test suite 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$
|
|
**
|
|
****************************************************************************/
|
|
|
|
#include <qpa/qplatforminputcontext.h>
|
|
|
|
class PlatformInputContext : public QPlatformInputContext
|
|
{
|
|
public:
|
|
PlatformInputContext() :
|
|
m_animating(false),
|
|
m_visible(false),
|
|
m_updateCallCount(0),
|
|
m_resetCallCount(0),
|
|
m_commitCallCount(0),
|
|
m_localeCallCount(0),
|
|
m_inputDirectionCallCount(0),
|
|
m_lastQueries(Qt::ImhNone),
|
|
m_action(QInputMethod::Click),
|
|
m_cursorPosition(0),
|
|
m_lastEventType(QEvent::None),
|
|
m_setFocusObjectCallCount(0)
|
|
{}
|
|
|
|
virtual QRectF keyboardRect() const { return m_keyboardRect; }
|
|
virtual bool isAnimating() const { return m_animating; }
|
|
virtual void reset() { m_resetCallCount++; }
|
|
virtual void commit() {
|
|
m_commitCallCount++;
|
|
QInputMethodEvent commitEvent;
|
|
commitEvent.setCommitString(m_commitString);
|
|
if (qGuiApp->focusObject())
|
|
qGuiApp->sendEvent(qGuiApp->focusObject(), &commitEvent);
|
|
else
|
|
qWarning("Test input context to commit without focused object");
|
|
}
|
|
void setCommitString(const QString &commitString)
|
|
{
|
|
m_commitString = commitString;
|
|
}
|
|
|
|
virtual void update(Qt::InputMethodQueries queries)
|
|
{
|
|
m_updateCallCount++;
|
|
m_lastQueries = queries;
|
|
}
|
|
virtual void invokeAction(QInputMethod::Action action, int cursorPosition)
|
|
{
|
|
m_action = action;
|
|
m_cursorPosition = cursorPosition;
|
|
}
|
|
virtual bool filterEvent(const QEvent *event)
|
|
{
|
|
m_lastEventType = event->type(); return false;
|
|
}
|
|
virtual void showInputPanel()
|
|
{
|
|
m_visible = true;
|
|
}
|
|
virtual void hideInputPanel()
|
|
{
|
|
m_visible = false;
|
|
}
|
|
virtual bool isInputPanelVisible() const
|
|
{
|
|
return m_visible;
|
|
}
|
|
virtual QLocale locale() const
|
|
{
|
|
m_localeCallCount++;
|
|
return QLocale::c();
|
|
}
|
|
virtual Qt::LayoutDirection inputDirection() const
|
|
{
|
|
m_inputDirectionCallCount++;
|
|
return Qt::LeftToRight;
|
|
}
|
|
virtual void setFocusObject(QObject *object)
|
|
{
|
|
Q_UNUSED(object);
|
|
m_setFocusObjectCallCount++;
|
|
}
|
|
|
|
bool m_animating;
|
|
bool m_visible;
|
|
int m_updateCallCount;
|
|
int m_resetCallCount;
|
|
int m_commitCallCount;
|
|
QString m_commitString;
|
|
mutable int m_localeCallCount;
|
|
mutable int m_inputDirectionCallCount;
|
|
Qt::InputMethodQueries m_lastQueries;
|
|
QInputMethod::Action m_action;
|
|
int m_cursorPosition;
|
|
int m_lastEventType;
|
|
QRectF m_keyboardRect;
|
|
int m_setFocusObjectCallCount;
|
|
};
|