From: Denys Dmytriyenko <[email protected]> As ARAGO_QT_PROVIDER is used to select between gles and non-gles versions of Qt4, make it aware of Qt5 and set it empty in that case.
Signed-off-by: Denys Dmytriyenko <[email protected]> --- meta-arago-distro/conf/distro/include/arago-prefs.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-arago-distro/conf/distro/include/arago-prefs.inc b/meta-arago-distro/conf/distro/include/arago-prefs.inc index 6ae11e9..0885acf 100644 --- a/meta-arago-distro/conf/distro/include/arago-prefs.inc +++ b/meta-arago-distro/conf/distro/include/arago-prefs.inc @@ -25,7 +25,7 @@ PREFERRED_VERSION_libdrm = "2.4.46" PREFERRED_PROVIDER_virtual/gettext = "gettext" -ARAGO_QT_PROVIDER = "${@base_contains('MACHINE_FEATURES','sgx','qt4-embedded-gles','qt4-embedded',d)}" +ARAGO_QT_PROVIDER = "${@base_contains('QT_PROVIDER','qt5','',base_contains('MACHINE_FEATURES','sgx','qt4-embedded-gles','qt4-embedded',d),d)}" PREFERRED_PROVIDER_qt4-embedded = "${ARAGO_QT_PROVIDER}" PREFERRED_VERSION_qt4-embedded = "4.8.5" -- 1.9.2 _______________________________________________ meta-arago mailing list [email protected] http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago
