NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
524a555ad1
kumquat-buildroot/package/qt/qt.mk

716 lines
19 KiB
Makefile
Raw Normal View History

Normalize separator size to 80 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:30 +02:00
################################################################################
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
#
qt: bump version Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-08 09:48:31 +01:00
# Qt Embedded for Linux
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
#
# This makefile was originally composed by Thomas Lundquist <thomasez@zelow.no>
# Later heavily modified by buildroot developers
#
# BTW, this uses alot of FPU calls and it's pretty slow if you use
# the kernels FPU emulation so it's better to choose soft float in the
# buildroot config (and uClibc.config of course, if you have your own.)
#
Normalize separator size to 80 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:30 +02:00
################################################################################
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
package: add <pkg>_VERSION_MAJOR variable Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Reviewed-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-18 19:20:02 +01:00
QT_VERSION_MAJOR = 4.8
qt 4.8.x : bump version to 4.8.6 Dropped upstream patch fix-polyline-drawing.patch Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-29 11:13:32 +02:00
QT_VERSION = $(QT_VERSION_MAJOR).6
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_SOURCE = qt-everywhere-opensource-src-$(QT_VERSION).tar.gz
QT_SITE = http://download.qt-project.org/official_releases/qt/$(QT_VERSION_MAJOR)/$(QT_VERSION)
packages: switch to host-pkgconf Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-10-22 17:47:52 +02:00
QT_DEPENDENCIES = host-pkgconf
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_INSTALL_STAGING = YES
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
qt: define license Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-07 12:02:35 +01:00
QT_LICENSE = LGPLv2.1 with exceptions or GPLv3
ifneq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
QT_LICENSE += or Digia Qt Commercial license
endif
QT_LICENSE_FILES = LICENSE.LGPL LGPL_EXCEPTION.txt LICENSE.GPL3
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_LICENSE_APPROVED),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -opensource -confirm-license
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_CONFIG_FILE = $(call qstrip,$(BR2_PACKAGE_QT_CONFIG_FILE))
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifneq ($(QT_CONFIG_FILE),)
qt: fix qconfig configure parameter The Qt configure option for specifying a custom qconfig.h file changed from -config to -qconfig. This makes the corresponding change in qt.mk. Signed-off-by: Frank Hunleth <fhunleth@troodon-software.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-05-07 13:14:24 +02:00
QT_CONFIGURE_OPTS += -qconfig buildroot
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
qt: fix webkit/sqlite build without largefile support The embedded sqlite module forces FILE_OFFSET_BITS=64 unless SQLITE_DISABLE_LFS is defined, breaking the build for !largefile toolchains. Webkit internally builds sqlite, so that's affected as well. Fix it by passing -DSQLITE_DISABLE_LFS in C/CXXFLAGS for !largefile builds, similar to how we do it for the standalone sqlite package. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-27 11:56:11 +02:00
QT_CFLAGS = $(TARGET_CFLAGS)
QT_CXXFLAGS = $(TARGET_CXXFLAGS)
qt: fix build with opengl es Fixes http://autobuild.buildroot.net/results/efe/efe26c54361094fb1e201da6915900cd9b24d596/ qt doesn't use pkg-config to figure out the needed compiler/linker flags for egl, so pass them explicitly instead. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-29 11:25:25 +01:00
QT_LDFLAGS = $(TARGET_LDFLAGS)
qt: fix webkit/sqlite build without largefile support The embedded sqlite module forces FILE_OFFSET_BITS=64 unless SQLITE_DISABLE_LFS is defined, breaking the build for !largefile toolchains. Webkit internally builds sqlite, so that's affected as well. Fix it by passing -DSQLITE_DISABLE_LFS in C/CXXFLAGS for !largefile builds, similar to how we do it for the standalone sqlite package. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-27 11:56:11 +02:00
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_LARGEFILE),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -largefile
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-largefile
qt: fix webkit/sqlite build without largefile support The embedded sqlite module forces FILE_OFFSET_BITS=64 unless SQLITE_DISABLE_LFS is defined, breaking the build for !largefile toolchains. Webkit internally builds sqlite, so that's affected as well. Fix it by passing -DSQLITE_DISABLE_LFS in C/CXXFLAGS for !largefile builds, similar to how we do it for the standalone sqlite package. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-06-27 11:56:11 +02:00
# embedded sqlite module forces FILE_OFFSET_BITS=64 unless this is defined
# webkit internally uses this module as well
ifneq ($(BR2_PACKAGE_QT_SQLITE_QT)$(BR2_PACKAGE_QT_WEBKIT),)
QT_CFLAGS += -DSQLITE_DISABLE_LFS
QT_CXXFLAGS += -DSQLITE_DISABLE_LFS
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: Force arm mode instead of Thumb1 mode Qt has some assembly that doesn't exist in thumb1 mode. So, force arm mode for Qt Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-01-20 12:24:39 +01:00
# Qt has some assembly function that are not present in thumb1 mode:
# Error: selected processor does not support Thumb mode `swp r3,r7,[r4]'
# so, we desactivate thumb mode
ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
QT_CFLAGS += -marm
QT_CXXFLAGS += -marm
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt3support
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-qt3support
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: Bump to 4.6.3 Also add option to build example and demo code [Peter: fix patch handling] Signed-off-by: Paul Jones <paul@pauljones.id.au> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-08-18 14:11:34 +02:00
ifeq ($(BR2_PACKAGE_QT_DEMOS),y)
qt4: allow separate build/installation of demos and examples Signed-off-by: Jeremie Scheer <jeremie.scheer@armadeus.com> Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-06 22:43:02 +01:00
QT_CONFIGURE_OPTS += -demosdir $(TARGET_DIR)/usr/share/qt/demos
qt: Bump to 4.6.3 Also add option to build example and demo code [Peter: fix patch handling] Signed-off-by: Paul Jones <paul@pauljones.id.au> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-08-18 14:11:34 +02:00
else
qt4: allow separate build/installation of demos and examples Signed-off-by: Jeremie Scheer <jeremie.scheer@armadeus.com> Signed-off-by: Julien Boibessot <julien.boibessot@armadeus.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-01-06 22:43:02 +01:00
QT_CONFIGURE_OPTS += -nomake demos
endif
ifeq ($(BR2_PACKAGE_QT_EXAMPLES),y)
QT_CONFIGURE_OPTS += -examplesdir $(TARGET_DIR)/usr/share/qt/examples
else
QT_CONFIGURE_OPTS += -nomake examples
qt: Bump to 4.6.3 Also add option to build example and demo code [Peter: fix patch handling] Signed-off-by: Paul Jones <paul@pauljones.id.au> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-08-18 14:11:34 +02:00
endif
qt: ensure libglib2 is built before qt if enabled for Qt's glib support Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-12 11:56:16 +01:00
# ensure glib is built first if enabled for Qt's glib support
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
qt: bump version Webkit support runs pkg-config at build time, so we need to ensure our version gets picked up. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-25 22:52:02 +01:00
QT_CONFIGURE_OPTS += -glib
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_DEPENDENCIES += libglib2
qt: bump version Webkit support runs pkg-config at build time, so we need to ensure our version gets picked up. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-25 22:52:02 +01:00
else
QT_CONFIGURE_OPTS += -no-glib
qt: ensure libglib2 is built before qt if enabled for Qt's glib support Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-12 11:56:16 +01:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
### Pixel depths
packages: remove all := signs Finally get rid of all := used for variable definitions in packages, as we suggest in our manual and during the review of new packages. While I was at it, I also sometimes added a few missing new lines between the header and the first variable definition. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-20 10:45:47 +01:00
QT_PIXEL_DEPTHS = # empty
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_1),y)
QT_PIXEL_DEPTHS += 1
endif
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_4),y)
QT_PIXEL_DEPTHS += 4
endif
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_8),y)
QT_PIXEL_DEPTHS += 8
endif
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_12),y)
QT_PIXEL_DEPTHS += 12
endif
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_15),y)
QT_PIXEL_DEPTHS += 15
endif
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_16),y)
QT_PIXEL_DEPTHS += 16
endif
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_18),y)
QT_PIXEL_DEPTHS += 18
endif
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_24),y)
QT_PIXEL_DEPTHS += 24
endif
ifeq ($(BR2_PACKAGE_QT_PIXEL_DEPTH_32),y)
QT_PIXEL_DEPTHS += 32
endif
ifneq ($(QT_PIXEL_DEPTHS),)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -depths $(subst $(space),$(comma),$(strip $(QT_PIXEL_DEPTHS)))
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
### Display drivers
ifeq ($(BR2_PACKAGE_QT_GFX_LINUXFB),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-gfx-linuxfb
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-gfx-linuxfb
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_GFX_TRANSFORMED),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-gfx-transformed
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-gfx-transformed
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_GFX_QVFB),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-gfx-qvfb
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-gfx-qvfb
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_GFX_VNC),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-gfx-vnc
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-gfx-vnc
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_GFX_MULTISCREEN),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-gfx-multiscreen
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-gfx-multiscreen
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
ifeq ($(BR2_PACKAGE_QT_GFX_DIRECTFB),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-gfx-directfb
QT_DEPENDENCIES += directfb
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-gfx-directfb
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
endif
qt: add powervr and opengl Use the following to test: /usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Sundareson, Prabindh <prabu@ti.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Sinan Akpolat <sinan@linkas.com.tr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-15 23:44:20 +02:00
ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
QT_CONFIGURE_OPTS += \
-plugin-gfx-powervr -D QT_NO_QWS_CURSOR -D QT_QWS_CLIENTBLIT
QT_DEPENDENCIES += powervr
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
### Mouse drivers
ifeq ($(BR2_PACKAGE_QT_MOUSE_PC),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-mouse-pc
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-mouse-pc
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXTP),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-mouse-linuxtp
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-mouse-linuxtp
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
ifeq ($(BR2_PACKAGE_QT_MOUSE_LINUXINPUT),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-mouse-linuxinput
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-mouse-linuxinput
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_MOUSE_TSLIB),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-mouse-tslib
QT_DEPENDENCIES += tslib
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-mouse-tslib
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_MOUSE_QVFB),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-mouse-qvfb
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-mouse-qvfb
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: add option to hide mouse cursor Allow the user to build Qt with the QT_NO_QWS_CURSOR macro set. Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-03 00:06:44 +01:00
ifeq ($(BR2_PACKAGE_QT_MOUSE_NO_QWS_CURSOR),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -D QT_NO_QWS_CURSOR
qt: add option to hide mouse cursor Allow the user to build Qt with the QT_NO_QWS_CURSOR macro set. Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-03 00:06:44 +01:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
qt: add selection for keyboard drivers Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 10:54:14 +01:00
### Keyboard drivers
ifeq ($(BR2_PACKAGE_QT_KEYBOARD_TTY),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-kbd-tty
qt: add selection for keyboard drivers Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 10:54:14 +01:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-kbd-tty
qt: add selection for keyboard drivers Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 10:54:14 +01:00
endif
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
ifeq ($(BR2_PACKAGE_QT_KEYBOARD_LINUXINPUT),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-kbd-linuxinput
qt: add selection for keyboard drivers Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 10:54:14 +01:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-kbd-linuxinput
qt: add selection for keyboard drivers Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 10:54:14 +01:00
endif
ifeq ($(BR2_PACKAGE_QT_KEYBOARD_QVFB),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-kbd-qvfb
qt: add selection for keyboard drivers Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 10:54:14 +01:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-kbd-qvfb
qt: add selection for keyboard drivers Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 10:54:14 +01:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_DEBUG),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -debug
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -release
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_SHARED),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -shared
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -static
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_ENDIAN),"LITTLE")
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -little-endian
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -big-endian
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: simplify arch handling Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-26 13:13:06 +01:00
ifeq ($(BR2_arm)$(BR2_armeb),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_EMB_PLATFORM = arm
else ifeq ($(BR2_i386),y)
QT_EMB_PLATFORM = x86
else ifeq ($(BR2_x86_64),y)
QT_EMB_PLATFORM = x86_64
qt: simplify arch handling Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-26 13:13:06 +01:00
else ifeq ($(BR2_mips)$(BR2_mipsel),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_EMB_PLATFORM = mips
else ifeq ($(BR2_powerpc),y)
QT_EMB_PLATFORM = powerpc
else
QT_EMB_PLATFORM = generic
endif
qt: add X11 support There are two possible configurations for Qt4 installation: standard (with X11) and embedded (for framebuffer). Both configurations cannot be used together for one installation and some options are specific to one configuration or the other. Add a choice to select the standard or the embedded installation to add X11 support. The integration is done in order to make maximum use of the current configuration logic, for example by using the same mkspecs files. Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-07-15 18:30:56 +02:00
ifeq ($(BR2_PACKAGE_QT_X11),y)
QT_DEPENDENCIES += fontconfig xlib_libXi xlib_libX11 xlib_libXrender \
xlib_libXcursor xlib_libXrandr xlib_libXext xlib_libXv
# Using pkg-config avoids us some logic to redefine and sed again mkspecs files
# to add X11 include path and link options
QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags x11)
QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags x11)
QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs x11 xext)
QT_CONFIGURE_OPTS += -arch $(QT_EMB_PLATFORM) \
-xplatform qws/linux-$(QT_EMB_PLATFORM)-g++ -x11 -no-gtkstyle -no-sm \
-no-openvg
else # if BR2_PACKAGE_QT_EMBEDDED
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -embedded $(QT_EMB_PLATFORM)
qt: add X11 support There are two possible configurations for Qt4 installation: standard (with X11) and embedded (for framebuffer). Both configurations cannot be used together for one installation and some options are specific to one configuration or the other. Add a choice to select the standard or the embedded installation to add X11 support. The integration is done in order to make maximum use of the current configuration logic, for example by using the same mkspecs files. Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-07-15 18:30:56 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
qt: only build gui module if enabled Closes #2905 Signed-off-by: Frederik Pasch <fpasch@googlemail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-08 23:09:03 +01:00
ifneq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-gui
qt: only build gui module if enabled Closes #2905 Signed-off-by: Frederik Pasch <fpasch@googlemail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-12-08 23:09:03 +01:00
endif
qt: bump version Webkit support runs pkg-config at build time, so we need to ensure our version gets picked up. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-25 22:52:02 +01:00
ifneq ($(BR2_PACKAGE_QT_GIF),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-gif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_LIBMNG),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-libmng
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-libmng
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_QTZLIB),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-zlib
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
ifeq ($(BR2_PACKAGE_QT_SYSTEMZLIB),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -system-zlib
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += zlib
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
endif
ifeq ($(BR2_PACKAGE_QT_QTJPEG),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-libjpeg
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
ifeq ($(BR2_PACKAGE_QT_SYSTEMJPEG),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -system-libjpeg
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += jpeg
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-libjpeg
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
endif
ifeq ($(BR2_PACKAGE_QT_QTPNG),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-libpng
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
ifeq ($(BR2_PACKAGE_QT_SYSTEMPNG),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -system-libpng
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += libpng
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-libpng
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
endif
ifeq ($(BR2_PACKAGE_QT_QTTIFF),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-libtiff
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
ifeq ($(BR2_PACKAGE_QT_SYSTEMTIFF),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -system-libtiff
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += tiff
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-libtiff
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
endif
package/qt: add font selection Commit f98547622 (make sure to install all Qt-fonts and true-type-fonts) changed Qt to install all .qpf fonts to the target instead of only a hardcoded subset. Some of those fonts are unfortunately quite big (1-2MB) and are not always needed (japanese, unicode). Instead add a font selection in Kconfig similar to how it is done for pixel depths, and default to the subset we were previously using. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-14 16:54:46 +01:00
QT_FONTS = $(addprefix $(STAGING_DIR)/usr/lib/fonts/, $(addsuffix *.qpf, \
$(if $(BR2_PACKAGE_QT_FONT_MICRO),micro) \
$(if $(BR2_PACKAGE_QT_FONT_FIXED),fixed) \
$(if $(BR2_PACKAGE_QT_FONT_HELVETICA),helvetica) \
$(if $(BR2_PACKAGE_QT_FONT_JAPANESE),japanese) \
$(if $(BR2_PACKAGE_QT_FONT_UNIFONT),unifont)))
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_QTFREETYPE),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-freetype
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
ifeq ($(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -system-freetype
QT_CONFIGURE_OPTS += -I $(STAGING_DIR)/usr/include/freetype2/
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += freetype
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-freetype
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_DBUS),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += dbus
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_OPENSSL),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -openssl
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += openssl
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-openssl
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: add powervr and opengl Use the following to test: /usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Sundareson, Prabindh <prabu@ti.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Sinan Akpolat <sinan@linkas.com.tr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-15 23:44:20 +02:00
ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
QT_CONFIGURE_OPTS += -opengl es2 -egl
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += libgles libegl
QT_CFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
qt: fix build with opengl es Fixes http://autobuild.buildroot.net/results/efe/efe26c54361094fb1e201da6915900cd9b24d596/ qt doesn't use pkg-config to figure out the needed compiler/linker flags for egl, so pass them explicitly instead. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-29 11:25:25 +01:00
QT_CXXFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --cflags egl)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_LDFLAGS += $(shell $(PKG_CONFIG_HOST_BINARY) --libs egl)
qt: add powervr and opengl Use the following to test: /usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Sundareson, Prabindh <prabu@ti.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Sinan Akpolat <sinan@linkas.com.tr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-15 23:44:20 +02:00
else
QT_CONFIGURE_OPTS += -no-opengl
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
# Qt SQL Drivers
ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
ifeq ($(BR2_PACKAGE_QT_IBASE),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-sql-ibase
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_MYSQL),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-sql-mysql -mysql_config $(STAGING_DIR)/usr/bin/mysql_config
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += mysql
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_ODBC),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-sql-odbc
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_PSQL),y)
qt: fix postgresql plugin compile Add qt4 '-psql_config' configure option and use it to set pg_config path in configure step instead of legacy PSQL_LIBS environment variable. Fixes [1]: PostgreSQL support cannot be enabled due to functionality tests! Turn on verbose messaging (-v) to ./configure to see the final report. If you believe this message is in error you may use the continue switch (-continue) to ./configure to continue. make: *** [/ssd1/thomas/autobuild/instance-0/output/build/qt-4.8.6/.stamp_configured] Error 101 Patch suggested upstream ([2]). [1] http://autobuild.buildroot.net/results/1e9/1e949d4593836bc45a55e071cc54ff9c00fad8ae [2] https://codereview.qt-project.org/108345 Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-03-11 22:23:31 +01:00
QT_CONFIGURE_OPTS += -qt-sql-psql -psql_config $(STAGING_DIR)/usr/bin/pg_config
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += postgresql
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: add option for system sqlite Add an option to use the system sqlite library. Also drop sqlite2 stub since it's pointless. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-01 15:34:00 +01:00
ifeq ($(BR2_PACKAGE_QT_SQLITE_QT),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-sql-sqlite
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
qt: add option for system sqlite Add an option to use the system sqlite library. Also drop sqlite2 stub since it's pointless. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-01 15:34:00 +01:00
ifeq ($(BR2_PACKAGE_QT_SQLITE_SYSTEM),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -system-sqlite
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += sqlite
qt: add option for system sqlite Add an option to use the system sqlite library. Also drop sqlite2 stub since it's pointless. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-01 15:34:00 +01:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-sql-sqlite
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: add option for system sqlite Add an option to use the system sqlite library. Also drop sqlite2 stub since it's pointless. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-01 15:34:00 +01:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_SQLITE2),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -qt-sql-sqlite2
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
else
# By default, no SQL driver is turned on by configure.
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
# but it seems sqlite isn't disabled despite what says
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
# configure --help
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-sql-sqlite
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -xmlpatterns -exceptions
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-xmlpatterns
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -multimedia
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-multimedia
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_AUDIO_BACKEND),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -audio-backend
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += alsa-lib
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-audio-backend
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_PHONON),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -phonon
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_DEPENDENCIES += gstreamer gst-plugins-base
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-phonon
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
ifeq ($(BR2_PACKAGE_QT_PHONON_BACKEND),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -phonon-backend
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-phonon-backend
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_SVG),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -svg
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-svg
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -webkit
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-webkit
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -script
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-script
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -scripttools
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-scripttools
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_STL),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -stl
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
else
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-stl
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
Qt: add config option to build libQtDeclarative module Signed-off-by: Daniel Mack <zonque@gmail.com> Acked-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-31 18:16:34 +02:00
ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
QT_CONFIGURE_OPTS += -declarative
else
QT_CONFIGURE_OPTS += -no-declarative
endif
qt: disable precompiled headers to workaround compilation failure Precompiled header implementation is buggy in current Qt as described at http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. The only known workaround is currently to add -no-pch to configure. Fixes build failure terminating with error compiling ../3rdparty/pixman/pixman-arm-neon-asm.S cc1: fatal error: .pch/release-shared-emb-arm/QtGui: No such file or directory compilation terminated. such as: http://autobuild.buildroot.net/results/648265012591280fa592a239f86ee39aec2d5fa6/build-end.log Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-18 10:39:32 +01:00
# -no-pch is needed to workaround the issue described at
# http://comments.gmane.org/gmane.comp.lib.qt.devel/5933.
# In addition, ccache and precompiled headers don't play well together
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
QT_CONFIGURE_OPTS += -no-pch
qt: disable precompiled headers when ccache is enabled ccache and precompiled headers don't work together, so disable precompiled headers when ccache is enabled. The benefit of ccache compiling Qt a second or more time is much higher than the costs of disabled precompiled headers in the first run. Signed-off-by: Michael Roth <mroth@nessie.de> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-07 11:20:39 +02:00
qt: Re-enable workaround for building on x86 for x86 target, also check for x86_64 [Peter: combined x86 + x86-64 logic, simplified] Signed-off-by: Ormund Williams <ormundw@panix.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-13 23:55:52 +01:00
# x86x86fix
# Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux
# host. It's unclear if this would happen on other hosts.
qt: update x86x86fix for 32bit pc hosts The recent change to use config.guess to figure out GNU_HOST_NAME broken the x86x86fix detection for 32bit hosts, as config.guess returns something like i686-pc-linux-gnu rather than something with *-unknown-linux-* like we used to use. Fix it by simply looking for "linux" instead. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-21 08:53:34 +02:00
ifneq ($(findstring linux,$(GNU_HOST_NAME)),)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifneq ($(findstring x86,$(QT_EMB_PLATFORM)),)
QT_CONFIGURE_OPTS += -platform linux-g++
qt: Re-enable workaround for building on x86 for x86 target, also check for x86_64 [Peter: combined x86 + x86-64 logic, simplified] Signed-off-by: Ormund Williams <ormundw@panix.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-01-13 23:55:52 +01:00
endif
endif
# End of workaround.
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
# Variable for other Qt applications to use
packages: remove all := signs Finally get rid of all := used for variable definitions in packages, as we suggest in our manual and during the review of new packages. While I was at it, I also sometimes added a few missing new lines between the header and the first variable definition. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-01-20 10:45:47 +01:00
QT_QMAKE = $(HOST_DIR)/usr/bin/qmake -spec qws/linux-$(QT_EMB_PLATFORM)-g++
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
################################################################################
qt: ensure cross pkg-config is used Closes #4297 Tweak qmake.conf to ensure our cross pkg-config is used, instead of whatever is first in the path. In order to do this, tweak the QT_QMAKE_SET to be able to handle variables which aren't prefixed with QMAKE_. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-18 12:08:02 +01:00
# QT_QMAKE_SET -- helper macro to set <variable> = <value> in
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
# the qmake.conf file. Will remove existing variable declaration if
# available.
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
#
qt: ensure cross pkg-config is used Closes #4297 Tweak qmake.conf to ensure our cross pkg-config is used, instead of whatever is first in the path. In order to do this, tweak the QT_QMAKE_SET to be able to handle variables which aren't prefixed with QMAKE_. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-18 12:08:02 +01:00
# Argument 1 is the variable name
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
# Argument 2 is the value to set variable to
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
# Argument 3 is the base source directory of Qt
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
#
# E.G. use like this:
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
# $(call QT_QMAKE_SET,variable,value,directory)
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
################################################################################
define QT_QMAKE_SET
qt: ensure cross pkg-config is used Closes #4297 Tweak qmake.conf to ensure our cross pkg-config is used, instead of whatever is first in the path. In order to do this, tweak the QT_QMAKE_SET to be able to handle variables which aren't prefixed with QMAKE_. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-18 12:08:02 +01:00
$(SED) '/$(1)/d' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
$(SED) '/include.*qws.conf/a$(1) = $(2)' $(3)/mkspecs/qws/linux-$(QT_EMB_PLATFORM)-g++/qmake.conf
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endef
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifneq ($(BR2_INET_IPV6),y)
define QT_CONFIGURE_IPV6
$(SED) 's/^CFG_IPV6=auto/CFG_IPV6=no/' $(@D)/configure
$(SED) 's/^CFG_IPV6IFNAME=auto/CFG_IPV6IFNAME=no/' $(@D)/configure
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endef
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifneq ($(QT_CONFIG_FILE),)
define QT_CONFIGURE_CONFIG_FILE
cp $(QT_CONFIG_FILE) $(@D)/src/corelib/global/qconfig-buildroot.h
endef
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
define QT_CONFIGURE_CMDS
-[ -f $(@D)/Makefile ] && $(MAKE) -C $(@D) confclean
$(QT_CONFIGURE_IPV6)
$(QT_CONFIGURE_CONFIG_FILE)
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
# Fix compiler path
qt: ensure cross pkg-config is used Closes #4297 Tweak qmake.conf to ensure our cross pkg-config is used, instead of whatever is first in the path. In order to do this, tweak the QT_QMAKE_SET to be able to handle variables which aren't prefixed with QMAKE_. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-18 12:08:02 +01:00
$(call QT_QMAKE_SET,QMAKE_CC,$(TARGET_CC),$(@D))
$(call QT_QMAKE_SET,QMAKE_CXX,$(TARGET_CXX),$(@D))
$(call QT_QMAKE_SET,QMAKE_LINK,$(TARGET_CXX),$(@D))
$(call QT_QMAKE_SET,QMAKE_LINK_SHLIB,$(TARGET_CXX),$(@D))
$(call QT_QMAKE_SET,QMAKE_AR,$(TARGET_AR) cqs,$(@D))
$(call QT_QMAKE_SET,QMAKE_OBJCOPY,$(TARGET_OBJCOPY),$(@D))
$(call QT_QMAKE_SET,QMAKE_RANLIB,$(TARGET_RANLIB),$(@D))
$(call QT_QMAKE_SET,QMAKE_STRIP,$(TARGET_STRIP),$(@D))
$(call QT_QMAKE_SET,QMAKE_CFLAGS,$(QT_CFLAGS),$(@D))
$(call QT_QMAKE_SET,QMAKE_CXXFLAGS,$(QT_CXXFLAGS),$(@D))
qt: fix build with opengl es Fixes http://autobuild.buildroot.net/results/efe/efe26c54361094fb1e201da6915900cd9b24d596/ qt doesn't use pkg-config to figure out the needed compiler/linker flags for egl, so pass them explicitly instead. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-11-29 11:25:25 +01:00
$(call QT_QMAKE_SET,QMAKE_LFLAGS,$(QT_LDFLAGS),$(@D))
qt: ensure cross pkg-config is used Closes #4297 Tweak qmake.conf to ensure our cross pkg-config is used, instead of whatever is first in the path. In order to do this, tweak the QT_QMAKE_SET to be able to handle variables which aren't prefixed with QMAKE_. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-11-18 12:08:02 +01:00
$(call QT_QMAKE_SET,PKG_CONFIG,$(HOST_DIR)/usr/bin/pkg-config,$(@D))
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
# Don't use TARGET_CONFIGURE_OPTS here, qmake would be compiled for the target
qt: remove PKG_CONFIG workaround At least Qt 4.5.2 is fixed in the meantime and honors PKG_CONFIG. So the PATH workaround is no longer needed. Signed-off-by: Michael Roth <mroth@nessie.de> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-07 11:20:30 +02:00
# instead of the host then. So set PKG_CONFIG* manually.
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
(cd $(@D); \
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
qt: remove PKG_CONFIG workaround At least Qt 4.5.2 is fixed in the meantime and honors PKG_CONFIG. So the PATH workaround is no longer needed. Signed-off-by: Michael Roth <mroth@nessie.de> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-07 11:20:30 +02:00
PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
qt: add postgresql driver support Signed-off-by: Floris Bos <bos@je-eigen-domein.nl> Reviewed-by: Fatih Aşıcı <fatih.asici@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-08-13 16:05:42 +02:00
$(QT_CONFIGURE_ENV) \
qt: change use of BR2_JLEVEL to PARALLEL_JOBS Signed-off-by: Nathan Lynch <ntl@pobox.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-11 18:09:41 +02:00
MAKEFLAGS="$(MAKEFLAGS) -j$(PARALLEL_JOBS)" ./configure \
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
$(if $(VERBOSE),-verbose,-silent) \
-force-pkg-config \
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
$(QT_CONFIGURE_OPTS) \
qt: use configure option instead a sed hack to disable xinerama The Qt configure script gained the option '-no-xinerama' in the meantime. So use it instead hacking the script itself using sed. Signed-off-by: Michael Roth <mroth@nessie.de> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-07 11:20:36 +02:00
-no-xinerama \
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
-no-cups \
-no-nis \
-no-accessibility \
-no-separate-debug-info \
-prefix /usr \
qt: fix plugin installation and change plugin path Since the conversion of Qt to GENTARGETS in 421cda1fd078f5fa7902f05bd1d2021fd101d9ea, plugin installation could break in some situations, for example if SQL support was enabled, but without any SQL driver: the sql plugin directory doesn't exist, but our qt.mk wanted to copy it. This patches simplifies the plugin handling a bit, and basically copies all Qt plugins installed in the $(STAGING_DIR) to the $(TARGET_DIR), assuming Qt has only built and installed the needed plugins. Moreover, instead of installing plugins to usr/plugins, which is a odd location, we install them in usr/lib/qt/plugins. This requires a small patch to Qt ./configure script so that even when -hostprefix is used, the -plugindir option is taken into account. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-04-03 17:19:00 +02:00
-plugindir /usr/lib/qt/plugins \
qt: install QML imports on target When selecting the Qt declarative module, all the QML imports was built and installed to staging, but never installed to the target. Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Acked-by: Alexander Lukichev <alexander.lukichev@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-20 01:18:51 +01:00
-importdir /usr/lib/qt/imports \
qt: install translations The Qt translation files are currently created and moved under $(STAGING_DIR)/usr/translations but not installed on the target. This patch defines the translations directory to /usr/share/qt/translations and defines a QT_INSTALL_TARGET_TRANSLATIONS macro to deploy them from the staging directory to the target directory. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-12 21:12:36 +02:00
-translationdir /usr/share/qt/translations \
qt: fix plugin installation and change plugin path Since the conversion of Qt to GENTARGETS in 421cda1fd078f5fa7902f05bd1d2021fd101d9ea, plugin installation could break in some situations, for example if SQL support was enabled, but without any SQL driver: the sql plugin directory doesn't exist, but our qt.mk wanted to copy it. This patches simplifies the plugin handling a bit, and basically copies all Qt plugins installed in the $(STAGING_DIR) to the $(TARGET_DIR), assuming Qt has only built and installed the needed plugins. Moreover, instead of installing plugins to usr/plugins, which is a odd location, we install them in usr/lib/qt/plugins. This requires a small patch to Qt ./configure script so that even when -hostprefix is used, the -plugindir option is taken into account. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-04-03 17:19:00 +02:00
-hostprefix $(STAGING_DIR) \
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
-fast \
-no-rpath \
)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
endef
define QT_BUILD_CMDS
qt: bump version Webkit support runs pkg-config at build time, so we need to ensure our version gets picked up. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-02-25 22:52:02 +01:00
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
endef
# Build the list of libraries and plugins to install to the target
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtCore
QT_HOST_PROGRAMS += moc rcc qmake lrelease
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
qt: move host programs and specs in HOST_DIR The Qt build system installs all host programs (uic, rcc, moc, qmake, etc.) in the same base directory as the headers and libraries, but that's not great for Buildroot. So we now move the host programs and the mkspecs files to the $(HOST_DIR), and create a qt.conf, which tells qmake where everything is located. Tested with Qmake and Cmake as build system for a simple Qt application. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-07 18:18:00 +01:00
ifeq ($(BR2_PACKAGE_QT_GUI_MODULE),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtGui
QT_HOST_PROGRAMS += uic
qt: move host programs and specs in HOST_DIR The Qt build system installs all host programs (uic, rcc, moc, qmake, etc.) in the same base directory as the headers and libraries, but that's not great for Buildroot. So we now move the host programs and the mkspecs files to the $(HOST_DIR), and create a qt.conf, which tells qmake where everything is located. Tested with Qmake and Cmake as build system for a simple Qt application. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-07 18:18:00 +01:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_SQL_MODULE),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtSql
package/qt: add font selection Commit f98547622 (make sure to install all Qt-fonts and true-type-fonts) changed Qt to install all .qpf fonts to the target instead of only a hardcoded subset. Some of those fonts are unfortunately quite big (1-2MB) and are not always needed (japanese, unicode). Instead add a font selection in Kconfig similar to how it is done for pixel depths, and default to the subset we were previously using. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-14 16:54:46 +01:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_MULTIMEDIA),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtMultimedia
qt: make sure to install all Qt-fonts and true-type-fonts Qt gained some more qpf-fonts and also provides some true-type-fonts. Make sure to install them all inclusive ttf-fonts when freetype-support is enabled. Additionally the empty 'fontdir' file is really not needed. Signed-off-by: Michael Roth <mroth@nessie.de> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-10-07 11:20:38 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_PHONON),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += phonon
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_SVG),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtSvg
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_NETWORK),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtNetwork
qt: fix libQtMultimedia installation With BR2_PACKAGE_QT_MULTIMEDIA=y, libQtMultimedia.so.* was not copied to the target directory. Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-03 22:31:02 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_WEBKIT),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtWebKit
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_XML),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtXml
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_DBUS),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtDBus
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_XMLPATTERNS),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtXmlPatterns
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_SCRIPT),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtScript
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_SCRIPTTOOLS),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtScriptTools
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
Qt: add config option to build libQtDeclarative module Signed-off-by: Daniel Mack <zonque@gmail.com> Acked-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-31 18:16:34 +02:00
ifeq ($(BR2_PACKAGE_QT_DECLARATIVE),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtDeclarative
Qt: add config option to build libQtDeclarative module Signed-off-by: Daniel Mack <zonque@gmail.com> Acked-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-05-31 18:16:34 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_QT3SUPPORT),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += Qt3Support
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
endif
qt: add powervr and opengl Use the following to test: /usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Sundareson, Prabindh <prabu@ti.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Sinan Akpolat <sinan@linkas.com.tr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-15 23:44:20 +02:00
ifeq ($(BR2_PACKAGE_QT_OPENGL_ES),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtOpenGL
qt: add powervr and opengl Use the following to test: /usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Sundareson, Prabindh <prabu@ti.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Sinan Akpolat <sinan@linkas.com.tr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-15 23:44:20 +02:00
endif
ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += pvrQWSWSEGL
qt: add powervr and opengl Use the following to test: /usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Sundareson, Prabindh <prabu@ti.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Sinan Akpolat <sinan@linkas.com.tr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-15 23:44:20 +02:00
endif
qt: add an option to install the test module When building Qt in a minimal configuration, a couple of Qt modules (QtNetwork, QtSql, QtTest and QtXml) are built in addition to QtCore, so they are installed in the sysroot but they are not copied into the target tree. Among these modules that could be built but optionally installed, only QtTest had no option to allow being installed in the target fs. Thus, programs linking against QtTest would successfully build, but would miserably fail at runtime due to this missing dependency. So far, the only package triggering this issue is OpenCV (the highgui module built with Qt support). A followup patch will add this missing dependency in OpenCV using this new option. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-23 01:15:33 +02:00
ifeq ($(BR2_PACKAGE_QT_TEST),y)
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_INSTALL_LIBS += QtTest
qt: add an option to install the test module When building Qt in a minimal configuration, a couple of Qt modules (QtNetwork, QtSql, QtTest and QtXml) are built in addition to QtCore, so they are installed in the sysroot but they are not copied into the target tree. Among these modules that could be built but optionally installed, only QtTest had no option to allow being installed in the target fs. Thus, programs linking against QtTest would successfully build, but would miserably fail at runtime due to this missing dependency. So far, the only package triggering this issue is OpenCV (the highgui module built with Qt support). A followup patch will add this missing dependency in OpenCV using this new option. Signed-off-by: Samuel Martin <s.martin49@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-04-23 01:15:33 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
.mk files: bulk aligment and whitespace cleanup of assignments The Buildroot coding style defines one space around make assignments and does not align the assignment symbols. This patch does a bulk fix of offending packages. The package infrastructures (or more in general assignments to calculated variable names, like $(2)_FOO) are not touched. Alignment of line continuation characters (\) is kept as-is. The sed command used to do this replacement is: find * -name "*.mk" | xargs sed -i \ -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*$#\1 \2#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\]\+\)$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\s*\([^\\ \t]\+\s*\\\)\s*$#\1 \2 \3#' -e 's#^\([A-Z0-9a-z_]\+\)\s*\([?:+]\?=\)\(\s*\\\)#\1 \2\3#' Brief explanation of this command: ^\([A-Z0-9a-z_]\+\) a regular variable at the beginning of the line \([?:+]\?=\) any assignment character =, :=, ?=, += \([^\\]\+\) any string not containing a line continuation \([^\\ \t]\+\s*\\\) string, optional whitespace, followed by a line continuation character \(\s*\\\) optional whitespace, followed by a line continuation character Hence, the first subexpression handles empty assignments, the second handles regular assignments, the third handles regular assignments with line continuation, and the fourth empty assignments with line continuation. This expression was tested on following test text: (initial tab not included) FOO = spaces before FOO = spaces before and after FOO = tab before FOO = tab and spaces before FOO = tab after FOO = tab and spaces after FOO = spaces and tab after FOO = \ FOO = bar \ FOO = bar space \ FOO = \ GENIMAGE_DEPENDENCIES = host-pkgconf libconfuse FOO += spaces before FOO ?= spaces before and after FOO := FOO = FOO = FOO = FOO = $(MAKE1) CROSS_COMPILE=$(TARGET_CROSS) -C AT91BOOTSTRAP3_DEFCONFIG = \ AXEL_DISABLE_I18N=--i18n=0 After this bulk change, following manual fixups were done: - fix line continuation alignment in cegui06 and spice (the sed expression leaves the number of whitespace between the value and line continuation character intact, but the whitespace before that could have changed, causing misalignment. - qt5base was reverted, as this package uses extensive alignment which actually makes the code more readable. Finally, the end result was manually reviewed. Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Cc: Yann E. Morin <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-10-07 09:06:03 +02:00
QT_CONF_FILE = $(HOST_DIR)/usr/bin/qt.conf
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
# Since host programs and spec files have been moved to $(HOST_DIR),
# we need to tell qmake the new location of the various elements,
# through a qt.conf file.
define QT_INSTALL_QT_CONF
mkdir -p $(dir $(QT_CONF_FILE))
echo "[Paths]" > $(QT_CONF_FILE)
echo "Prefix=$(HOST_DIR)/usr" >> $(QT_CONF_FILE)
echo "Headers=$(STAGING_DIR)/usr/include" >> $(QT_CONF_FILE)
echo "Libraries=$(STAGING_DIR)/usr/lib" >> $(QT_CONF_FILE)
echo "Data=$(HOST_DIR)/usr" >> $(QT_CONF_FILE)
echo "Binaries=$(HOST_DIR)/usr/bin" >> $(QT_CONF_FILE)
endef
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
# After running Qt normal installation process (which installs
# everything in the STAGING_DIR), we move host programs such as qmake,
# rcc or uic to the HOST_DIR so that they are available at the usual
# location. A qt.conf file is generated to make sure that all host
qt: tune .pc files after installation in staging directory The Qt configuration and installation process is a bit strange, and it leads the .pc files to contain absolute paths to the staging directory, while it should only contains paths relative to the staging directory, because pkg-config already adds the path of the sysroot automatically to the headers and libraries locations. This allows the 'pkg-config --cflags' results for Qt libraries to be correct. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-25 00:05:44 +02:00
# programs still find all files they need. The .pc files are tuned to
# remove the sysroot path from them, since pkg-config already adds it
# automatically.
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
define QT_INSTALL_STAGING_CMDS
$(MAKE) -C $(@D) install
mkdir -p $(HOST_DIR)/usr/bin
mv $(addprefix $(STAGING_DIR)/usr/bin/,$(QT_HOST_PROGRAMS)) $(HOST_DIR)/usr/bin
qt: make $(HOST_DIR)/usr/mkspecs a symlink to $(STAGING_DIR)/usr/mkspecs In fact, not only qt can install stuff in $(STAGING_DIR)/usr/mkspecs, but also libraries that wish to integrate with qmake, such as qwt. However, qmake and al. will look inside $(HOST_DIR)/usr/mkspecs, so the easiest solution is to have a symbolic link between the two directories, instead of copying things around. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-06-02 08:13:59 +02:00
ln -sf $(STAGING_DIR)/usr/mkspecs $(HOST_DIR)/usr/mkspecs
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
$(QT_INSTALL_QT_CONF)
qt: tune .pc files after installation in staging directory The Qt configuration and installation process is a bit strange, and it leads the .pc files to contain absolute paths to the staging directory, while it should only contains paths relative to the staging directory, because pkg-config already adds the path of the sysroot automatically to the headers and libraries locations. This allows the 'pkg-config --cflags' results for Qt libraries to be correct. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-25 00:05:44 +02:00
for i in moc uic rcc lupdate lrelease ; do \
$(SED) "s,^$${i}_location=.*,$${i}_location=$(HOST_DIR)/usr/bin/$${i}," \
$(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc ; \
done
$(SED) "s,$(STAGING_DIR)/,,g" $(STAGING_DIR)/usr/lib/pkgconfig/Qt*.pc
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
endef
qt: bump version qt 4.6.x has a number of new configure options, and needs a patch to work on uClibc. Signed-off-by: Frederik Vannoote <frederik.vannoote@barco.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-04-02 15:33:28 +02:00
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
# Library installation
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
ifeq ($(BR2_PACKAGE_QT_SHARED),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
define QT_INSTALL_TARGET_LIBS
qt: ensure that target dir exists before installing there All of qt.mk's target installs ensure that their destinations exist, except for /usr/lib. So do the same for /usr/lib, for consistency, and in case some combination of custom fs skeleton plus dependency on Qt leads to installing without a pre-existing /usr/lib directory. Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-03-25 02:05:17 +01:00
mkdir -p $(TARGET_DIR)/usr/lib
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
for lib in $(QT_INSTALL_LIBS); do \
cp -dpf $(STAGING_DIR)/usr/lib/lib$${lib}.so.* $(TARGET_DIR)/usr/lib ; \
done
endef
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
# Plugin installation
define QT_INSTALL_TARGET_PLUGINS
qt: fix plugin installation and change plugin path Since the conversion of Qt to GENTARGETS in 421cda1fd078f5fa7902f05bd1d2021fd101d9ea, plugin installation could break in some situations, for example if SQL support was enabled, but without any SQL driver: the sql plugin directory doesn't exist, but our qt.mk wanted to copy it. This patches simplifies the plugin handling a bit, and basically copies all Qt plugins installed in the $(STAGING_DIR) to the $(TARGET_DIR), assuming Qt has only built and installed the needed plugins. Moreover, instead of installing plugins to usr/plugins, which is a odd location, we install them in usr/lib/qt/plugins. This requires a small patch to Qt ./configure script so that even when -hostprefix is used, the -plugindir option is taken into account. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-04-03 17:19:00 +02:00
if [ -d $(STAGING_DIR)/usr/lib/qt/plugins/ ] ; then \
mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins ; \
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/* $(TARGET_DIR)/usr/lib/qt/plugins ; \
fi
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
endef
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
qt: install QML imports on target When selecting the Qt declarative module, all the QML imports was built and installed to staging, but never installed to the target. Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Acked-by: Alexander Lukichev <alexander.lukichev@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-20 01:18:51 +01:00
# Import installation
define QT_INSTALL_TARGET_IMPORTS
if [ -d $(STAGING_DIR)/usr/lib/qt/imports/ ] ; then \
mkdir -p $(TARGET_DIR)/usr/lib/qt/imports ; \
cp -dpfr $(STAGING_DIR)/usr/lib/qt/imports/* $(TARGET_DIR)/usr/lib/qt/imports ; \
fi
endef
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
# Fonts installation
qt: add X11 support There are two possible configurations for Qt4 installation: standard (with X11) and embedded (for framebuffer). Both configurations cannot be used together for one installation and some options are specific to one configuration or the other. Add a choice to select the standard or the embedded installation to add X11 support. The integration is done in order to make maximum use of the current configuration logic, for example by using the same mkspecs files. Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-07-15 18:30:56 +02:00
ifeq ($(BR2_PACKAGE_QT_EMBEDDED),y)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifneq ($(QT_FONTS),)
define QT_INSTALL_TARGET_FONTS
mkdir -p $(TARGET_DIR)/usr/lib/fonts
cp -dpf $(QT_FONTS) $(TARGET_DIR)/usr/lib/fonts
endef
qt: install qt3 support lib to target if enabled Signed-off-by: Karl Krach <mailinglists@blueSpirit.la> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-09 14:55:02 +02:00
endif
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
ifeq ($(BR2_PACKAGE_QT_QTFREETYPE)$(BR2_PACKAGE_QT_SYSTEMFREETYPE),y)
define QT_INSTALL_TARGET_FONTS_TTF
mkdir -p $(TARGET_DIR)/usr/lib/fonts
cp -dpf $(STAGING_DIR)/usr/lib/fonts/*.ttf $(TARGET_DIR)/usr/lib/fonts
endef
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
endif
qt: add X11 support There are two possible configurations for Qt4 installation: standard (with X11) and embedded (for framebuffer). Both configurations cannot be used together for one installation and some options are specific to one configuration or the other. Add a choice to select the standard or the embedded installation to add X11 support. The integration is done in order to make maximum use of the current configuration logic, for example by using the same mkspecs files. Signed-off-by: Hadrien Boutteville <hadrien.boutteville@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: "Yann E. MORIN" <yann.morin.1998@free.fr> Tested-by: Gwenhael Goavec-Merou <gwenhael.goavec-merou@trabucayre.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-07-15 18:30:56 +02:00
endif # BR2_PACKAGE_QT_EMBEDDED
qt: rename qtopia4 to qt A while ago, Trolltech (now part of Nokia) included Qtopia directly inside Qt. So let's rename the qtopia4 package to simply qt, which will be more familiar to our users. Of course, the version we compile is Qt for Embedded Linux. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:05:35 +02:00
qt: add powervr and opengl Use the following to test: /usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Sundareson, Prabindh <prabu@ti.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Sinan Akpolat <sinan@linkas.com.tr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-15 23:44:20 +02:00
ifeq ($(BR2_PACKAGE_QT_GFX_POWERVR),y)
define QT_INSTALL_TARGET_POWERVR
# Note: this overwrites the default powervr.ini provided by the ti-gfx
# package.
$(INSTALL) -D -m 0644 package/qt/powervr.ini \
$(TARGET_DIR)/etc/powervr.ini
endef
endif
qt: make installation of translation files optional Commit 93917b6980f7f2b51302e1a3fa451b07cf7d674e introduced the installation of the binary .qm translation files, unconditionally. This patch introduces an option to disable this behavior, saving almost 8MB of space. [Thomas: rename option to BR2_PACKAGE_QT_TRANSLATION_FILES instead of BR2_PACKAGE_QT_INSTALL_TRANSLATION_FILES, and move its definition around the installation of examples/demos rather than in the middle of the options for the different modules.] Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-08-02 05:08:56 +02:00
ifeq ($(BR2_PACKAGE_QT_TRANSLATION_FILES),y)
qt: install translations The Qt translation files are currently created and moved under $(STAGING_DIR)/usr/translations but not installed on the target. This patch defines the translations directory to /usr/share/qt/translations and defines a QT_INSTALL_TARGET_TRANSLATIONS macro to deploy them from the staging directory to the target directory. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-12 21:12:36 +02:00
define QT_INSTALL_TARGET_TRANSLATIONS
if [ -d $(STAGING_DIR)/usr/share/qt/translations/ ] ; then \
mkdir -p $(TARGET_DIR)/usr/share/qt/translations ; \
cp -dpfr $(STAGING_DIR)/usr/share/qt/translations/* $(TARGET_DIR)/usr/share/qt/translations ; \
fi
endef
qt: make installation of translation files optional Commit 93917b6980f7f2b51302e1a3fa451b07cf7d674e introduced the installation of the binary .qm translation files, unconditionally. This patch introduces an option to disable this behavior, saving almost 8MB of space. [Thomas: rename option to BR2_PACKAGE_QT_TRANSLATION_FILES instead of BR2_PACKAGE_QT_INSTALL_TRANSLATION_FILES, and move its definition around the installation of examples/demos rather than in the middle of the options for the different modules.] Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-08-02 05:08:56 +02:00
endif
qt: install translations The Qt translation files are currently created and moved under $(STAGING_DIR)/usr/translations but not installed on the target. This patch defines the translations directory to /usr/share/qt/translations and defines a QT_INSTALL_TARGET_TRANSLATIONS macro to deploy them from the staging directory to the target directory. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-12 21:12:36 +02:00
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
define QT_INSTALL_TARGET_CMDS
$(QT_INSTALL_TARGET_LIBS)
$(QT_INSTALL_TARGET_PLUGINS)
qt: install QML imports on target When selecting the Qt declarative module, all the QML imports was built and installed to staging, but never installed to the target. Signed-off-by: Daniel Nyström <daniel.nystrom@timeterminal.se> Acked-by: Alexander Lukichev <alexander.lukichev@gmail.com> Acked-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-02-20 01:18:51 +01:00
$(QT_INSTALL_TARGET_IMPORTS)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
$(QT_INSTALL_TARGET_FONTS)
$(QT_INSTALL_TARGET_FONTS_TTF)
qt: add powervr and opengl Use the following to test: /usr/share/qt/examples/opengl/hellogl_es2/hellogl_es2 -qws -display powervr Signed-off-by: Spenser Gilliland <spenser@gillilanding.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Sundareson, Prabindh <prabu@ti.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Sinan Akpolat <sinan@linkas.com.tr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-07-15 23:44:20 +02:00
$(QT_INSTALL_TARGET_POWERVR)
qt: install translations The Qt translation files are currently created and moved under $(STAGING_DIR)/usr/translations but not installed on the target. This patch defines the translations directory to /usr/share/qt/translations and defines a QT_INSTALL_TARGET_TRANSLATIONS macro to deploy them from the staging directory to the target directory. Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com> Reviewed-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-09-12 21:12:36 +02:00
$(QT_INSTALL_TARGET_TRANSLATIONS)
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: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Luca Ceresoli <luca@lucaceresoli.net> Acked-by: Will Wagner <willw@carallon.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-20 15:19:12 +01:00
endef
all packages: rename XXXTARGETS to xxx-package Also remove the redundant $(call ...). This is a purely mechanical change, performed with find package linux toolchain boot -name \*.mk | \ xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \ -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \ -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-03 00:07:32 +02:00
$(eval $(generic-package))
Reference in New Issue Copy Permalink