Use module include path instead of local include path

Include all the virtual keyboard header files using module
include path.

Change-Id: I93eada70edeb66313b05df6cecf6a9412d7bc0c4
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

30 files changed, 68 insertions, 68 deletions

diff --git a/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h b/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h
index 177ff8ab..767be004 100644
--- a/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h
+++ b/src/plugins/lipi-toolkit/plugin/lipiinputmethod_p.h
@@ -45,7 +45,7 @@
 #include <QtHunspellInputMethod/private/hunspellinputmethod_p.h>
 #define LipiInputMethodBase HunspellInputMethod
 #else
-#include "abstractinputmethod.h"
+#include <QtVirtualKeyboard/abstractinputmethod.h>
 #define LipiInputMethodBase AbstractInputMethod
 #endif
 
diff --git a/src/plugins/openwnn/plugin/openwnninputmethod_p.h b/src/plugins/openwnn/plugin/openwnninputmethod_p.h
index dd439c13..fa8cd4f4 100644
--- a/src/plugins/openwnn/plugin/openwnninputmethod_p.h
+++ b/src/plugins/openwnn/plugin/openwnninputmethod_p.h
@@ -41,7 +41,7 @@
 // We mean it.
 //
 
-#include "abstractinputmethod.h"
+#include <QtVirtualKeyboard/abstractinputmethod.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/plugins/pinyin/plugin/pinyininputmethod_p.h b/src/plugins/pinyin/plugin/pinyininputmethod_p.h
index 668eac3b..7c613069 100644
--- a/src/plugins/pinyin/plugin/pinyininputmethod_p.h
+++ b/src/plugins/pinyin/plugin/pinyininputmethod_p.h
@@ -41,7 +41,7 @@
 // We mean it.
 //
 
-#include "abstractinputmethod.h"
+#include <QtVirtualKeyboard/abstractinputmethod.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/plugins/t9write/plugin/t9writeinputmethod_p.h b/src/plugins/t9write/plugin/t9writeinputmethod_p.h
index c129aa2e..26f48a93 100644
--- a/src/plugins/t9write/plugin/t9writeinputmethod_p.h
+++ b/src/plugins/t9write/plugin/t9writeinputmethod_p.h
@@ -41,7 +41,7 @@
 // We mean it.
 //
 
-#include "abstractinputmethod.h"
+#include <QtVirtualKeyboard/abstractinputmethod.h>
 #include <QSharedPointer>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/tcime/plugin/tcinputmethod_p.h b/src/plugins/tcime/plugin/tcinputmethod_p.h
index 4c29d5d3..d7275fdc 100644
--- a/src/plugins/tcime/plugin/tcinputmethod_p.h
+++ b/src/plugins/tcime/plugin/tcinputmethod_p.h
@@ -41,7 +41,7 @@
 // We mean it.
 //
 
-#include "abstractinputmethod.h"
+#include <QtVirtualKeyboard/abstractinputmethod.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/virtualkeyboard/abstractinputmethod.cpp b/src/virtualkeyboard/abstractinputmethod.cpp
index fc18936d..78305f13 100644
--- a/src/virtualkeyboard/abstractinputmethod.cpp
+++ b/src/virtualkeyboard/abstractinputmethod.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "abstractinputmethod.h"
+#include <QtVirtualKeyboard/abstractinputmethod.h>
 #include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/virtualkeyboard/abstractinputpanel.cpp b/src/virtualkeyboard/abstractinputpanel.cpp
index b4854e26..7fbbeb55 100644
--- a/src/virtualkeyboard/abstractinputpanel.cpp
+++ b/src/virtualkeyboard/abstractinputpanel.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "abstractinputpanel_p.h"
+#include <QtVirtualKeyboard/private/abstractinputpanel_p.h>
 #include <QtCore/QRect>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/virtualkeyboard/appinputpanel.cpp b/src/virtualkeyboard/appinputpanel.cpp
index 226cc4a6..95987fb2 100644
--- a/src/virtualkeyboard/appinputpanel.cpp
+++ b/src/virtualkeyboard/appinputpanel.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "appinputpanel_p.h"
-#include "appinputpanel_p_p.h"
+#include <QtVirtualKeyboard/private/appinputpanel_p.h>
+#include <QtVirtualKeyboard/private/appinputpanel_p_p.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/virtualkeyboard/desktopinputpanel.cpp b/src/virtualkeyboard/desktopinputpanel.cpp
index 1a0c4128..e299b59d 100644
--- a/src/virtualkeyboard/desktopinputpanel.cpp
+++ b/src/virtualkeyboard/desktopinputpanel.cpp
@@ -27,15 +27,15 @@
 **
 ****************************************************************************/
 
