update qtopia snapshot version and fix problem with qmake generated makefiles being unable to find the toolchain

1 files changed, 28 insertions, 59 deletions

diff --git a/package/qtopia4/Config.in b/package/qtopia4/Config.in
index 94c29326e..461538721 100644
--- a/package/qtopia4/Config.in
+++ b/package/qtopia4/Config.in
@@ -12,6 +12,7 @@ config BR2_PACKAGE_QTOPIA4_DEBUG
 	bool "Compile with debug support"
 	default n
 	depends BR2_PACKAGE_QTOPIA4
+	help
 
 choice
 	prompt "Library type"
@@ -59,7 +60,7 @@ config BR2_PACKAGE_QTOPIA4_COMMERCIAL_USERNAME
 	default ""
 	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	  Commercial users can download their source directly by providing a username.
+	    Commercial users can download their source directly by providing a username.
 
 
 config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
@@ -67,14 +68,22 @@ config BR2_PACKAGE_QTOPIA4_COMMERCIAL_PASSWORD
 	default ""
 	depends BR2_PACKAGE_QTOPIA4 && BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL
 	help
-	  Commercial users can download their source directly by providing a password.
+	    Commercial users can download their source directly by providing a password.
 
 config BR2_PACKAGE_QTOPIA4_QT3SUPPORT
 	bool "Compatibility with Qt3"
 	default y
 	depends BR2_PACKAGE_QTOPIA4
 	help
-	  Turns on support for older Qt3.
+	    Turns on support for older Qt3.
+
+config BR2_PACKAGE_QTOPIA4_DEPTHS
+	string "color depths to support"
+	default "-depths 8"
+	depends BR2_PACKAGE_QTOPIA4
+	help
+	    Which color depths to support for the library. Default is "-depths
+	    8". Is specified by a comma separated list, i.e. -depths 24,16,8.
 
 config BR2_PACKAGE_QTOPIA4_GIF
 	bool "Enable GIF support"
@@ -86,79 +95,38 @@ config BR2_PACKAGE_QTOPIA4_GIF
 config BR2_PACKAGE_QTOPIA4_LIBMNG
 	bool "Enable libmng support"
 	default n
+	select BR2_PACKAGE_LIBPNG
 	depends BR2_PACKAGE_QTOPIA4
 	help
 	  This compiles and installs the plugin for MNG support.
 
 choice
-	prompt "JPEG support"
+	prompt "libjpeg support"
 	depends BR2_PACKAGE_QTOPIA4
 	default BR2_PACKAGE_QTOPIA4_NOJPEG
 	help
 	  Select libjpeg support.
 
 config BR2_PACKAGE_QTOPIA4_NOJPEG
-	bool "No jpeg support"
+	bool
+	prompt "No jpeg support"
+	help
+	  Disable JPEG support
 
 config BR2_PACKAGE_QTOPIA4_SYSTEMJPEG
-	bool "Use system libjpeg"
+	bool
 	select BR2_PACKAGE_JPEG
-
-config BR2_PACKAGE_QTOPIA4_QTJPEG
-	bool "Use Qt libjpeg"
-
-endchoice
-
-choice
-	prompt "PNG support"
-	depends BR2_PACKAGE_QTOPIA4
-	default BR2_PACKAGE_QTOPIA4_NOPNG
+	prompt "use system libjpeg"
 	help
-	  Select which library to use if PNG support should be enabled.
-
-config BR2_PACKAGE_QTOPIA4_NOPNG
-	bool "No PNG support"
-
-config BR2_PACKAGE_QTOPIA4_SYSTEMPNG
-	bool "Use system libpng"
-	select BR2_PACKAGE_LIBPNG
+	  Link against system libjpeg
 
-config BR2_PACKAGE_QTOPIA4_QTPNG
-	bool "Use Qt bundled libpng"
-
-endchoice
-
-choice
-	prompt "TIFF support"
-	depends BR2_PACKAGE_QTOPIA4
-	default BR2_PACKAGE_QTOPIA4_NOTIFF
+config BR2_PACKAGE_QTOPIA4_QTJPEG
+	bool
+	prompt "use qt libjpeg"
 	help
-	  Select which library to use if TIFF support should be enabled.
-
-config BR2_PACKAGE_QTOPIA4_NOTIFF
-	bool "No TIFF support"
-
-config BR2_PACKAGE_QTOPIA4_SYSTEMTIFF
-	bool "Use system libtiff"
-	select BR2_PACKAGE_TIFF
-
-config BR2_PACKAGE_QTOPIA4_QTTIFF
-	bool "Use Qt bundled libtiff"
-
+	  Link against libjpeg proveded with Qt
 endchoice
 
-config BR2_PACKAGE_QTOPIA4_SQL
-	bool "Enable SQL support"
-	depends BR2_PACKAGE_QTOPIA4
-	help
-	  Enable all the SQL drivers it QtSql library.
-
-config BR2_PACKAGE_QTOPIA4_OPENSSL
-	bool "Enable OpenSSL support"
-	depends BR2_PACKAGE_QTOPIA4
-	help
-	  Enable support for the OpenSSL encryption library.
-
 choice
 	prompt "zlib support"
 	depends BR2_PACKAGE_QTOPIA4
@@ -178,7 +146,7 @@ config BR2_PACKAGE_QTOPIA4_QTZLIB
 	prompt "Qt zlib"
 	help
 	  Use the zlib bundled with Qt.
-
+	
 config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
 	bool
 	select BR2_PACKAGE_ZLIB
@@ -186,6 +154,7 @@ config BR2_PACKAGE_QTOPIA4_SYSTEMZLIB
 	help
 	  Use the shared zlib from the system.
 endchoice
+								    
 
 config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
 	string "The embedded platform we are making Qtopia4 for"
@@ -207,4 +176,4 @@ config BR2_PACKAGE_QTOPIA4_EMB_PLATFORM
 	default "generic"	if BR2_sparc
 	depends BR2_PACKAGE_QTOPIA4
 	help
-	  The platform.
+	    The platform.