use helper libs via QMAKE_USE

Change-Id: Ibde3fa65b4c3d967fe9ada1b5e484366f1e9d083
Reviewed-by: Jake Petroules <jake.petroules@qt.io>

5 files changed, 13 insertions, 20 deletions

diff --git a/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro b/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro
index a5056e82..5421bc4e 100644
--- a/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro
+++ b/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro
@@ -1,6 +1,5 @@
 TARGET = qthunspell
 
-DEFINES += HUNSPELL_STATIC
 CONFIG += static
 CONFIG += precompile_header warn_off
 CONFIG(debug, debug|release) {
@@ -10,9 +9,8 @@ CONFIG(debug, debug|release) {
 config_file = "/* Version number of package */" "$${LITERAL_HASH}define VERSION \"$$VERSION\""
 write_file($$PWD/config.h, config_file)
 
-INCLUDEPATH += \
-    ./ \
-    src/hunspell
+MODULE_DEFINES += HUNSPELL_STATIC
+MODULE_INCLUDEPATH = $$PWD/src/hunspell
 
 SOURCES += \
     src/hunspell/affentry.cxx \
diff --git a/src/virtualkeyboard/3rdparty/openwnn/openwnn.pro b/src/virtualkeyboard/3rdparty/openwnn/openwnn.pro
index 6ca93d36..a61e4860 100644
--- a/src/virtualkeyboard/3rdparty/openwnn/openwnn.pro
+++ b/src/virtualkeyboard/3rdparty/openwnn/openwnn.pro
@@ -4,9 +4,8 @@ VERSION = 1.3.6
 CONFIG += static
 CONFIG += warn_off
 
-INCLUDEPATH += \
-    wnnDictionary/include \
-    wnnEngine/include
+MODULE_INCLUDEPATH = $$PWD/wnnEngine/include
+INCLUDEPATH += wnnDictionary/include
 
 SOURCES += \
     wnnDictionary/engine/ndapi.c \
diff --git a/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro b/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro
index 8aab0eef..ffa17bfd 100644
--- a/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro
+++ b/src/virtualkeyboard/3rdparty/pinyin/pinyin.pro
@@ -4,8 +4,7 @@ VERSION = 1.0.0
 CONFIG += static
 CONFIG += warn_off
 
-INCLUDEPATH += \
-    include
+MODULE_INCLUDEPATH = $$PWD/include
 
 SOURCES += \
     share/dictbuilder.cpp \
diff --git a/src/virtualkeyboard/3rdparty/tcime/tcime.pro b/src/virtualkeyboard/3rdparty/tcime/tcime.pro
index 86755635..d593beef 100644
--- a/src/virtualkeyboard/3rdparty/tcime/tcime.pro
+++ b/src/virtualkeyboard/3rdparty/tcime/tcime.pro
@@ -22,6 +22,8 @@ OTHER_FILES += \
     data/dict_cangjie.dat \
     data/dict_phrases.dat
 
+MODULE_INCLUDEPATH = $$PWD
+
 load(qt_helper_lib)
 
 CONFIG += qt
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index 45c1cad8..d2ca2b67 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -221,9 +221,8 @@ qtquickcompiler: DEFINES += COMPILING_QML
     exists(3rdparty/hunspell/src/hunspell/hunspell.h) {
         SOURCES += hunspellinputmethod.cpp hunspellinputmethod_p.cpp hunspellworker.cpp
         HEADERS += hunspellinputmethod.h hunspellinputmethod_p.h hunspellworker.h
-        DEFINES += HAVE_HUNSPELL HUNSPELL_STATIC
-        INCLUDEPATH += 3rdparty/hunspell/src
-        LIBS += -L$$OUT_PWD/../../lib -lqthunspell$$qtPlatformTargetSuffix()
+        DEFINES += HAVE_HUNSPELL
+        QMAKE_USE += hunspell
         exists(3rdparty/hunspell/data) {
             hunspell_data.files = 3rdparty/hunspell/data/*.dic 3rdparty/hunspell/data/*.aff
             hunspell_data.path = $$DATAPATH/hunspell
@@ -251,8 +250,7 @@ pinyin {
         pinyininputmethod.h \
         pinyindecoderservice.h
     DEFINES += HAVE_PINYIN
-    INCLUDEPATH += 3rdparty/pinyin/include
-    LIBS += -L$$OUT_PWD/../../lib -lqtpinyin$$qtPlatformTargetSuffix()
+    QMAKE_USE += pinyin
     pinyin_data.files = $$PWD/3rdparty/pinyin/data/dict_pinyin.dat
     pinyin_data.path = $$DATAPATH/pinyin
     INSTALLS += pinyin_data
@@ -267,8 +265,7 @@ tcime {
     DEFINES += HAVE_TCIME
     cangjie: DEFINES += HAVE_TCIME_CANGJIE
     zhuyin: DEFINES += HAVE_TCIME_ZHUYIN
-    INCLUDEPATH += 3rdparty/tcime
-    LIBS += -L$$OUT_PWD/../../lib -lqttcime$$qtPlatformTargetSuffix()
+    QMAKE_USE += tcime
     tcime_data.files = \
         $$PWD/3rdparty/tcime/data/qt/dict_phrases.dat
     cangjie: tcime_data.files += \
@@ -294,9 +291,7 @@ openwnn {
     SOURCES += openwnninputmethod.cpp
     HEADERS += openwnninputmethod.h
     DEFINES += HAVE_OPENWNN
-    INCLUDEPATH += 3rdparty/openwnn/wnnEngine/include
-    # OpenWNN engine
-    LIBS += -L$$OUT_PWD/../../lib -lqtopenwnn$$qtPlatformTargetSuffix()
+    QMAKE_USE += openwnn
 }
 
 lipi-toolkit:t9write: \
@@ -338,8 +333,8 @@ t9write {
         t9writeinputmethod.h \
         t9writeworker.h
     DEFINES += HAVE_T9WRITE
+    QMAKE_USE += t9write_db
     INCLUDEPATH += $$T9WRITE_INCLUDE_DIRS
-    LIBS += -L$$OUT_PWD/../../lib -lqtt9write_db$$qtPlatformTargetSuffix()
     LIBS += $$T9WRITE_ALPHABETIC_LIBS
 }