Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I29c1fb602538bc847ec76573baf098bfe24630b8

30 files changed, 109 insertions, 450 deletions

diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/alphanumeric/alphanumeric.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/alphanumeric/alphanumeric.pro
index 09221822..df79dcb4 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/alphanumeric/alphanumeric.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/alphanumeric/alphanumeric.pro
@@ -2,5 +2,4 @@ TEMPLATE = aux
 
 cfg.files = config
 cfg.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/projects/alphanumeric
-
 INSTALLS += cfg
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/demonumerals/demonumerals.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/demonumerals/demonumerals.pro
index 3e7abb68..7063f7f2 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/demonumerals/demonumerals.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/demonumerals/demonumerals.pro
@@ -2,5 +2,4 @@ TEMPLATE = aux
 
 cfg.files = config
 cfg.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/projects/demonumerals
-
 INSTALLS += cfg
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/lipiengine.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/lipiengine.pro
index 02be6d5a..d9902250 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/lipiengine.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/projects/lipiengine.pro
@@ -2,5 +2,4 @@ TEMPLATE = aux
 
 cfg.files += lipiengine.cfg
 cfg.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/projects
-
 INSTALLS += cfg
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/common/common.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/common/common.pro
index b1564d0c..fcb567bb 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/common/common.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/common/common.pro
@@ -1,23 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += staticlib
-
-build_pass {
-    CONFIG(debug, debug|release): SUBPATH = debug
-    else: SUBPATH = release
-} else {
-    debug_and_release: CONFIG += build_all
-}
-
-DESTDIR = ../lib/$$SUBPATH
-
 TARGET = ltkcommon
+include(../lipilib.pri)
 
 INCLUDEPATH += \
-    ../include \
     ../util/lib
 
 SOURCES += \
@@ -28,3 +12,5 @@ SOURCES += \
     LTKTrace.cpp \
     LTKTraceFormat.cpp \
     LTKTraceGroup.cpp
