From b9103559bb9204df989021dbc3ffdda7ccbdb80e Mon Sep 17 00:00:00 2001
From: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Date: Wed, 22 Aug 2018 14:11:07 +0300
Subject: 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>
---
 src/plugins/lipi-toolkit/plugin/lipiinputmethod.cpp | 2 +-
 src/plugins/t9write/plugin/t9writeinputmethod.cpp   | 2 +-
 src/virtualkeyboard/unipentrace_p.h                 | 3 ++-
 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
-- 
cgit v1.2.3