From a753845d5acd6d25ff74dc969a9ea6307d8abe6a Mon Sep 17 00:00:00 2001 From: Paul Buxton Date: Sat, 30 May 2020 12:21:22 +0100 Subject: build-system/MXE: build with more up to date MXE tools. - use hidapi grantlee and mdbtools from MXE - update MXE version to use QT 5.15, and pull in libzstd and CMake 3.17.3 - fix linking of winmm on windows build with new mxe - add some instructions on building the container - add some new dependancies from QT 5.15 to the packaging - add a patch to MXE to Build qtconnectivity with native-win32-bluetooth [Dirk Hohndel: small refactor] Signed-off-by: Paul Buxton Signed-off-by: Dirk Hohndel --- scripts/docker/mxe-build-container/qtconnectivity-1.patch | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 scripts/docker/mxe-build-container/qtconnectivity-1.patch (limited to 'scripts/docker/mxe-build-container/qtconnectivity-1.patch') diff --git a/scripts/docker/mxe-build-container/qtconnectivity-1.patch b/scripts/docker/mxe-build-container/qtconnectivity-1.patch new file mode 100644 index 000000000..fa43ff724 --- /dev/null +++ b/scripts/docker/mxe-build-container/qtconnectivity-1.patch @@ -0,0 +1,12 @@ +diff --git a/src/bluetooth/configure.json b/src/bluetooth/configure.json +index 3bd95903..0d41d88f 100644 +--- a/src/bluetooth/configure.json ++++ b/src/bluetooth/configure.json +@@ -63,6 +63,7 @@ + "purpose": "Uses the native Win32 Bluetooth backend.", + "section": "Qt Bluetooth", + "autoDetect": false, ++ "enable": true, + "output": [ "publicFeature", "feature" ] + }, + "winrt_bt": { -- cgit v1.2.3-70-g09d2