+
+include(../include/headers.pri)
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/include/headers.pri b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/include/headers.pri
new file mode 100644
index 00000000..b84d5e53
--- /dev/null
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/include/headers.pri
@@ -0,0 +1,33 @@
+HEADERS += \
+    $$PWD/LTKCaptureDevice.h \
+    $$PWD/LTKChannel.h \
+    $$PWD/LTKClassifierDefaults.h \
+    $$PWD/LTKErrorsList.h \
+    $$PWD/LTKException.h \
+    $$PWD/LTKInc.h \
+    $$PWD/LTKLipiEngineInterface.h \
+    $$PWD/LTKLogger.h \
+    $$PWD/LTKLoggerInterface.h \
+    $$PWD/LTKMacros.h \
+    $$PWD/LTKOSUtil.h \
+    $$PWD/LTKOSUtilFactory.h \
+    $$PWD/LTKPreprocDefaults.h \
+    $$PWD/LTKPreprocessor.h \
+    $$PWD/LTKPreprocessorInterface.h \
+    $$PWD/LTKRecognitionContext.h \
+    $$PWD/LTKRefCountedPtr.h \
+    $$PWD/LTKScreenContext.h \
+    $$PWD/LTKShapeFeatureMacros.h \
+    $$PWD/LTKShapeRecoConfig.h \
+    $$PWD/LTKShapeRecoEngine.h \
+    $$PWD/LTKShapeRecoResult.h \
+    $$PWD/LTKShapeRecoUtil.h \
+    $$PWD/LTKShapeRecognizer.h \
+    $$PWD/LTKTrace.h \
+    $$PWD/LTKTraceFormat.h \
+    $$PWD/LTKTraceGroup.h \
+    $$PWD/LTKTypes.h \
+    $$PWD/LTKWordRecoConfig.h \
+    $$PWD/LTKWordRecoResult.h \
+    $$PWD/LTKWordRecognizer.h \
+    $$PWD/TpcError.h
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/include/include.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/include/include.pro
deleted file mode 100644
index 1ebf08a8..00000000
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/include/include.pro
+++ /dev/null
@@ -1,35 +0,0 @@
-TEMPLATE = aux
-
-HEADERS += \
-    LTKCaptureDevice.h \
-    LTKChannel.h \
-    LTKClassifierDefaults.h \
-    LTKErrorsList.h \
-    LTKException.h \
-    LTKInc.h \
-    LTKLipiEngineInterface.h \
-    LTKLogger.h \
-    LTKLoggerInterface.h \
-    LTKMacros.h \
-    LTKOSUtil.h \
-    LTKOSUtilFactory.h \
-    LTKPreprocDefaults.h \
-    LTKPreprocessor.h \
-    LTKPreprocessorInterface.h \
-    LTKRecognitionContext.h \
-    LTKRefCountedPtr.h \
-    LTKScreenContext.h \
-    LTKShapeFeatureMacros.h \
-    LTKShapeRecoConfig.h \
-    LTKShapeRecoEngine.h \
-    LTKShapeRecoResult.h \
-    LTKShapeRecoUtil.h \
-    LTKShapeRecognizer.h \
-    LTKTrace.h \
-    LTKTraceFormat.h \
-    LTKTraceGroup.h \
-    LTKTypes.h \
-    LTKWordRecoConfig.h \
-    LTKWordRecoResult.h \
-    LTKWordRecognizer.h \
-    TpcError.h \
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri
new file mode 100644
index 00000000..df20b654
--- /dev/null
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipicommon.pri
@@ -0,0 +1,18 @@
+TEMPLATE = lib
+
+CONFIG -= qt
+CONFIG += exceptions
+CONFIG += warn_off
+
+INCLUDEPATH += $$PWD/include
+
+load(qt_build_paths)
+
+!isEmpty(LIPILIBS) {
+    LIBS += -L$$MODULE_BASE_OUTDIR/lib
+    for (lib, LIPILIBS) {
+        LIBS += -l$$lib$$qtPlatformTargetSuffix()
+    }
+}
+
+TARGET = $$TARGET$$qtPlatformTargetSuffix()
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiengine/lipiengine.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiengine/lipiengine.pro
index a794a0ca..bfcc0bcd 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiengine/lipiengine.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiengine/lipiengine.pro
@@ -1,31 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../lib/$$SUBPATH
-
-TARGET = lipiengine$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+LIPILIBS = shaperecommon ltkcommon ltkutil wordreccommon
+include(../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../include \
     ../util/lib
 
 HEADERS += \
@@ -36,8 +12,6 @@ SOURCES += \
     lipiengine.cpp \
     LipiEngineModule.cpp
 
-LIBS += -L$$OUT_PWD/../lib/$$SUBPATH -lshaperecommon -lltkcommon -lltkutil -lwordreccommon
-
 win32 {
     DEFINES += LIPIENGINE_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipilib.pri b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipilib.pri
new file mode 100644
index 00000000..c28eb85d
--- /dev/null
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipilib.pri
@@ -0,0 +1,5 @@
+include(lipicommon.pri)
+
+CONFIG += static
+
+DESTDIR = $$MODULE_BASE_OUTDIR/lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiplugin.pri b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiplugin.pri
new file mode 100644
index 00000000..a94f0331
--- /dev/null
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/lipiplugin.pri
@@ -0,0 +1,10 @@
+include(lipicommon.pri)
+
+CONFIG -= static
+CONFIG += plugin
+
+DESTDIR = $$MODULE_BASE_OUTDIR/plugins/lipi_toolkit
+
+### This is a bad install location for arch-specific binaries.
+target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
+INSTALLS += target
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro
index 9fb4fde7..72efcc7f 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro
@@ -4,4 +4,4 @@ SUBDIRS += \
     shaperec \
     wordrec
 
-wordrec.depends = sub-shaperec
+wordrec.depends = shaperec
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/activedtw/activedtw.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/activedtw/activedtw.pro
index 89138d3b..255c5512 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/activedtw/activedtw.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/activedtw/activedtw.pro
@@ -1,31 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../../lib/$$SUBPATH
-
-TARGET = activedtw$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+LIPILIBS = shaperecommon ltkcommon ltkutil featureextractorcommon
+include(../../../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../../../include \
     ../../../util/lib \
     ../featureextractor/common \
     ../common \
@@ -44,8 +20,6 @@ SOURCES += \
     ActiveDTWShapeModel.cpp \
     ActiveDTWAdapt.cpp \
 
-LIBS += -L$$OUT_PWD/../../../lib/$$SUBPATH -lshaperecommon -lltkcommon -lltkutil -lfeatureextractorcommon
-
 win32 {
     DEFINES += ACTIVEDTW_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/common/common.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/common/common.pro
index 7976ce2c..a8b0756b 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/common/common.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/common/common.pro
@@ -1,23 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += staticlib
-
-build_pass {
-    CONFIG(debug, debug|release): SUBPATH = debug
-    else: SUBPATH = release
-} else {
-    debug_and_release: CONFIG += build_all
-}
-
-DESTDIR = ../../../lib/$$SUBPATH
-
 TARGET = shaperecommon
+include(../../../lipilib.pri)
 
 INCLUDEPATH += \
-    ../../../include \
     ../../../util/lib \
     ../featureextractor/common \
 
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/common/common.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/common/common.pro
index 356c5b90..ae6ce1d2 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/common/common.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/common/common.pro
@@ -1,23 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += staticlib
-
-build_pass {
-    CONFIG(debug, debug|release): SUBPATH = debug
-    else: SUBPATH = release
-} else {
-    debug_and_release: CONFIG += build_all
-}
-
-DESTDIR = ../../../../lib/$$SUBPATH
-
 TARGET = featureextractorcommon
+include(../../../../lipilib.pri)
 
 INCLUDEPATH += \
-    ../../../../include \
     ../../../../util/lib \
 
 SOURCES += \
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/featureextractor.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/featureextractor.pro
index 134b67a7..538b9f29 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/featureextractor.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/featureextractor.pro
@@ -7,7 +7,7 @@ SUBDIRS += \
     pointfloat \
     substroke
 
-l7.depends = sub-common
-npen.depends = sub-common
-pointfloat.depends = sub-common
-substroke.depends = sub-common
+l7.depends = common
+npen.depends = common
+pointfloat.depends = common
+substroke.depends = common
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/l7/l7.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/l7/l7.pro
index f33de1e0..2372c2cf 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/l7/l7.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/l7/l7.pro
@@ -1,31 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../../../lib/$$SUBPATH
-
-TARGET = l7$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+LIPILIBS = ltkcommon ltkutil featureextractorcommon
+include(../../../../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../../../../include \
     ../../../../util/lib \
     ../common \
 
@@ -39,8 +15,6 @@ SOURCES += \
     L7ShapeFeature.cpp \
     L7ShapeFeatureExtractor.cpp \
 
-LIBS += -L$$OUT_PWD/../../../../lib/$$SUBPATH -lltkcommon -lltkutil -lfeatureextractorcommon
-
 win32 {
     DEFINES += L7_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/npen/npen.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/npen/npen.pro
index fb455919..dacec369 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/npen/npen.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/npen/npen.pro
@@ -1,31 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../../../lib/$$SUBPATH
-
-TARGET = npen$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+LIPILIBS = ltkcommon ltkutil featureextractorcommon
+include(../../../../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../../../../include \
     ../../../../util/lib \
     ../common \
 
@@ -39,8 +15,6 @@ SOURCES += \
     NPenShapeFeature.cpp \
     NPenShapeFeatureExtractor.cpp \
 
-LIBS += -L$$OUT_PWD/../../../../lib/$$SUBPATH -lltkcommon -lltkutil -lfeatureextractorcommon
-
 win32 {
     DEFINES += NPEN_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/pointfloat/pointfloat.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/pointfloat/pointfloat.pro
index 55c9b4cd..39eff0ee 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/pointfloat/pointfloat.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/pointfloat/pointfloat.pro
@@ -1,31 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../../../lib/$$SUBPATH
-
-TARGET = pointfloat$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+LIPILIBS = ltkcommon ltkutil featureextractorcommon
+include(../../../../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../../../../include \
     ../../../../util/lib \
     ../common \
 
@@ -39,8 +15,6 @@ SOURCES += \
     PointFloatShapeFeature.cpp \
     PointFloatShapeFeatureExtractor.cpp \
 
-LIBS += -L$$OUT_PWD/../../../../lib/$$SUBPATH -lltkcommon -lltkutil -lfeatureextractorcommon
-
 win32 {
     DEFINES += POINTFLOAT_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/substroke/substroke.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/substroke/substroke.pro
index 7e73b1f2..804d1f42 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/substroke/substroke.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/substroke/substroke.pro
@@ -1,31 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../../../lib/$$SUBPATH
-
-TARGET = substroke$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+LIPILIBS = ltkcommon ltkutil featureextractorcommon
+include(../../../../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../../../../include \
     ../../../../util/lib \
     ../common \
 
@@ -39,8 +15,6 @@ SOURCES += \
     SubStrokeShapeFeature.cpp \
     SubStrokeShapeFeatureExtractor.cpp \
 
-LIBS += -L$$OUT_PWD/../../../../lib/$$SUBPATH -lltkcommon -lltkutil -lfeatureextractorcommon
-
 win32 {
     DEFINES += SUBSTROKE_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/neuralnet/neuralnet.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/neuralnet/neuralnet.pro
index 13ee7e03..8359a4f3 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/neuralnet/neuralnet.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/neuralnet/neuralnet.pro
@@ -1,31 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../../lib/$$SUBPATH
-
-TARGET = neuralnet$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+LIPILIBS = shaperecommon ltkcommon ltkutil featureextractorcommon
+include(../../../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../../../include \
     ../../../util/lib \
     ../featureextractor/common \
     ../common \
@@ -38,8 +14,6 @@ SOURCES += \
     NeuralNet.cpp \
     NeuralNetShapeRecognizer.cpp \
 
-LIBS += -L$$OUT_PWD/../../../lib/$$SUBPATH -lshaperecommon -lltkcommon -lltkutil -lfeatureextractorcommon
-
 win32 {
     DEFINES += NEURALNET_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/nn/nn.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/nn/nn.pro
index 5849880e..0b7046db 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/nn/nn.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/nn/nn.pro
@@ -1,31 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../../lib/$$SUBPATH
-
-TARGET = nn$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+LIPILIBS = shaperecommon ltkcommon ltkutil featureextractorcommon
+include(../../../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../../../include \
     ../../../util/lib \
     ../featureextractor/common \
     ../common \
@@ -40,8 +16,6 @@ SOURCES += \
     NNAdapt.cpp \
     NNShapeRecognizer.cpp \
 
-LIBS += -L$$OUT_PWD/../../../lib/$$SUBPATH -lshaperecommon -lltkcommon -lltkutil -lfeatureextractorcommon
-
 win32 {
     DEFINES += NN_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/preprocessing/preprocessing.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/preprocessing/preprocessing.pro
index 42d024b4..e8a11983 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/preprocessing/preprocessing.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/preprocessing/preprocessing.pro
@@ -1,31 +1,8 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../../lib/$$SUBPATH
-
-TARGET = preproc$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+TARGET = preproc
+LIPILIBS = shaperecommon ltkcommon ltkutil
+include(../../../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../../../include \
     ../../../util/lib \
     ../common \
 
@@ -36,8 +13,6 @@ SOURCES += \
     LTKPreprocessor.cpp \
     preprocessing.cpp \
 
-LIBS += -L$$OUT_PWD/../../../lib/$$SUBPATH -lshaperecommon -lltkcommon -lltkutil
-
 win32 {
     DEFINES += PREPROCESSING_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/shaperec.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/shaperec.pro
index 46331a24..8b5d5e3b 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/shaperec.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/shaperec.pro
@@ -8,7 +8,7 @@ SUBDIRS += \
     nn \
     preprocessing
 
-activedtw.depends = sub-common sub-featureextractor
-neuralnet.depends = sub-common sub-featureextractor
-nn.depends = sub-common sub-featureextractor
-preprocessing.depends = sub-common
+activedtw.depends = common featureextractor
+neuralnet.depends = common featureextractor
+nn.depends = common featureextractor
+preprocessing.depends = common
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/boxfld/boxfld.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/boxfld/boxfld.pro
index 35835b35..6da87dd6 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/boxfld/boxfld.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/boxfld/boxfld.pro
@@ -1,31 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../../lib/$$SUBPATH
-
-TARGET = boxfld$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
+LIPILIBS = shaperecommon ltkcommon ltkutil qtwordreccommon
+include(../../../lipiplugin.pri)
 
 INCLUDEPATH += \
-    ../../../include \
     ../../../util/lib \
     ../common \
 
@@ -37,8 +13,6 @@ SOURCES += \
     BoxFieldRecognizer.cpp \
     boxfld.cpp \
 
-LIBS += -L$$OUT_PWD/../../../lib/$$SUBPATH -lshaperecommon -lltkcommon -lltkutil -lwordreccommon
-
 win32 {
     DEFINES += BOXFLD_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/common/common.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/common/common.pro
index 02f95310..bac16ef9 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/common/common.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/common/common.pro
@@ -1,23 +1,7 @@
-TEMPLATE = lib
-
-CONFIG -= qt
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += staticlib
-
-build_pass {
-    CONFIG(debug, debug|release): SUBPATH = debug
-    else: SUBPATH = release
-} else {
-    debug_and_release: CONFIG += build_all
-}
-
-DESTDIR = ../../../lib/$$SUBPATH
-
 TARGET = wordreccommon
+include(../../../lipilib.pri)
 
 INCLUDEPATH += \
-    ../../../include \
     ../../../util/lib \
 
 SOURCES += \
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro
index b1a2cd5e..cf49e45d 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro
@@ -4,4 +4,4 @@ SUBDIRS += \
     common \
     boxfld
 
-boxfld.depends = sub-common
+boxfld.depends = common
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro
index 92c5c52e..528c7c1b 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro
@@ -3,10 +3,7 @@ TEMPLATE = subdirs
 SUBDIRS += \
     common \
     util \
-    include \
     reco \
     lipiengine
 
-lipiengine.depends = sub-common sub-util sub-reco
-
-CONFIG += ordered
+lipiengine.depends = common util reco
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/lib/lib.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/lib/lib.pro
index ca21b1f6..362973c4 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/lib/lib.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/lib/lib.pro
@@ -1,23 +1,5 @@
-TEMPLATE = lib
-
-CONFIG -= qt
-CONFIG += exceptions
-CONFIG += warn_off
-CONFIG += staticlib
-
-build_pass {
-    CONFIG(debug, debug|release): SUBPATH = debug
-    else: SUBPATH = release
-} else {
-    debug_and_release: CONFIG += build_all
-}
-
-DESTDIR = ../../lib/$$SUBPATH
-
 TARGET = ltkutil
-
-INCLUDEPATH += \
-    ../../include \
+include(../../lipilib.pri)
 
 win32: DEFINES -= UNICODE
 
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/logger/logger.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/logger/logger.pro
index a4630aaa..6afbbd99 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/logger/logger.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/logger/logger.pro
@@ -1,31 +1,6 @@
-TEMPLATE = lib
-
-CONFIG -= qt static
-CONFIG += warn_off
-CONFIG += plugin
-
-build_pass {
-    CONFIG(debug, debug|release) {
-        SUBPATH = debug
-        win32: TARGET_SUFFIX = d
-    } else {
-        SUBPATH = release
-    }
-} else {
-    debug_and_release: CONFIG += build_all
-    else:win32:CONFIG(debug, debug|release): TARGET_SUFFIX = d
-}
-
-DESTDIR = ../../lib/$$SUBPATH
-
-TARGET = logger$$TARGET_SUFFIX
-
-target.path = $$[QT_INSTALL_DATA]/qtvirtualkeyboard/lipi_toolkit/lib
-INSTALLS += target
-
-INCLUDEPATH += \
-    ../../include \
-    ../lib \
+LIPILIBS = ltkutil
+include(../../lipiplugin.pri)
+CONFIG -= exceptions
 
 HEADERS += \
     logger.h \
@@ -34,8 +9,6 @@ SOURCES += \
     logger.cpp \
     LTKLogger.cpp \
 
-LIBS += -L$$OUT_PWD/../../lib/$$SUBPATH -lltkutil
-
 win32 {
     DEFINES += LOGGER_EXPORTS
     LIBS += Advapi32.lib
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro
index 02a64c14..79cfc027 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro
@@ -4,4 +4,4 @@ SUBDIRS += \
     lib \
     logger
 
-logger.depends = sub-lib
+logger.depends = lib