From 416aa7ac11c622784ab5df57b4edf9f4c089667e Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 13 Oct 2011 14:41:18 +0000 Subject: qt4: use 4.7.4 as default preference (From OE-Core rev: 5d781a3ae57e5e8c9b463f1c70e2e41f43853250) Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb | 1 - meta/recipes-qt/qt4/qt4-native_4.7.4.bb | 1 - meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb | 2 -- meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb | 2 -- 4 files changed, 6 deletions(-) (limited to 'meta/recipes-qt') diff --git a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb index 34061cb9e4..e34ec8d5db 100644 --- a/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb +++ b/meta/recipes-qt/qt4/qt4-embedded_4.7.4.bb @@ -9,4 +9,3 @@ QT_CONFIG_FLAGS += " \ -exceptions \ " -DEFAULT_PREFERENCE = "-1" diff --git a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb index 7196c736d2..3be4d736eb 100644 --- a/meta/recipes-qt/qt4/qt4-native_4.7.4.bb +++ b/meta/recipes-qt/qt4/qt4-native_4.7.4.bb @@ -15,4 +15,3 @@ TOBUILD := "src/tools/bootstrap ${TOBUILD}" SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e" -DEFAULT_PREFERENCE = "-1" diff --git a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb index 77e1f36eea..4c90d57861 100644 --- a/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb +++ b/meta/recipes-qt/qt4/qt4-tools-nativesdk_4.7.4.bb @@ -7,5 +7,3 @@ SRC_URI += "file://blacklist-diginotar-certs.diff \ SRC_URI[md5sum] = "9831cf1dfa8d0689a06c2c54c5c65aaf" SRC_URI[sha256sum] = "97195ebce8a46f9929fb971d9ae58326d011c4d54425389e6e936514f540221e" - -DEFAULT_PREFERENCE = "-1" diff --git a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb index 0290313425..8c489362d7 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb +++ b/meta/recipes-qt/qt4/qt4-x11-free_4.7.4.bb @@ -9,5 +9,3 @@ QT_CONFIG_FLAGS += " \ -no-embedded \ -xrandr \ -x11" - -DEFAULT_PREFERENCE = "-1" -- cgit v1.2.3-54-g00ecf