Commit 28eefec5 authored by Michael Roth's avatar Michael Roth Committed by Peter Korsgaard
Browse files

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: default avatarMichael Roth <mroth@nessie.de>
Acked-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent d6d7f13c

configs/atstk100x_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -690,7 +690,6 @@ BR2_PACKAGE_QT=y 
# BR2_PACKAGE_QT_DEBUG is not set

BR2_PACKAGE_QT_SHARED=y

# BR2_PACKAGE_QT_STATIC is not set

# BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL is not set

# BR2_PACKAGE_QT_LICENSE_APPROVED is not set

# BR2_PACKAGE_QT_QT3SUPPORT is not set

BR2_PACKAGE_QT_GUI_MODULE=y

configs/v100sc2_defconfig

+0 −2
Original line number Diff line number Diff line
@@ -546,8 +546,6 @@ BR2_PACKAGE_QT=y 
# BR2_PACKAGE_QT_DEBUG is not set

BR2_PACKAGE_QT_SHARED=y

# BR2_PACKAGE_QT_STATIC is not set

BR2_PACKAGE_QT_LICENSE_TYPE_GPL=y

# BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL is not set

BR2_PACKAGE_QT_GPL_LICENSE_APPROVED=y

# BR2_PACKAGE_QT_QT3SUPPORT is not set

BR2_PACKAGE_QT_PIXEL_DEPTH_8=y

package/qt/Config.in

+0 −18
Original line number Diff line number Diff line
@@ -39,12 +39,8 @@ config BR2_PACKAGE_QT_STATIC 


endchoice



config BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL

	bool "Use commercial license"



config BR2_PACKAGE_QT_LICENSE_APPROVED

	bool "Approve free license"

	depends on !BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL

	help

	  Select this if you approve one of the available free licenses for the

	  Qt4 library.
@@ -54,20 +50,6 @@ config BR2_PACKAGE_QT_LICENSE_APPROVED 
	  LGPL v2.1: http://doc.trolltech.com/4.5/lgpl.html

	  GPL  v3.0: http://doc.trolltech.com/4.5/gpl.html



config BR2_PACKAGE_QT_COMMERCIAL_USERNAME

	string "Qt 4 Commercial License Username"

	depends on BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL

	help

	  Commercial users can download their source directly by

	  providing a username.



config BR2_PACKAGE_QT_COMMERCIAL_PASSWORD

	string "Qt 4 Commercial License Password"

	depends on BR2_PACKAGE_QT_LICENSE_TYPE_COMMERCIAL

	help

	  Commercial users can download their source directly by

	  providing a password.



config BR2_PACKAGE_QT_QT3SUPPORT

	bool "Compatibility with Qt3"

	help

package/qt/qt.mk

+4 −16
Original line number Diff line number Diff line
@@ -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