diff options
Diffstat (limited to 'src/platformsupport')
-rw-r--r-- | src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp | 4 | ||||
-rw-r--r-- | src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp b/src/platformsupport/devicediscovery/qdevicediscovery_udev.cpp index 478fe61a44..9cf5c9096e 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 diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase.cpp index 49bcbf7e78..c6dad12b95 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); |