diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2019-10-16 15:47:33 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2019-10-16 15:47:33 +0300 |
| commit | 981e0202f44caad6b172a84eddfc45d560903add (patch) | |
| tree | c988ed938801e56f6198a119697fefa66fc3ff11 /meta-boot2qt-distro | |
| parent | e2c736df163c006f5642d97a914bbfe3d96c9a68 (diff) | |
| parent | 56124e6eb5f95a42b178c2e16eafe0eff716d253 (diff) | |
Merge remote-tracking branch 'origin/5.13.1_QtAS' into thud
* origin/5.13.1_QtAS:
Fix for ivigenerator use in boot2qt on windows platform
Update automotive sha1s for QtAS 5.13.1
mingw: Fix bad cmd flag
Update automotive sha1s for QtAS 5.13.1
qtlocation: enable all geoservice plugins
qtsaferenderer: fix installation of missing plugin
Update automotive sha1s for QtAS 5.13.1
neptune: hide mouse cursor
Update automotive sha1s for QtAS 5.13.1
[qsr] new qsr and neptune services switching, set display for qsr
Update automotive sha1s for QtAS 5.13.1
Update automotive sha1s for QtAS 5.13.1
Change-Id: Ib86c1893b1396dfcada5aa81fcdd0c76b2de2cf5
Diffstat (limited to 'meta-boot2qt-distro')
4 files changed, 19 insertions, 2 deletions
diff --git a/meta-boot2qt-distro/conf/distro/b2qt.conf b/meta-boot2qt-distro/conf/distro/b2qt.conf index 7a70b5c1..76d6a10c 100644 --- a/meta-boot2qt-distro/conf/distro/b2qt.conf +++ b/meta-boot2qt-distro/conf/distro/b2qt.conf @@ -88,3 +88,4 @@ LICENSE_CREATE_PACKAGE = "1" COPY_LIC_MANIFEST = "1" include conf/distro/include/${MACHINE}.conf +include conf/distro/include/preferred-providers-${SDK_OS}.inc diff --git a/meta-boot2qt-distro/conf/distro/include/preferred-providers-mingw32.inc b/meta-boot2qt-distro/conf/distro/include/preferred-providers-mingw32.inc new file mode 100644 index 00000000..28dc3a71 --- /dev/null +++ b/meta-boot2qt-distro/conf/distro/include/preferred-providers-mingw32.inc @@ -0,0 +1,9 @@ +PREFERRED_PROVIDER_nativesdk-antlr4-python3-runtime ?= "nativesdk-prebuild-python" +PREFERRED_PROVIDER_nativesdk-python3 ?= "nativesdk-prebuild-python" +PREFERRED_PROVIDER_nativesdk-python3-jinja2 ?= "nativesdk-prebuild-python" +PREFERRED_PROVIDER_nativesdk-python3-markupsafe ?= "nativesdk-prebuild-python" +PREFERRED_PROVIDER_nativesdk-python3-path.py ?= "nativesdk-prebuild-python" +PREFERRED_PROVIDER_nativesdk-python3-pathtools ?= "nativesdk-prebuild-python" +PREFERRED_PROVIDER_nativesdk-qface ?= "nativesdk-prebuild-python" +PREFERRED_PROVIDER_nativesdk-python3-setuptools-scm ?= "nativesdk-prebuild-python" +PREFERRED_PROVIDER_nativesdk-python3-watchdog ?= "nativesdk-prebuild-python" diff --git a/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend b/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend index 65cc6b33..4352f438 100644 --- a/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend +++ b/meta-boot2qt-distro/recipes-core/meta/meta-environment.bbappend @@ -33,3 +33,8 @@ toolchain_create_sdk_version_append () { echo 'Layer Revisions:' >> $versionfile echo '${@get_layer_revs(d)}' >> $versionfile } + +# Fix bad cmd flag +toolchain_create_sdk_env_script_append_sdkmingw32() { + sed -i -e '/@%COMSPEC/s/\\/\//' $script +} diff --git a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend index c7112cfa..59f0d552 100644 --- a/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend +++ b/meta-boot2qt-distro/recipes-qt/qt5/qtlocation_git.bbappend @@ -28,8 +28,10 @@ ############################################################################ PACKAGECONFIG += " \ - geoservices_mapbox \ + geoservices_esri \ + geoservices_here \ geoservices_itemsoverlay \ + geoservices_mapbox \ geoservices_mapboxgl \ + geoservices_osm \ " - |