From 28eefec5bd12072a68035e9f900fe75a3644e946 Mon Sep 17 00:00:00 2001 From: Michael Roth Date: Wed, 7 Oct 2009 11:20:42 +0200 Subject: qt: remove commercial license option It looks like that nobody is using the commercial license option because the code is broken (BR2_QT_COMMERCIAL_PASSWORD typo) and dist.trolltech.com became silent long ago and nobody complained about. So remove the broken and unused stuff. Signed-off-by: Michael Roth Acked-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/qt/qt.mk | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'package/qt/qt.mk') diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 0bbf64405..3d58f1fac 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -13,27 +13,15 @@ ###################################################################### QT_VERSION:=4.5.2 +QT_SOURCE:=qt-embedded-linux-opensource-src-$(QT_VERSION).tar.bz2 +QT_SITE:=http://get.qtsoftware.com/qt/source QT_CAT:=$(BZCAT) - -BR2_PACKAGE_QT_COMMERCIAL_USERNAME:=$(call qstrip,$(BR2_PACKAGE_QT_COMMERCIAL_USERNAME)) -BR2_PACKAGE_QT_COMMERCIAL_PASSWORD:=$(call qstrip,$(BR2_PACKAGE_QT_COMMERCIAL_PASSWORD)) +QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION) QT_CONFIGURE:=#empty -# What to download, free or commercial version. -ifneq ($(BR2_PACKAGE_QT_COMMERCIAL_USERNAME),) -QT_SITE:=http://$(BR2_PACKAGE_QT_COMMERCIAL_USERNAME):$(BR2_QT_COMMERCIAL_PASSWORD)@dist.trolltech.com/$(BR2_PACKAGE_QT_COMMERCIAL_USERNAME) -QT_SOURCE:=qt-embedded-linux-commercial-src-$(QT_VERSION).tar.bz2 -QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-commercial-src-$(QT_VERSION) -QT_CONFIGURE+= -commercial -else # Good, good, we are free: -QT_SITE=http://get.qtsoftware.com/qt/source -QT_SOURCE:=qt-embedded-linux-opensource-src-$(QT_VERSION).tar.bz2 -QT_TARGET_DIR:=$(BUILD_DIR)/qt-embedded-linux-opensource-src-$(QT_VERSION) -QT_CONFIGURE+= -opensource ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y) -QT_CONFIGURE+= -confirm-license -endif +QT_CONFIGURE += -opensource -confirm-license endif # If you want extra tweaking you can copy -- cgit v1.2.3