-#include "desktopinputpanel_p.h"
-#include "appinputpanel_p_p.h"
-#include "inputview_p.h"
-#include "platforminputcontext_p.h"
-#include "inputcontext.h"
+#include <QtVirtualKeyboard/private/desktopinputpanel_p.h>
+#include <QtVirtualKeyboard/private/appinputpanel_p_p.h>
+#include <QtVirtualKeyboard/private/inputview_p.h>
+#include <QtVirtualKeyboard/private/platforminputcontext_p.h>
+#include <QtVirtualKeyboard/inputcontext.h>
 #include <QGuiApplication>
 #include <QQmlEngine>
 #include <QScreen>
-#include "virtualkeyboarddebug_p.h"
+#include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h>
 #if defined(QT_VIRTUALKEYBOARD_HAVE_XCB)
 #include <xcb/xcb.h>
 #include <xcb/xfixes.h>
diff --git a/src/virtualkeyboard/desktopinputselectioncontrol.cpp b/src/virtualkeyboard/desktopinputselectioncontrol.cpp
index 9612d724..f17b62b6 100644
--- a/src/virtualkeyboard/desktopinputselectioncontrol.cpp
+++ b/src/virtualkeyboard/desktopinputselectioncontrol.cpp
@@ -27,11 +27,11 @@
 **
 ****************************************************************************/
 
-#include "desktopinputselectioncontrol_p.h"
-#include "inputcontext.h"
-#include "inputselectionhandle_p.h"
-#include "settings_p.h"
-#include "platforminputcontext_p.h"
+#include <QtVirtualKeyboard/private/desktopinputselectioncontrol_p.h>
+#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/private/inputselectionhandle_p.h>
+#include <QtVirtualKeyboard/private/settings_p.h>
+#include <QtVirtualKeyboard/private/platforminputcontext_p.h>
 
 #include <QtCore/qpropertyanimation.h>
 #include <QtGui/qguiapplication.h>
diff --git a/src/virtualkeyboard/enterkeyaction.cpp b/src/virtualkeyboard/enterkeyaction.cpp
index debe56ee..6d9361b1 100644
--- a/src/virtualkeyboard/enterkeyaction.cpp
+++ b/src/virtualkeyboard/enterkeyaction.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "enterkeyaction_p.h"
-#include "enterkeyactionattachedtype_p.h"
+#include <QtVirtualKeyboard/private/enterkeyaction_p.h>
+#include <QtVirtualKeyboard/private/enterkeyactionattachedtype_p.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/virtualkeyboard/enterkeyactionattachedtype.cpp b/src/virtualkeyboard/enterkeyactionattachedtype.cpp
index 0df21719..ca0ee934 100644
--- a/src/virtualkeyboard/enterkeyactionattachedtype.cpp
+++ b/src/virtualkeyboard/enterkeyactionattachedtype.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "enterkeyactionattachedtype_p.h"
+#include <QtVirtualKeyboard/private/enterkeyactionattachedtype_p.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/virtualkeyboard/enterkeyactionattachedtype_p.h b/src/virtualkeyboard/enterkeyactionattachedtype_p.h
index eca4782f..a7a7f4f8 100644
--- a/src/virtualkeyboard/enterkeyactionattachedtype_p.h
+++ b/src/virtualkeyboard/enterkeyactionattachedtype_p.h
@@ -42,7 +42,7 @@
 //
 
 #include <QObject>
-#include "enterkeyaction_p.h"
+#include <QtVirtualKeyboard/private/enterkeyaction_p.h>
 #include <QtVirtualKeyboard/qvirtualkeyboard_global.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/virtualkeyboard/fallbackinputmethod.cpp b/src/virtualkeyboard/fallbackinputmethod.cpp
index b75a9817..8dc976af 100644
--- a/src/virtualkeyboard/fallbackinputmethod.cpp
+++ b/src/virtualkeyboard/fallbackinputmethod.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "fallbackinputmethod_p.h"
-#include "inputcontext.h"
+#include <QtVirtualKeyboard/private/fallbackinputmethod_p.h>
+#include <QtVirtualKeyboard/inputcontext.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/virtualkeyboard/gesturerecognizer.cpp b/src/virtualkeyboard/gesturerecognizer.cpp
index 4745b46f..c50102fe 100644
--- a/src/virtualkeyboard/gesturerecognizer.cpp
+++ b/src/virtualkeyboard/gesturerecognizer.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "gesturerecognizer_p.h"
+#include <QtVirtualKeyboard/private/gesturerecognizer_p.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/virtualkeyboard/handwritinggesturerecognizer.cpp b/src/virtualkeyboard/handwritinggesturerecognizer.cpp
index bfe41b79..f420410a 100644
--- a/src/virtualkeyboard/handwritinggesturerecognizer.cpp
+++ b/src/virtualkeyboard/handwritinggesturerecognizer.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "handwritinggesturerecognizer_p.h"
+#include <QtVirtualKeyboard/private/handwritinggesturerecognizer_p.h>
 
 #include <QtCore/qmath.h>
 #include <QVector2D>
