Commit 421cda1f authored by Thomas Petazzoni's avatar Thomas Petazzoni Committed by Peter Korsgaard
Browse files

qt: convert to the GENTARGETS infrastructure 



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.

[Peter: fixed minor issues pointed out by Will]
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Acked-by: default avatarLuca Ceresoli <luca@lucaceresoli.net>
Acked-by: default avatarWill Wagner <willw@carallon.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 4c5ca3d2

package/qt/Config.in

+13 −20
Original line number Diff line number Diff line
@@ -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"

package/qt/qt.mk

+289 −336

File changed.

Preview size limit exceeded, changes collapsed.