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 /src/virtualkeyboard/doc | |
| 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 'src/virtualkeyboard/doc')
| -rw-r--r-- | src/virtualkeyboard/doc/src/build.qdoc | 7 | ||||
| -rw-r--r-- | src/virtualkeyboard/doc/src/deployment-guide.qdoc | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/virtualkeyboard/doc/src/build.qdoc b/src/virtualkeyboard/doc/src/build.qdoc index 16a1588a..47f00844 100644 --- a/src/virtualkeyboard/doc/src/build.qdoc +++ b/src/virtualkeyboard/doc/src/build.qdoc @@ -50,7 +50,8 @@ in C++. \section1 Build Instructions -The Qt Virtual Keyboard can be built for Linux Desktop/X11 or Boot2Qt targets. +The Qt Virtual Keyboard can be built for Linux Desktop/X11, Windows Desktop +or Boot2Qt targets. The target is automatically detected by QMAKE and requires no special configuration parameters. @@ -62,8 +63,12 @@ build targets. \table \row + \li \e CONFIG += disable-desktop + \li Disables Desktop integration +\row \li \e CONFIG += disable-xcb \li Disables X11 integration + \note Deprecated since 1.3. Use \e disable-desktop instead. \row \li \e CONFIG += disable-hunspell \li Disables Hunspell integration diff --git a/src/virtualkeyboard/doc/src/deployment-guide.qdoc b/src/virtualkeyboard/doc/src/deployment-guide.qdoc index ab42bb67..50f9a64b 100644 --- a/src/virtualkeyboard/doc/src/deployment-guide.qdoc +++ b/src/virtualkeyboard/doc/src/deployment-guide.qdoc @@ -73,7 +73,7 @@ for using the plugin: The integration method is automatically selected by the project files. However, in desktop environments, it is possible to override the desktop integration method and use the application integration method instead. -This happens by adding the \c CONFIG+=disable-xcb option to the \c qmake +This happens by adding the \c CONFIG+=disable-desktop to the \c qmake command line. \note The desktop integration method is not currently available in Boot2Qt |