gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qtopia4: reduce the use of BR2_PACKAGE_QTOPIA4

Browse Source 
Use one conditional if statement instead of several single "depends on".

Patch by Markus Heidelberg.

Cleaned up trailing white space while we're at it.
This commit is contained in:
Peter Korsgaard 2008-10-26 06:03:23 +00:00
parent 2ee7e54c61
commit ae116fece6
1 changed files with 10 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
package/qtopia4/Config.in
View File

@ -7,16 +7,16 @@ config BR2_PACKAGE_QTOPIA4
http://www.trolltech.com/ http://www.trolltech.com/
if BR2_PACKAGE_QTOPIA4
config BR2_PACKAGE_QTOPIA4_DEBUG config BR2_PACKAGE_QTOPIA4_DEBUG
bool "Compile with debug support" bool "Compile with debug support"
depends on BR2_PACKAGE_QTOPIA4
help help
If unsure, say N. If unsure, say N.
choice choice
prompt "Library type" prompt "Library type"
default BR2_PACKAGE_QTOPIA4_SHARED default BR2_PACKAGE_QTOPIA4_SHARED
depends on BR2_PACKAGE_QTOPIA4
help help
Selects the library type: Shared or Static Selects the library type: Shared or Static
@ -40,7 +40,6 @@ endchoice
choice choice
prompt "Qtopia 4 Core license type" prompt "Qtopia 4 Core license type"
default BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL default BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
depends on BR2_PACKAGE_QTOPIA4
help help
Selects the type of license you which to use for Qtopia 4 Core. Selects the type of license you which to use for Qtopia 4 Core.
@ -54,7 +53,7 @@ endchoice
config BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED config BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED
bool "Approve Qtopia Core 4 GPL licence" bool "Approve Qtopia Core 4 GPL licence"
depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL
help help
Select this if you approve the GNU GENERAL PUBLIC LICENSE Version 2 Select this if you approve the GNU GENERAL PUBLIC LICENSE Version 2
on the Qtopia Core 4 library. By doing this you will not be asked on the Qtopia Core 4 library. By doing this you will not be asked
@ -67,7 +66,7 @@ config BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED
config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
string "Qtopia Core 4 Commercial License Username" string "Qtopia Core 4 Commercial License Username"
default "" default ""
depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
help help
Commercial users can download their source directly by Commercial users can download their source directly by
providing a username. providing a username.
@ -75,14 +74,13 @@ config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
string "Qtopia Core 4 Commercial License Password" string "Qtopia Core 4 Commercial License Password"
default "" default ""
depends on BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL depends on BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
help help
Commercial users can download their source directly by Commercial users can download their source directly by
providing a password. providing a password.
config BR2_PACKAGE_QTOPIA4_QT3SUPPORT config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
bool "Compatibility with Qt3" bool "Compatibility with Qt3"
depends on BR2_PACKAGE_QTOPIA4
help help
Turns on support for older Qt3. This will create an additional Turns on support for older Qt3. This will create an additional
library with proxy code and increase the space required on target. library with proxy code and increase the space required on target.
@ -91,26 +89,22 @@ config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
config BR2_PACKAGE_QTOPIA4_DEPTHS config BR2_PACKAGE_QTOPIA4_DEPTHS
string "color depths to support" string "color depths to support"
default "-depths 24,16,8" default "-depths 24,16,8"
depends on BR2_PACKAGE_QTOPIA4
help help
Which color depths to support for the library. Default is "-depths Which color depths to support for the library. Default is "-depths
24,16,8". Different depths are specified by a comma separated list. 24,16,8". Different depths are specified by a comma separated list.
config BR2_PACKAGE_QTOPIA4_GIF config BR2_PACKAGE_QTOPIA4_GIF
bool "Enable GIF support" bool "Enable GIF support"
depends on BR2_PACKAGE_QTOPIA4
help help
This compiles and installs the plugin for GIF reading support. This compiles and installs the plugin for GIF reading support.
config BR2_PACKAGE_QTOPIA4_LIBMNG config BR2_PACKAGE_QTOPIA4_LIBMNG
bool "Enable libmng support" bool "Enable libmng support"
depends on BR2_PACKAGE_QTOPIA4
help help
This compiles and installs the plugin for MNG support. This compiles and installs the plugin for MNG support.
choice choice
prompt "JPEG support" prompt "JPEG support"
depends on BR2_PACKAGE_QTOPIA4
default BR2_PACKAGE_QTOPIA4_NOJPEG default BR2_PACKAGE_QTOPIA4_NOJPEG
help help
Select libjpeg support. Select libjpeg support.
@ -134,7 +128,6 @@ endchoice
choice choice
prompt "PNG support" prompt "PNG support"
depends on BR2_PACKAGE_QTOPIA4
default BR2_PACKAGE_QTOPIA4_NOPNG default BR2_PACKAGE_QTOPIA4_NOPNG
help help
Select which library to use if PNG support should be enabled. Select which library to use if PNG support should be enabled.
@ -152,7 +145,6 @@ endchoice
choice choice
prompt "TIFF support" prompt "TIFF support"
depends on BR2_PACKAGE_QTOPIA4
default BR2_PACKAGE_QTOPIA4_NOTIFF default BR2_PACKAGE_QTOPIA4_NOTIFF
help help
Select which library to use if TIFF support should be enabled. Select which library to use if TIFF support should be enabled.
@ -170,7 +162,6 @@ endchoice
choice choice
prompt "zlib support" prompt "zlib support"
depends on BR2_PACKAGE_QTOPIA4
default BR2_PACKAGE_QTOPIA4_QTZLIB default BR2_PACKAGE_QTOPIA4_QTZLIB
help help
Select zlib support. Select zlib support.
@ -179,17 +170,16 @@ config BR2_PACKAGE_QTOPIA4_QTZLIB
bool "Qt zlib" bool "Qt zlib"
help help
Use the zlib bundled with Qt. Use the zlib bundled with Qt.
config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
bool "System zlib" bool "System zlib"
select BR2_PACKAGE_ZLIB select BR2_PACKAGE_ZLIB
help help
Use the shared zlib from the system. Use the shared zlib from the system.
endchoice endchoice
choice choice
prompt "freetype2 support" prompt "freetype2 support"
depends on BR2_PACKAGE_QTOPIA4
default BR2_PACKAGE_QTOPIA4_NOFREETYPE default BR2_PACKAGE_QTOPIA4_NOFREETYPE
help help
Select freetype2 support. Select freetype2 support.
@ -204,7 +194,7 @@ config BR2_PACKAGE_QTOPIA4_QTFREETYPE
bool "Qt freetype2" bool "Qt freetype2"
help help
Use the libfreetype bundled with Qt. Use the libfreetype bundled with Qt.
config BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE config BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE
bool "System freetype2" bool "System freetype2"
select BR2_PACKAGE_FREETYPE select BR2_PACKAGE_FREETYPE
@ -212,7 +202,7 @@ config BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE
Use shared libfreetype from the target system. Use shared libfreetype from the target system.
See http://www.freetype.org/ See http://www.freetype.org/
endchoice endchoice
config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
string "The embedded platform we are making Qtopia4 for" string "The embedded platform we are making Qtopia4 for"
default "arm" if BR2_arm default "arm" if BR2_arm
@ -231,13 +221,11 @@ config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
default "generic" if BR2_sh default "generic" if BR2_sh
default "generic" if BR2_sh64 default "generic" if BR2_sh64
default "generic" if BR2_sparc default "generic" if BR2_sparc
depends on BR2_PACKAGE_QTOPIA4
help help
The target platform. The target platform.
menuconfig BR2_PACKAGE_QTOPIA4_SQL_MODULE menuconfig BR2_PACKAGE_QTOPIA4_SQL_MODULE
bool "SQL Module" bool "SQL Module"
depends on BR2_PACKAGE_QTOPIA4
help help
Compile Qtopia SQL Module Compile Qtopia SQL Module
if BR2_PACKAGE_QTOPIA4_SQL_MODULE if BR2_PACKAGE_QTOPIA4_SQL_MODULE
@ -246,28 +234,24 @@ endif
config BR2_PACKAGE_QTOPIA4_XMLPATTERNS config BR2_PACKAGE_QTOPIA4_XMLPATTERNS
bool "XML Patterns Module" bool "XML Patterns Module"
depends on BR2_PACKAGE_QTOPIA4
help help
Build QtXmlPatterns module. Build QtXmlPatterns module.
If unsure, say n If unsure, say n
config BR2_PACKAGE_QTOPIA4_SVG config BR2_PACKAGE_QTOPIA4_SVG
bool "SVG Module" bool "SVG Module"
depends on BR2_PACKAGE_QTOPIA4
help help
Build the SVG module. Build the SVG module.
If unsure, say n If unsure, say n
config BR2_PACKAGE_QTOPIA4_WEBKIT config BR2_PACKAGE_QTOPIA4_WEBKIT
bool "WebKit Module" bool "WebKit Module"
depends on BR2_PACKAGE_QTOPIA4
help help
Build the WebKit module. Build the WebKit module.
If unsure, say n. If unsure, say n.
config BR2_PACKAGE_QTOPIA4_OPENSSL config BR2_PACKAGE_QTOPIA4_OPENSSL
bool "Enable OpenSSL support" bool "Enable OpenSSL support"
depends on BR2_PACKAGE_QTOPIA4
select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_OPENSSL
help help
Enable support for the OpenSSL encryption library. If you use Enable support for the OpenSSL encryption library. If you use
@ -275,3 +259,4 @@ config BR2_PACKAGE_QTOPIA4_OPENSSL
target. target.
If unsure, say n. If unsure, say n.
endif # BR2_PACKAGE_QTOPIA4