From f5c7beb6f535e1a128846880d04c067f318f310e Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 17 Nov 2010 14:50:05 -0800 Subject: minimal.conf: Pin QT version to 4.7.0 Signed-off-by: Khem Raj --- conf/distro/minimal.conf | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf index 0d32cfeffe..a2d23d2d50 100644 --- a/conf/distro/minimal.conf +++ b/conf/distro/minimal.conf @@ -71,7 +71,7 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}" SPLASH ?= '${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}' PREFERRED_PROVIDER_virtual/psplash = "psplash" -# increase inode/block ratio for ext2 filesystem +# increase inode/block ratio for ext2 filesystem EXTRA_IMAGECMD_ext2 = "-i 8192" ############################################################################# @@ -104,12 +104,19 @@ require conf/distro/include/preferred-xorg-versions-X11R7.5.inc PREFERRED_PROVIDER_opkg ?= "opkg" PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" +PREFERRED_QT_VERSION ?= "4.7.0" +PREFERRED_VERSION_qt4-tools-native = "${PREFERRED_QT_VERSION}" +PREFERRED_VERSION_qt4-tools-sdk = "${PREFERRED_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded = "${PREFERRED_QT_VERSION}" +PREFERRED_VERSION_qt4-embedded-gles = "${PREFERRED_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free = "${PREFERRED_QT_VERSION}" +PREFERRED_VERSION_qt4-x11-free-gles = "${PREFERRED_QT_VERSION}" ############################################################################# # CONTENTS ############################################################################# -# Ship extra debug utils in the rootfs when doing a debug build +# Ship extra debug utils in the rootfs when doing a debug build DISTRO_EXTRA_APPS ?= "" DISTRO_EXTRA_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "task-cli-tools-debug",d)}' -- cgit 1.2.3-korg