From a4c0385a15c29ae56fcad82330699e9058c609e2 Mon Sep 17 00:00:00 2001
From: Mitch Curtis <mitch.curtis@qt.io>
Date: Mon, 19 Dec 2016 11:06:03 +0100
Subject: [PATCH] Hunspell: fix source builds correctly
fa5cd9cc3c6b2579ff1d3ffe32afc00ac6a87835 change the format of the
Hunspell header includes, but it was the MODULE_INCLUDEPATH that
was wrong, so fix that instead. The previous (incorrect) value was:
MODULE_INCLUDEPATH = $$PWD/src/hunspell
when it should be:
MODULE_INCLUDEPATH = $$PWD/src
Change-Id: Ifa5b13a9cede3ccc9712cca03c17cb2fdae56134
Reviewed-by: Jarkko Koivikko <jarkko.koivikko@code-q.fi>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
src/virtualkeyboard/3rdparty/hunspell/hunspell.pro | 2 +-
src/virtualkeyboard/hunspellinputmethod_p.cpp | 2 +-
src/virtualkeyboard/hunspellworker.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro b/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro
index 798df897..bd5eccb3 100644
--- a/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro
+++ b/src/virtualkeyboard/3rdparty/hunspell/hunspell.pro
@@ -10,7 +10,7 @@ config_file = "/* Version number of package */" "$${LITERAL_HASH}define VERSION
write_file($$PWD/config.h, config_file)
MODULE_DEFINES += HUNSPELL_STATIC
-MODULE_INCLUDEPATH = $$PWD/src/hunspell
+MODULE_INCLUDEPATH = $$PWD/src
SOURCES += \
src/hunspell/affentry.cxx \
diff --git a/src/virtualkeyboard/hunspellinputmethod_p.cpp b/src/virtualkeyboard/hunspellinputmethod_p.cpp
index 3bbe589e..34f343d3 100644
--- a/src/virtualkeyboard/hunspellinputmethod_p.cpp
+++ b/src/virtualkeyboard/hunspellinputmethod_p.cpp
@@ -29,7 +29,7 @@
#include "hunspellinputmethod_p.h"
#include "inputcontext.h"
-#include <hunspell.h>
+#include <hunspell/hunspell.h>
#include <QStringList>
#include <QDir>
#include "virtualkeyboarddebug.h"
diff --git a/src/virtualkeyboard/hunspellworker.h b/src/virtualkeyboard/hunspellworker.h
index 9b23e092..73e2c187 100644
--- a/src/virtualkeyboard/hunspellworker.h
+++ b/src/virtualkeyboard/hunspellworker.h
@@ -35,7 +35,7 @@
#include <QMutex>
#include <QStringList>
#include <QSharedPointer>
-#include <hunspell.h>
+#include <hunspell/hunspell.h>
QT_BEGIN_NAMESPACE
class QTextCodec;
--
GitLab