diff --git a/src/virtualkeyboard/inputcontext.cpp b/src/virtualkeyboard/inputcontext.cpp
index bc4dc7d7..dd937966 100644
--- a/src/virtualkeyboard/inputcontext.cpp
+++ b/src/virtualkeyboard/inputcontext.cpp
@@ -27,14 +27,14 @@
 **
 ****************************************************************************/
 
-#include "inputcontext.h"
-#include "inputengine.h"
-#include "shifthandler_p.h"
-#include "platforminputcontext_p.h"
-#include "shadowinputcontext_p.h"
-#include "virtualkeyboarddebug_p.h"
-#include "enterkeyaction_p.h"
-#include "settings_p.h"
+#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/inputengine.h>
+#include <QtVirtualKeyboard/private/shifthandler_p.h>
+#include <QtVirtualKeyboard/private/platforminputcontext_p.h>
+#include <QtVirtualKeyboard/private/shadowinputcontext_p.h>
+#include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h>
+#include <QtVirtualKeyboard/private/enterkeyaction_p.h>
+#include <QtVirtualKeyboard/private/settings_p.h>
 
 #include <QTextFormat>
 #include <QGuiApplication>
diff --git a/src/virtualkeyboard/inputengine.cpp b/src/virtualkeyboard/inputengine.cpp
index 7763fc9b..5994362e 100644
--- a/src/virtualkeyboard/inputengine.cpp
+++ b/src/virtualkeyboard/inputengine.cpp
@@ -27,11 +27,11 @@
 **
 ****************************************************************************/
 
-#include "inputengine.h"
-#include "inputcontext.h"
-#include "fallbackinputmethod_p.h"
-#include "trace.h"
-#include "virtualkeyboarddebug_p.h"
+#include <QtVirtualKeyboard/inputengine.h>
+#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/private/fallbackinputmethod_p.h>
+#include <QtVirtualKeyboard/trace.h>
+#include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h>
 
 #include <QTimerEvent>
 #include <QtCore/private/qobject_p.h>
diff --git a/src/virtualkeyboard/inputmethod.cpp b/src/virtualkeyboard/inputmethod.cpp
index 2e6e3bbc..af99972d 100644
--- a/src/virtualkeyboard/inputmethod.cpp
+++ b/src/virtualkeyboard/inputmethod.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "inputmethod_p.h"
+#include <QtVirtualKeyboard/private/inputmethod_p.h>
 #include <QtVirtualKeyboard/trace.h>
 #include <QVariant>
 
diff --git a/src/virtualkeyboard/inputselectionhandle.cpp b/src/virtualkeyboard/inputselectionhandle.cpp
index 6a1cbffc..3f4817a2 100644
--- a/src/virtualkeyboard/inputselectionhandle.cpp
+++ b/src/virtualkeyboard/inputselectionhandle.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "inputselectionhandle_p.h"
-#include "desktopinputselectioncontrol_p.h"
+#include <QtVirtualKeyboard/private/inputselectionhandle_p.h>
+#include <QtVirtualKeyboard/private/desktopinputselectioncontrol_p.h>
 
 #include <QtCore/qcoreapplication.h>
 #include <QtGui/QPainter>
diff --git a/src/virtualkeyboard/inputview.cpp b/src/virtualkeyboard/inputview.cpp
index c04339a7..304a3419 100644
--- a/src/virtualkeyboard/inputview.cpp
+++ b/src/virtualkeyboard/inputview.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "inputview_p.h"
+#include <QtVirtualKeyboard/private/inputview_p.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/virtualkeyboard/plaininputmethod.cpp b/src/virtualkeyboard/plaininputmethod.cpp
index b69f0bf3..7c63ca1d 100644
--- a/src/virtualkeyboard/plaininputmethod.cpp
+++ b/src/virtualkeyboard/plaininputmethod.cpp
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
-#include "plaininputmethod_p.h"
+#include <QtVirtualKeyboard/private/plaininputmethod_p.h>
 #include <QtVirtualKeyboard/inputengine.h>
