summaryrefslogtreecommitdiffstats
path: root/package/qt/qt.mk
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'next'Peter Korsgaard2013-03-011-0/+10
|\
| * qt: install QML imports on targetDaniel Nyström2013-02-271-0/+10
| | | | | | | | | | | | | | | | | | | | | | 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>
* | qt: disable precompiled headers to workaround compilation failureLuca Ceresoli2013-02-181-3/+3
|/ | | | | | | | | | | | | | | | | 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>
* packages: remove all := signsThomas Petazzoni2013-01-201-2/+2
| | | | | | | | | | | 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>
* qt: bump version to latest 4.8.4Sagaert Johan2013-01-131-1/+1
| | | | | Signed-off-by: Sagaert Johan <sagaert.johan@skynet.be> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: fix qconfig configure parameterFrank Hunleth2012-12-141-1/+1
| | | | | | | | | 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>
* packages: switch to host-pkgconfGustavo Zacarias2012-10-291-1/+1
| | | | | | 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>
* qt: bump versionPeter Korsgaard2012-09-131-1/+1
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: tune .pc files after installation in staging directoryThomas Petazzoni2012-07-251-1/+8
| | | | | | | | | | | | | 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>
* all packages: rename XXXTARGETS to xxx-packageArnout Vandecappelle (Essensium/Mind)2012-07-171-1/+1
| | | | | | | | | | | | | 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>
* qt: change use of BR2_JLEVEL to PARALLEL_JOBSNathan Lynch2012-06-241-1/+1
| | | | | Signed-off-by: Nathan Lynch <ntl@pobox.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: bump to 4.8.2Luca Ceresoli2012-06-201-2/+2
| | | | | | | Also switch to the new upstream URL. Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: remove redundant and incorrect URL from MakefileLuca Ceresoli2012-06-201-1/+0
| | | | | | | | | | The upstream URL for Buildroot packages is usually visible in the Config.in file, not in comments in the Makefile. Moreover, this URL does not point to the correct upstream project. Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: make $(HOST_DIR)/usr/mkspecs a symlink to $(STAGING_DIR)/usr/mkspecsThomas Petazzoni2012-06-111-2/+1
| | | | | | | | | | | 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>
* qt: bump versionPeter Korsgaard2012-04-041-1/+1
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: fix build with gcc 4.6.x on armPeter Korsgaard2012-02-261-0/+5
| | | | | | | As noted by Ismael Luceno. For details, see: http://gcc.gnu.org/ml/gcc-patches/2010-11/msg02245.html Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: simplify arch handlingIsmael Luceno2012-02-261-6/+2
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: bump versionPeter Korsgaard2012-02-251-8/+6
| | | | | | | 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>
* qt: needs host-pkg-configFrederik Pasch2012-02-091-1/+1
| | | | | | Closes #4760 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: ensure cross pkg-config is usedPeter Korsgaard2011-11-181-15/+16
| | | | | | | | | | | 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>
* package: remove useless arguments from GENTARGETSThomas Petazzoni2011-09-291-1/+1
| | | | | | | | | | Thanks to the pkgparentdir and pkgname functions, we can rewrite the GENTARGETS macro in a way that avoids the need for each package to repeat its name and the directory in which it is present. [Peter: pkgdir->pkgparentdir] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: bump versionPeter Korsgaard2011-09-171-1/+1
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: fix webkit/sqlite build without largefile supportPeter Korsgaard2011-06-271-2/+13
| | | | | | | | | | | 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>
* Qt: add config option to build libQtDeclarative moduleDaniel Mack2011-06-201-0/+9
| | | | | | 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>
* qt: bump versionPeter Korsgaard2011-05-161-1/+1
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* Get rid of unneeded CFLAGSPeter Korsgaard2011-05-051-4/+4
| | | | | | | | Now that we use a wrapper for external toolchains (and internal ones default to the correct setting), we no longer need to explicitly pass sysroot/march/mtune/mabi/floating point mode in TARGET_CFLAGS. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: speed up qmake buildThomas Petazzoni2011-04-031-1/+1
| | | | | | | | | | qmake is built during the execution of Qt ./configure script, so it is built just with a normal make, not taking advantage of parallel compilation. Passing MAKEFLAGS=-j$(BR2_JLEVEL) allows to speed up the qmake compilation process quite a bit. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: fix plugin installation and change plugin pathThomas Petazzoni2011-04-031-9/+6
| | | | | | | | | | | | | | | | | | | | | 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>
* qt: fix qt3 support target installPeter Korsgaard2011-03-291-1/+1
| | | | | | | "lib" shouldn't be prefixed, otherwise the make file tries to install liblibQt3Support.so.*. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: convert to the GENTARGETS infrastructureThomas Petazzoni2011-03-281-336/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* qt: add option for system sqliteGustavo Zacarias2011-03-051-1/+6
| | | | | | | | 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>
* qt: bump versionPeter Korsgaard2011-03-011-1/+1
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: add option to hide mouse cursorDaniel Nyström2011-02-251-0/+3
| | | | | | | | 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>
* qt: make QT_QMAKE variable point to HOST_DIR nowGustavo Zacarias2011-02-091-1/+1
| | | | | Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: move host programs and specs in HOST_DIRThomas Petazzoni2011-02-071-1/+17
| | | | | | | | | | | | | | | | 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>
* qt: fix mysql module buildThomas Petazzoni2010-12-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2371 Bug 2371 was a Qt compilation issue when MySQL support was enabled, because the Qt configuration tests were looking at host MySQL libraries. Even though I couldn't reproduce the bug with MySQL libraries installed on my host, there was clearly a problem since -I/usr/include/mysql and -L/usr/lib/mysql were part of the compilation flags when building those tests. This was caused by the fact that /usr/bin/mysql_config was used instead of $(STAGING_DIR)/usr/bin/mysql_config. We fix this by passing the path to the correct mysql_config script using the -mysql_config Qt ./configure argument. Since this mysql_config script returns the correct flags for libraries and headers path, the hardcoded -I and -L flag in qt.mk are no longer needed. With this in place, Qt is no longer compiled with -I/usr/include/mysql and -L/usr/lib/mysql, which presumably should fix the problem reported in bug 2371. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: only build gui module if enabledFrederik Pasch2010-12-081-0/+4
| | | | | | | Closes #2905 Signed-off-by: Frederik Pasch <fpasch@googlemail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: bump to 4.7.1Luca Ceresoli2010-11-221-1/+1
| | | | | Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: bump versionPeter Korsgaard2010-11-081-2/+2
| | | | Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: Bump to 4.6.3Paul Jones2010-09-091-3/+7
| | | | | | | | 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>
* qt: fix sysroot confusion in ./configurePeter Korsgaard2010-08-261-4/+4
| | | | | | | | | | qt's configure script is getting confused now that we're passing --sysroot= in QMAKE_CC / QMAKE_CXX, causing misdetection of features and runtime breakage. Fix it by passing --sysroot in CFLAGS/CXXFLAGS instead. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: fix alsa-lib dependencyLuca Ceresoli2010-07-261-0/+1
| | | | | | | | | | If BR2_PACKAGE_QT_AUDIO_BACKEND=y, QtMultimedia requires the audio backend to be already in staging in order to compile. The backend is system-dependent, but since buildroot builds Linux systems only, it is safe to assume that the it will always be ALSA. Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: fix mysql dependency and disable unavailable sql driversPeter Korsgaard2010-07-161-1/+3
| | | | | | | We don't have the needed dependencies in BR for most of the SQL drivers, so mark those options as broken. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: fix directfb dependencyPeter Korsgaard2010-07-161-0/+1
| | | | | | Closes #2221 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: install qt3 support lib to target if enabledKarl Krach2010-07-091-0/+7
| | | | | Signed-off-by: Karl Krach <mailinglists@blueSpirit.la> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* qt: fix libQtMultimedia installationLuca Ceresoli2010-06-051-0/+8
| | | | | | | | | 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>
* qt: update x86x86fix for 32bit pc hostsPeter Korsgaard2010-05-211-1/+1
| | | | | | | | | | | 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>
* Guess build system and remove BR2_GNU_BUILD_SUFFIXThomas Petazzoni2010-04-111-1/+1
| | | | | | | Instead of having a configuration option BR2_GNU_BUILD_SUFFIX, let's use config.guess to guess the build system type. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* qt: bump versionFrederik Vannoote2010-04-021-35/+64
| | | | | | | | 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>
* qt: Re-enable workaround for building on x86 for x86 target, also check for ↵Ormund Williams2010-01-181-0/+10
| | | | | | | | 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>