Use runtime Qt path for Hunspell and Pinyin search pathsv1.2.1

Use the runtime DataPath from QtCore to search for the Hunspell and
Pinyin dictionaries. The compile time path points to the host Qt location
when cross compiling, which does not work at runtime.

Change-Id: I8f6d6f2b2f159e4fa589417e3550faab79769f43
Task-number: QTRD-3453
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

3 files changed, 4 insertions, 7 deletions

diff --git a/src/virtualkeyboard/hunspellinputmethod.cpp b/src/virtualkeyboard/hunspellinputmethod.cpp
index 09308d05..617c3dab 100644
--- a/src/virtualkeyboard/hunspellinputmethod.cpp
+++ b/src/virtualkeyboard/hunspellinputmethod.cpp
@@ -24,6 +24,7 @@
 #include <QFileInfo>
 #include "virtualkeyboarddebug.h"
 #include <QTextCodec>
+#include <QtCore/QLibraryInfo>
 
 class HunspellInputMethodPrivate : public AbstractInputMethodPrivate
 {
@@ -53,7 +54,7 @@ public:
             Hunhandle *hunspell = 0;
             QString hunspellDataPath(QString::fromLatin1(qgetenv("QT_VIRTUALKEYBOARD_HUNSPELL_DATA_PATH").constData()));
             if (hunspellDataPath.isEmpty())
-                hunspellDataPath = QT_VIRTUALKEYBOARD_HUNSPELL_DATA_PATH;
+                hunspellDataPath = QLibraryInfo::location(QLibraryInfo::DataPath) + "/qtvirtualkeyboard/hunspell:/usr/share/hunspell:/usr/share/myspell/dicts";
             QStringList searchPaths(hunspellDataPath.split(":"));
             foreach (const QString &searchPath, searchPaths) {
                 QByteArray affpath(QString("%1/%2.aff").arg(searchPath).arg(locale).toUtf8());
diff --git a/src/virtualkeyboard/pinyindecoderservice.cpp b/src/virtualkeyboard/pinyindecoderservice.cpp
index 6a0d3de5..2a2b4c38 100644
--- a/src/virtualkeyboard/pinyindecoderservice.cpp
+++ b/src/virtualkeyboard/pinyindecoderservice.cpp
@@ -22,6 +22,7 @@
 #include <QStandardPaths>
 #include <QFileInfo>
 #include <QDir>
+#include <QtCore/QLibraryInfo>
 #include "virtualkeyboarddebug.h"
 
 using namespace ime_pinyin;
@@ -58,7 +59,7 @@ bool PinyinDecoderService::init()
 
     QString sysDict(QString::fromLatin1(qgetenv("QT_VIRTUALKEYBOARD_PINYIN_DICTIONARY").constData()));
     if (sysDict.isEmpty())
-        sysDict = QT_VIRTUALKEYBOARD_PINYIN_DICTIONARY;
+        sysDict = QLibraryInfo::location(QLibraryInfo::DataPath) + "/qtvirtualkeyboard/pinyin/dict_pinyin.dat";
 
     QString usrDictPath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation);
     QFileInfo usrDictInfo(usrDictPath + "/qtvirtualkeyboard/pinyin/usr_dict.dat");
diff --git a/src/virtualkeyboard/virtualkeyboard.pro b/src/virtualkeyboard/virtualkeyboard.pro
index eeb271da..c1581fca 100644
--- a/src/virtualkeyboard/virtualkeyboard.pro
+++ b/src/virtualkeyboard/virtualkeyboard.pro
@@ -171,8 +171,6 @@ INSTALLS += qml
         INCLUDEPATH += 3rdparty/hunspell/src
         DEPENDPATH += 3rdparty/hunspell/src
         LIBS += -L$$OUT_PWD/3rdparty/hunspell/ -lhunspell
-        isEmpty(hunspell_search_paths) hunspell_search_paths=$$DATAPATH/hunspell
-        DEFINES += QT_VIRTUALKEYBOARD_HUNSPELL_DATA_PATH=\\\"$$join(hunspell_search_paths, :)\\\"
         exists(3rdparty/hunspell/data) {
             hunspell_data.files = 3rdparty/hunspell/data/*.dic 3rdparty/hunspell/data/*.aff
             hunspell_data.path = $$DATAPATH/hunspell
@@ -186,8 +184,6 @@ INSTALLS += qml
         HEADERS += hunspellinputmethod.h hunspellworker.h
         DEFINES += HAVE_HUNSPELL
         PKGCONFIG += hunspell
-        isEmpty(hunspell_search_paths) hunspell_search_paths=/usr/share/hunspell /usr/share/myspell/dicts
-        DEFINES += QT_VIRTUALKEYBOARD_HUNSPELL_DATA_PATH=\\\"$$join(hunspell_search_paths, :)\\\"
     } else {
         message(Hunspell not found! Spell correction will not be available.)
     }
@@ -204,7 +200,6 @@ pinyin {
     INCLUDEPATH += 3rdparty/pinyin/include
     DEPENDPATH += 3rdparty/pinyin/include
     LIBS += -L$$OUT_PWD/3rdparty/pinyin/ -lpinyin
-    DEFINES += QT_VIRTUALKEYBOARD_PINYIN_DICTIONARY=\\\"$$DATAPATH/pinyin/dict_pinyin.dat\\\"
     pinyin_data.files = $$PWD/3rdparty/pinyin/data/dict_pinyin.dat
     pinyin_data.path = $$DATAPATH/pinyin
     INSTALLS += pinyin_data