-#include "inputcontext.h"
+#include <QtVirtualKeyboard/inputcontext.h>
 
 QT_BEGIN_NAMESPACE
 namespace QtVirtualKeyboard {
diff --git a/src/virtualkeyboard/platforminputcontext.cpp b/src/virtualkeyboard/platforminputcontext.cpp
index c7a8fc82..e4a1a736 100644
--- a/src/virtualkeyboard/platforminputcontext.cpp
+++ b/src/virtualkeyboard/platforminputcontext.cpp
@@ -27,15 +27,15 @@
 **
 ****************************************************************************/
 
-#include "platforminputcontext_p.h"
-#include "inputcontext.h"
-#include "shadowinputcontext_p.h"
-#include "abstractinputpanel_p.h"
+#include <QtVirtualKeyboard/private/platforminputcontext_p.h>
+#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/private/shadowinputcontext_p.h>
+#include <QtVirtualKeyboard/private/abstractinputpanel_p.h>
 #ifdef QT_VIRTUALKEYBOARD_DESKTOP
-#include "desktopinputpanel_p.h"
+#include <QtVirtualKeyboard/private/desktopinputpanel_p.h>
 #endif
-#include "appinputpanel_p.h"
-#include "virtualkeyboarddebug_p.h"
+#include <QtVirtualKeyboard/private/appinputpanel_p.h>
+#include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h>
 
 #include <QWindow>
 #include <QGuiApplication>
diff --git a/src/virtualkeyboard/selectionlistmodel.cpp b/src/virtualkeyboard/selectionlistmodel.cpp
index 4718669f..1f8f9db9 100644
--- a/src/virtualkeyboard/selectionlistmodel.cpp
+++ b/src/virtualkeyboard/selectionlistmodel.cpp
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
-#include "selectionlistmodel.h"
-#include "abstractinputmethod.h"
-#include "settings_p.h"
+#include <QtVirtualKeyboard/selectionlistmodel.h>
+#include <QtVirtualKeyboard/abstractinputmethod.h>
+#include <QtVirtualKeyboard/private/settings_p.h>
 #include <QtCore/private/qabstractitemmodel_p.h>
 #include <QtCore/qpointer.h>
 
diff --git a/src/virtualkeyboard/settings.cpp b/src/virtualkeyboard/settings.cpp
index f7008c09..1d324687 100644
--- a/src/virtualkeyboard/settings.cpp
+++ b/src/virtualkeyboard/settings.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "settings_p.h"
+#include <QtVirtualKeyboard/private/settings_p.h>
 #include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/virtualkeyboard/shadowinputcontext.cpp b/src/virtualkeyboard/shadowinputcontext.cpp
index e3cff2d7..3cc04316 100644
--- a/src/virtualkeyboard/shadowinputcontext.cpp
+++ b/src/virtualkeyboard/shadowinputcontext.cpp
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
-#include "shadowinputcontext_p.h"
-#include "inputcontext.h"
-#include "virtualkeyboarddebug_p.h"
+#include <QtVirtualKeyboard/private/shadowinputcontext_p.h>
+#include <QtVirtualKeyboard/inputcontext.h>
+#include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h>
 
 #include <QtCore/private/qobject_p.h>
 #include <QGuiApplication>
diff --git a/src/virtualkeyboard/shifthandler.cpp b/src/virtualkeyboard/shifthandler.cpp
index f27a9727..e5cc101d 100644
--- a/src/virtualkeyboard/shifthandler.cpp
+++ b/src/virtualkeyboard/shifthandler.cpp
@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#include "shifthandler_p.h"
-#include "inputcontext.h"
+#include <QtVirtualKeyboard/private/shifthandler_p.h>
+#include <QtVirtualKeyboard/inputcontext.h>
 #include <QtVirtualKeyboard/inputengine.h>
 #include <QtCore/private/qobject_p.h>
 #include <QSet>
diff --git a/src/virtualkeyboard/trace.cpp b/src/virtualkeyboard/trace.cpp
index 057ab838..59d47b99 100644
--- a/src/virtualkeyboard/trace.cpp
+++ b/src/virtualkeyboard/trace.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "trace.h"
+#include <QtVirtualKeyboard/trace.h>
 #include <QtCore/private/qobject_p.h>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/virtualkeyboard/unipentrace.cpp b/src/virtualkeyboard/unipentrace.cpp
index c931a50f..3d153801 100644
--- a/src/virtualkeyboard/unipentrace.cpp
+++ b/src/virtualkeyboard/unipentrace.cpp
@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "unipentrace_p.h"
+#include <QtVirtualKeyboard/private/unipentrace_p.h>
 #include <QRectF>
 #include <QDir>
 #include <QFile>
diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp
index d32e6e8b..b5c1a339 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings.cpp
+++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp
@@ -27,9 +27,9 @@
 **
 ****************************************************************************/
 
-#include "virtualkeyboardsettings_p.h"
-#include "settings_p.h"
-#include "virtualkeyboarddebug_p.h"
+#include <QtVirtualKeyboard/private/virtualkeyboardsettings_p.h>
+#include <QtVirtualKeyboard/private/settings_p.h>
+#include <QtVirtualKeyboard/private/virtualkeyboarddebug_p.h>
 #include <QQmlEngine>
 #include <QFileInfo>
 #include <QDir>