summaryrefslogtreecommitdiff
path: root/package/qt/qt.mk
AgeCommit message (Collapse)Author
2011-05-05Get rid of unneeded CFLAGSPeter Korsgaard
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>
2011-04-03qt: speed up qmake buildThomas Petazzoni
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>
2011-04-03qt: fix plugin installation and change plugin pathThomas Petazzoni
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-03-29qt: fix qt3 support target installPeter Korsgaard
"lib" shouldn't be prefixed, otherwise the make file tries to install liblibQt3Support.so.*. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-28qt: convert to the GENTARGETS infrastructureThomas Petazzoni
In addition to converting the qt package to the GENTARGETS infrastructure, this commit also does the following (related) things in the Qt package: * Create a BR2_PACKAGE_QT_CONFIG_FILE option, which can be used to pass a custom Qt configuration file, such as the ones found in src/corelib/global/qconfig-*.h. This used to be possible, but required changing qt.mk directly, which isn't really how we configure things in Buildroot. * Remove the BR2_PACKAGE_QT_EMB_PLATFORM option, the embedded platform name is now computed directly in qt.mk. * The QT_CONFIGURE variable, which hosted all ./configure options, has been renamed to QT_CONFIGURE_OPTS, for consistency with what we do in the AUTOTARGETS infrastructure. * The QT_DEP_LIBS variable has been renamed to QT_DEPENDENCIES, so that dependencies are properly handled by the GENTARGETS infrastructures. * The QT_QMAKE_SET macro (used to adjust the path/flags of the compiler/linker) has been extended with an additional argument, which allows to pass the source directory of Qt. * All the installation procedure has been rewritten to fit within the GENTARGETS mechanism. [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-05qt: add option for system sqliteGustavo Zacarias
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-01qt: bump versionPeter Korsgaard
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-25qt: add option to hide mouse cursorDaniel Nyström
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-09qt: make QT_QMAKE variable point to HOST_DIR nowGustavo Zacarias
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-07qt: move host programs and specs in HOST_DIRThomas Petazzoni
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>
2010-12-22qt: fix mysql module buildThomas Petazzoni
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>
2010-12-08qt: only build gui module if enabledFrederik Pasch
Closes #2905 Signed-off-by: Frederik Pasch <fpasch@googlemail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-22qt: bump to 4.7.1Luca Ceresoli
Signed-off-by: Luca Ceresoli <luca@lucaceresoli.net> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-08qt: bump versionPeter Korsgaard
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-09-09qt: Bump to 4.6.3Paul Jones
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-26qt: fix sysroot confusion in ./configurePeter Korsgaard
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>
2010-07-26qt: fix alsa-lib dependencyLuca Ceresoli
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>
2010-07-16qt: fix mysql dependency and disable unavailable sql driversPeter Korsgaard
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>
2010-07-16qt: fix directfb dependencyPeter Korsgaard
Closes #2221 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-09qt: install qt3 support lib to target if enabledKarl Krach
Signed-off-by: Karl Krach <mailinglists@blueSpirit.la> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-05qt: fix libQtMultimedia installationLuca Ceresoli
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-05-21qt: update x86x86fix for 32bit pc hostsPeter Korsgaard
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-04-11Guess build system and remove BR2_GNU_BUILD_SUFFIXThomas Petazzoni
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>
2010-04-02qt: bump versionFrederik Vannoote
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-01-18qt: Re-enable workaround for building on x86 for x86 target, also check for ↵Ormund Williams
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-12qt: ensure libglib2 is built before qt if enabled for Qt's glib supportPeter Korsgaard
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21qt: add selection for keyboard driversPeter Korsgaard
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-14package/qt: bump versionPeter Korsgaard
I know 4.6.0 is out, but I don't have a setup to test it at the moment, so lets stick with 4.5.x for now. There's apparently no .tar.bz2 of 4.5.3. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-14package/qt: fix download URLPeter Korsgaard
get.qtsoftware.com doesn't seem to work any more. The links on the Qt website now points to get.qt.nokia.com, so use that instead. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-14package/qt: add font selectionPeter Korsgaard
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-10-09qt: remove commercial license optionMichael Roth
It looks like that nobody is using the commercial license option because the code is broken (BR2_QT_COMMERCIAL_PASSWORD typo) and dist.trolltech.com became silent long ago and nobody complained about. So remove the broken and unused stuff. 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-09qt: remove Kconfig option to enable all pixel depthsMichael Roth
The Kconfig menu "Pixel depths" of Qt provides a list with all selectable pixel depths and additionally the option "all". When "all" is selected, the list with all available pixel depths disappears. Because this disappearing of available pixel depths makes no sense under usability aspects, simply remove the option "all". The user could enable all available pixel depths by selecting each individual depth anyway. So no functionality is lost. 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-09qt: disable precompiled headers when ccache is enabledMichael Roth
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-09qt: make sure to install all Qt-fonts and true-type-fontsMichael Roth
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-09qt: use configure option instead a sed hack to disable xineramaMichael Roth
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-09qt: remove unnecessary call to qstrip macro in MakefileMichael Roth
QT_CONFIGURE can never gain double quotes, so there is no point to remove some. 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-09qt: don't enable internal tslib-module debuggingMichael Roth
In Qt there are virtually hundreds of internal debug flags like TSLIBMOUSEHANDLER_DEBUG for every module or even C++ class. There is no reason to enable a single such flag when Qt is build with debugging symbols and others not. 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-09qt: remove unnecessary commentMichael Roth
Qt in buildroot should not depend on dbus installed on build platform, if so this is (or was) a bug in buildroot. Looks like that this note is left over from ancient buildroot days, so remove it. 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-09qt: remove no longer needed 'x86x86fix' workaroundMichael Roth
Tested with 4.5.2. 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-09qt: remove PKG_CONFIG workaroundMichael Roth
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-09qt: remove TARGET_CONFIGURE_OPTS from make invocationMichael Roth
All compiler options, switches and path settings are done in the configure step. For the compile and install step there is no need for the TARGET_CONFIGURE_OPTS variables. 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-09qt: remove Makefile variable QT_QMAKE_ARMichael Roth
The variable is only referenced once, so inline it. 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-09qt: enable proper re-configureMichael Roth
The Qt configure script doesn't use config.cache but the generated Makefile provides a confclean target to properly clean out old configuration. 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-09qt: remove useless target qt-statusMichael Roth
The Makefile target 'qt-status' prints pointless information, so remove it. 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-09-05packages: use qstripThomas Petazzoni
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-09-03package: Remove unnecessary dependencies on uclibc.Will Newton
A C library will have been built by the toolchain makefiles, so there is no need for packages to explicitly depend on uclibc. Signed-off-by: Will Newton <will.newton@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-07-27qt: fix build with external toolchainThomas Petazzoni
Set QMAKE_LFLAGS so that at link time --sysroot is passed to the linker, and Qt finds the external libraries. This fixes Qt build when zlib or other libraries are external, instead of using Qt's internal copy. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25qt: rename qtopia4 to qtThomas Petazzoni
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>