diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2014-12-31 11:36:23 +0200 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2015-01-12 16:23:12 +0200 |
| commit | 519cb821911681c837a02eb2fb2eddf7a43d967f (patch) | |
| tree | f4d9ad45365bc845f263d042672bb886eb3346c1 /examples | |
| parent | 4a77ad1ebe17681765e9c03b01485ff970ad20c5 (diff) | |
Add support for Windows Desktop
Renamed XcbInputPanel component to DesktopInputPanel. The new panel
component provides unified support for both Xcb and Windows desktops.
In ideal case there would be no need for platform specific code, but
unfortunately that is not the case. For example in Xcb, using the
QWindow::setMask combined with Qt::BypassWindowManagerHint does not
work correctly. More complex regions (than a single rectangle) are
not masked correctly. For this reason, the Xcb integration still uses
the Xcb specific code to mask the transparent areas of the input panel.
Changes to PlatformInputContext event filtering are needed because
QPlatformInputContext::filterEvent() method is not functional in
Windows. In this case the QObject::eventFilter() is used instead.
Without these changes the arrow key navigation feature will not work.
The desktop integration can now be disabled with disable-desktop flag
instead of disable-xcb flag. While the disable-xcb still works, it
is deprecated and will be removed in future releases.
Please note that this change adds the Windows Desktop support for the
core keyboard only. The complete Windows support including the 3rdparty
libraries is added in other changes.
Change-Id: Ib65118f715c86746fc7d12ea6d9a2e7ef6e15b09
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro index e9fae411..733ca265 100644 --- a/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro +++ b/examples/quick/enterprise/virtualkeyboard/virtualkeyboard/virtualkeyboard.pro @@ -22,7 +22,12 @@ OTHER_FILES += \ content/TextBase.qml \ content/TextField.qml \ -disable-xcb|android-no-sdk|!isEmpty(CROSS_COMPILE) { +disable-xcb { + message(The disable-xcb option has been deprecated. Please use disable-desktop instead.) + CONFIG += disable-desktop +} + +disable-desktop|android-no-sdk|!isEmpty(CROSS_COMPILE) { DEFINES += MAIN_QML=\\\"VirtualKeyboard-b2qt.qml\\\" } else { DEFINES += MAIN_QML=\\\"VirtualKeyboard.qml\\\" |