diff --git a/src/src.pro b/src/src.pro
index 23c27d220a82982214ff8b64c787e02013a6812e..542db7f3e9e79690caf0e8c04bf0daee591db5d8 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -4,32 +4,32 @@ include(config.pri)
 
 !disable-hunspell:exists(virtualkeyboard/3rdparty/hunspell/src/hunspell/hunspell.h) {
     SUBDIRS += virtualkeyboard/3rdparty/hunspell
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-hunspell
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/hunspell
 }
 
 openwnn {
     SUBDIRS += virtualkeyboard/3rdparty/openwnn
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-openwnn
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/openwnn
 }
 
 pinyin {
     SUBDIRS += virtualkeyboard/3rdparty/pinyin
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-pinyin
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/pinyin
 }
 
 tcime {
     SUBDIRS += virtualkeyboard/3rdparty/tcime
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-tcime
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/tcime
 }
 
 lipi-toolkit {
     SUBDIRS += virtualkeyboard/3rdparty/lipi-toolkit
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-lipi-toolkit
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/lipi-toolkit
 }
 
 t9write {
     SUBDIRS += virtualkeyboard/3rdparty/t9write
-    virtualkeyboard.depends += sub-virtualkeyboard-3rdparty-t9write
+    virtualkeyboard.depends += virtualkeyboard/3rdparty/t9write
 }
 
 SUBDIRS += \
diff --git a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/reco.pro
index 9fb4fde770ea0958e5671d01b222a377c66bc4aa..72efcc7f23048d7e9d7d90f1e293049a2820f0ed 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/featureextractor/featureextractor.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/featureextractor/featureextractor.pro
index 134b67a72f483b20094a31419666fc3e6b42ed24..538b9f29b8f8905bb69dce7bde8478212ee2b130 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/shaperec.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/shaperec/shaperec.pro
index 46331a2408862d436bc93c99d95dbfe67a2750da..8b5d5e3b4d420b783c73ee5879dd8fa233fdd1a4 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/wordrec.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/reco/wordrec/wordrec.pro
index b1a2cd5eec3db1178e15137a97ecbf604b244bfe..cf49e45d9ab048b346863d5a42b1e572765022bd 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 92c5c52e6b464fa81283cf146687261786b39bbe..bc3b94ce890719b77eda17784c52fc6b6c527ee8 100644
--- a/src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro
+++ b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/src.pro
@@ -7,6 +7,4 @@ SUBDIRS += \
     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/util.pro b/src/virtualkeyboard/3rdparty/lipi-toolkit/src/util/util.pro
index 02a64c14b02bd2c12351910f030df31503a8f1e4..79cfc02761e8c73217b14d04a636b2f32137252a 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