4 files changed, 13 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
index a8885d71df0..300b22ec575 100644
--- a/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
+++ b/src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro
@@ -14,7 +14,7 @@ DEFINES += HAVE_ATEXIT
 unix: DEFINES += HAVE_PTHREAD HAVE_SCHED_H HAVE_SCHED_YIELD
 
 INCLUDEPATH += $$PWD/include
-INCLUDEPATH += $$OUT_PWD/../../../include
+INCLUDEPATH += $$QT.core.includes
 
 SOURCES += \
     $$PWD/src/hb-blob.cc \
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
index cb870847f2d..777da98f47a 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.cpp
@@ -69,6 +69,8 @@ void QLinuxFbIntegration::initialize()
 
     m_inputContext = QPlatformInputContextFactory::create();
 
+    m_nativeInterface.reset(new QPlatformNativeInterface);
+
     m_vtHandler.reset(new QFbVtHandler);
 }
 
@@ -113,4 +115,9 @@ QPlatformServices *QLinuxFbIntegration::services() const
     return m_services.data();
 }
 
+QPlatformNativeInterface *QLinuxFbIntegration::nativeInterface() const
+{
+    return m_nativeInterface.data();
+}
+
 QT_END_NAMESPACE
diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h
index cabd943921e..83446105f8d 100644
--- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h
+++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h
@@ -35,6 +35,7 @@
 #define QLINUXFBINTEGRATION_H
 
 #include <qpa/qplatformintegration.h>
+#include <qpa/qplatformnativeinterface.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -60,6 +61,8 @@ public:
     QPlatformServices *services() const Q_DECL_OVERRIDE;
     QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE { return m_inputContext; }
 
+    QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE;
+
     QList<QPlatformScreen *> screens() const;
 
 private:
@@ -68,6 +71,7 @@ private:
     QScopedPointer<QPlatformFontDatabase> m_fontDb;
     QScopedPointer<QPlatformServices> m_services;
     QScopedPointer<QFbVtHandler> m_vtHandler;
+    QScopedPointer<QPlatformNativeInterface> m_nativeInterface;
 };
 
 QT_END_NAMESPACE
diff --git a/src/src.pro b/src/src.pro
index 81f4fa52565..83f7587f0e2 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -83,6 +83,7 @@ src_testlib.depends = src_corelib   # src_gui & src_widgets are not build-depend
 
 src_3rdparty_harfbuzzng.subdir = $$PWD/3rdparty/harfbuzz-ng
 src_3rdparty_harfbuzzng.target = sub-3rdparty-harfbuzzng
+src_3rdparty_harfbuzzng.depends = src_corelib   # for the Qt atomics
 
 src_angle.subdir = $$PWD/angle
 src_angle.target = sub-angle