diff options
| author | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-08-22 14:11:07 +0300 |
|---|---|---|
| committer | Jarkko Koivikko <jarkko.koivikko@code-q.fi> | 2018-08-27 12:43:14 +0000 |
| commit | b9103559bb9204df989021dbc3ffdda7ccbdb80e (patch) | |
| tree | e9603a7db9b41fcbc3b934544ead531cc4bf274b | |
| parent | d16972ea958dcf47e9ccd8255d0d83861ba01aae (diff) | |
Fix record-trace-input config option
Since creation of qtvirtualkeyboard module, record-trace-input config
option has been broken.
Change-Id: I053facf414a2fcd2d417aabcb01cb81054fb0d6e
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| -rw-r--r-- | src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/t9write/plugin/t9writeinputmethod.cpp | 2 | ||||
| -rw-r--r-- | src/virtualkeyboard/unipentrace_p.h | 3 | ||||
| -rw-r--r-- | src/virtualkeyboard/virtualkeyboard.pro | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp index c6eb2157..7afe1056 100644 --- a/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp +++ b/src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp @@ -52,7 +52,7 @@ #include <QCryptographicHash> #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT -#include "unipentrace.h" +#include <QtVirtualKeyboard/private/unipentrace_p.h> #include <QStandardPaths> #endif diff --git a/src/plugins/t9write/plugin/t9writeinputmethod.cpp b/src/plugins/t9write/plugin/t9writeinputmethod.cpp index 891fe621..071826c5 100644 --- a/src/plugins/t9write/plugin/t9writeinputmethod.cpp +++ b/src/plugins/t9write/plugin/t9writeinputmethod.cpp @@ -38,7 +38,7 @@ #include <QTime> #include <QtVirtualKeyboard/private/handwritinggesturerecognizer_p.h> #ifdef QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT -#include "unipentrace.h" +#include <QtVirtualKeyboard/private/unipentrace_p.h> #include <QStandardPaths> #endif diff --git a/src/virtualkeyboard/unipentrace_p.h b/src/virtualkeyboard/unipentrace_p.h index 10c6786b..73872056 100644 --- a/src/virtualkeyboard/unipentrace_p.h +++ b/src/virtualkeyboard/unipentrace_p.h @@ -43,11 +43,12 @@ #include <QObject> #include <QtVirtualKeyboard/trace.h> +#include <QtVirtualKeyboard/qvirtualkeyboard_global.h> QT_BEGIN_NAMESPACE namespace QtVirtualKeyboard { -class UnipenTrace : public QObject +class QVIRTUALKEYBOARD_EXPORT UnipenTrace : public QObject { Q_OBJECT public: diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro index a45d25eb..c570389f 100644 --- a/src/virtualkeyboard/virtualkeyboard.pro +++ b/src/virtualkeyboard/virtualkeyboard.pro @@ -407,7 +407,7 @@ OTHER_FILES += \ record-trace-input { SOURCES += unipentrace.cpp HEADERS += unipentrace_p.h - DEFINES += QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT + MODULE_DEFINES += QT_VIRTUALKEYBOARD_RECORD_TRACE_INPUT } arrow-key-navigation: DEFINES += QT_VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION |