Pull request for branch for-2011.05/qt-migration

The following changes since commit 0a064b48c9d1044b05aee65272f5af7f28879473:
Gustavo Zacarias (1):

        gst-ffmpeg: bump to version 0.10.11

are available in the git repository at:

git://git.busybox.net/~tpetazzoni/git/buildroot for-2011.05/qt-migration

Thomas Petazzoni (1):
qt: convert to the GENTARGETS infrastructure

 package/qt/Config.in |   35 ++--
 package/qt/qt.mk     |  623 +++++++++++++++++++++++---------------------------
 2 files changed, 302 insertions(+), 356 deletions(-)

Thanks,

Thomas Petazzoni

In addition to converting the qt package to the GENTARGETS infrastructure, this commit also does the following (related) things in the Qt package:

* Create a BR2_PACKAGE_QT_CONFIG_FILE option, which can be used to pass a custom Qt configuration file, such as the ones found in src/corelib/global/qconfig-*.h. This used to be possible, but required changing qt.mk directly, which isn't really how we configure things in Buildroot.

* Remove the BR2_PACKAGE_QT_EMB_PLATFORM option, the embedded platform name is now computed directly in qt.mk.

* The QT_CONFIGURE variable, which hosted all ./configure options, has been renamed to QT_CONFIGURE_OPTS, for consistency with what we do in the AUTOTARGETS infrastructure.

* The QT_DEP_LIBS variable has been renamed to QT_DEPENDENCIES, so that dependencies are properly handled by the GENTARGETS infrastructures.

* The QT_QMAKE_SET macro (used to adjust the path/flags of the compiler/linker) has been extended with an additional argument, which allows to pass the source directory of Qt.

* All the installation procedure has been rewritten to fit within the GENTARGETS mechanism.

---
 package/qt/Config.in |   35 ++--
 package/qt/qt.mk     |  623 +++++++++++++++++++++++---------------------------
 2 files changed, 302 insertions(+), 356 deletions(-)

index 3cc04f4..cc65e14 100644
@@ -55,6 +55,19 @@ 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_CONFIG_FILE
+	string "Config file"
+	help
+	  Configure options allow to set which modules are being
+	  compiled or not in Qt, but Qt also provide a more
+	  fine-grained mechanism to configure which features should be
+	  enabled or disabled, through a header file. Examples of such
+	  header files can be found in src/corelib/global/qconfig-*.h
+	  in the Qt sources.
+
+	  This option allows to set the path of such a configuration
+	  file, which Buildroot will give to Qt at compile time.
+
 config BR2_PACKAGE_QT_QT3SUPPORT
 	bool "Compatibility with Qt3"
 	depends on BR2_PACKAGE_QT_GUI_MODULE

@@ -240,26 +253,6 @@ config BR2_PACKAGE_QT_SYSTEMZLIB
 	  Use the shared zlib from the system.
 endchoice
 
-config BR2_PACKAGE_QT_EMB_PLATFORM
-	string "The embedded platform we are making Qt for"
-	default "arm"	if BR2_arm
-	default "arm"	if BR2_armeb
-	default "avr32"	if BR2_avr32
-	default "x86"	if BR2_i386
-	default "x86_64"	if BR2_x86_64
-	default "mips"	if BR2_mips
-	default "mips"	if BR2_mipsel
-	default "powerpc"	if BR2_powerpc
-# Not that I really believe these will work..
-	default "generic"	if BR2_alpha
-	default "generic"	if BR2_chris
-	default "generic"	if BR2_m68k
-	default "generic"	if BR2_sh
-	default "generic"	if BR2_sh64
-	default "generic"	if BR2_sparc
-	help
-	  The target platform.
-
 source "package/qt/Config.sql.in"
 if BR2_PACKAGE_QT_GUI_MODULE
 source "package/qt/Config.gfx.in"

@@ -286,7 +279,7 @@ config BR2_PACKAGE_QT_PHONON_BACKEND
 	  Build the platform Phonon plugin.
 	  If unsure, say n.
 
-comment "Qt DBbus module not available (need dbus)"
+comment "Qt DBus module not available (need dbus)"
 	depends on !BR2_PACKAGE_DBUS
 
 config BR2_PACKAGE_QT_DBUS

1.7.0.4

Luca

I have found three issues with this patch:

Should be:
+else ifeq ($(BR2_i386),y)
Not
+else ifeq ($(BR2_x86),y)

Should be:
ifneq ($(findstring x86,$(QT_EMB_PLATFORM)),) Not
ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),)

Finally whitespace formatting is slightly inconsistent for the QT_DEPENDENCIES libglib2, directfb and tslib

Assuming you fixup those three minor things

As a slight aside I have a number of Qt patches in my tree that I'd love to get merged if there was any interest.

First is to allow compiling Qt for X11 rather than embedded. This is involves a slight hack as Qt doesn't officially support cross compiling the X11 version, however I have it working well and have been in touch with Nokia support who say that although not officially supported it should work

Second is re-adding commercial support. i know we had this before and it was removed, however I'm stuck with some projects that have to use the commercial license. I have done it slightly differently to how it was before, it no longer needs login details to download the tarball, instead it just fails with an explanation if it isn't in your buildroot dl folder.

Other patches include Qt Declarative config option, more font config options.

If people are interested I'll submit patches.

Will

Hi,

Will> I have found three issues with this patch:

Will> Should be:
Will> +else ifeq ($(BR2_i386),y)
Will> Not
Will> +else ifeq ($(BR2_x86),y)

Will> Should be:
Will> ifneq ($(findstring x86,$(QT_EMB_PLATFORM)),) Will> Not
Will> ifneq ($(findstring x86,$(BR2_PACKAGE_QT_EMB_PLATFORM)),)

Will> Finally whitespace formatting is slightly inconsistent for the Will> QT_DEPENDENCIES libglib2, directfb and tslib

Will> Assuming you fixup those three minor things Will> Acked-by: Will Wagner <[email protected]>

Fixed, thanks.

Will> As a slight aside I have a number of Qt patches in my tree that I'd Will> love to get merged if there was any interest.

Will> First is to allow compiling Qt for X11 rather than embedded. This is Will> involves a slight hack as Qt doesn't officially support cross Will> compiling the X11 version, however I have it working well and have Will> been in touch with Nokia support who say that although not officially Will> supported it should work

Will> Second is re-adding commercial support. i know we had this before and Will> it was removed, however I'm stuck with some projects that have to use Will> the commercial license. I have done it slightly differently to how it Will> was before, it no longer needs login details to download the tarball, Will> instead it just fails with an explanation if it isn't in your Will> buildroot dl folder.

Will> Other patches include Qt Declarative config option, more font config Will> options.

Will> If people are interested I'll submit patches.

I am, please submit - I'll add them If they are not too intrusive.

Bye, Peter Korsgaard

Thomas> In addition to converting the qt package to the GENTARGETS Thomas> infrastructure, this commit also does the following (related) things Thomas> in the Qt package:

Committed, thanks.

Bye, Peter Korsgaard