diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-15 13:54:56 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2009-03-15 13:54:56 +0000 |
| commit | ad90fc6de9efa59ccecd70682f139a47dcce12e8 (patch) | |
| tree | 20108de0b4f94cb7158e3bb60fac07c572cd4f90 | |
| parent | 2150ed1bf14ccdadfbdf4acc1efbb7a64dac9fe0 (diff) | |
| download | buildroot-novena-ad90fc6de9efa59ccecd70682f139a47dcce12e8.tar.gz buildroot-novena-ad90fc6de9efa59ccecd70682f139a47dcce12e8.zip | |
qtopia4: remove selection of GPL/LPGL licenses
Choosing between GPL or LGPL doesn't change the build process, so it's
sufficient to have a selection for the commercial license.
Also change the URLs to the licenses to the Qt web page, where the
exception for the LGPL is included.
Signed-off-by: Markus Heidelberg <markus.heidelberg@web.de>
| -rw-r--r-- | package/qtopia4/Config.in | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/package/qtopia4/Config.in b/package/qtopia4/Config.in index 2442c2d17..50d46ae1f 100644 --- a/package/qtopia4/Config.in +++ b/package/qtopia4/Config.in @@ -39,39 +39,23 @@ config BR2_PACKAGE_QTOPIA4_STATIC endchoice -choice - prompt "Qtopia 4 Core license type" - default BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_LGPL - help - Selects the type of license you which to use for Qtopia 4 Core. - -config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_LGPL - bool "LGPL license" - -config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL - bool "GPL license" - config BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL - bool "Commercial license" - -endchoice + bool "Use commercial license" config BR2_PACKAGE_QTOPIA4_LICENSE_APPROVED - bool "Approve Qtopia Core 4 license" - depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL || BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_LGPL + bool "Approve free license" + depends on !BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL help - Select this if you approve the above selected license for the - Qtopia Core 4 library. + Select this if you approve one of the available free licenses for the + Qt4 library. By doing this you will not be asked while the library is compiled. Please read and understand the license terms before approving this. - For full GPL version 2 see http://www.gnu.org/licenses/gpl2.txt - For full LGPL see http://www.gnu.org/licenses/lgpl.txt - + 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_QTOPIA4_COMMERCIAL_USERNAME string "Qtopia Core 4 Commercial License Username" - default "" depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL help Commercial users can download their source directly by @@ -79,7 +63,6 @@ config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD string "Qtopia Core 4 Commercial License Password" - default "" depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL help Commercial users can download their source directly by |