From 08b9e663470137e04b1f19522606707a652b3ae5 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Tue, 3 Mar 2020 12:30:59 +0100
Subject: Fix QDeviceDiscoveryUDev on FreeBSD

Include input.h from the right path.

Change-Id: I016027ab5d6372a8584e04043444a355e7e2d539
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp b/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp
index f601a196ca..c2413c131d 100644
--- a/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp
+++ b/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp
@@ -46,7 +46,11 @@
 #include <QSocketNotifier>
 #include <QLoggingCategory>
 
+#ifdef Q_OS_FREEBSD
+#include <dev/evdev/input.h>
+#else
 #include <linux/input.h>
+#endif
 
 QT_BEGIN_NAMESPACE
 
-- 
cgit v1.2.3


From 54f8be6cc0e53bcd8b2e67d302b7cbcaed9387b9 Mon Sep 17 00:00:00 2001
From: Edward Welbourne <edward.welbourne@qt.io>
Date: Fri, 13 Mar 2020 17:26:53 +0100
Subject: Update UCD to Revision 26

Include WordBreakTest.html, since a test uses sample strings from it,
albeit without actually reading the file.

Had to comment out more of the new tests, as at Revision 24, pending
an update to harfbuzz and the text boundary detection code.

Task-number: QTBUG-79631
Task-number: QTBUG-79418
Task-number: QTBUG-82747
Change-Id: I0082294b09d67ffdc6a9b5c15acf77ad3b86f65f
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 .../fontdatabases/fontconfig/qfontconfigdatabase.cpp                | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/platformsupport')

diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
index af49ad6407..095b921825 100644
--- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
+++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp
@@ -273,7 +273,11 @@ static const char specialLanguages[][6] = {
     "", // Elymaic
     "", // Nandinagari
     "", // NyiakengPuachueHmong
-    "" // Wancho
+    "", // Wancho
+    "", // Chorasmian
+    "", // DivesAkuru
+    "", // KhitanSmallScript
+    "" // Yezidi
 };
 Q_STATIC_ASSERT(sizeof specialLanguages / sizeof *specialLanguages == QChar::ScriptCount);
 
-- 
cgit v1.2.3