Commit Graph

125 Commits

Author SHA1 Message Date
Peter Korsgaard
f31bbf9e68 qt: add selection for keyboard drivers
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-21 10:54:14 +01:00
Peter Korsgaard
81cb4205d0 package/qt: bump version
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-14 17:29:59 +01:00
Peter Korsgaard
77ea6b03f5 package/qt: fix download URL
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-14 17:01:32 +01:00
Peter Korsgaard
4e272254c7 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
Peter Korsgaard
518804f35a qt: tweak gui kconfig
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-12-14 16:06:11 +01:00
Michael Roth
28eefec5bd qt: remove commercial license option
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-09 14:58:32 +02:00
Michael Roth
d6d7f13cd0 qt: remove Kconfig option to enable all pixel depths
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-09 14:56:42 +02:00
Michael Roth
82f1ccf4c8 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-09 14:54:27 +02:00
Michael Roth
f985476225 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-09 14:53:06 +02:00
Michael Roth
f9e208866b 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-09 14:48:24 +02:00
Michael Roth
ac5d17bf65 qt: remove unnecessary call to qstrip macro in Makefile
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-09 14:46:40 +02:00
Michael Roth
51a3b74b6e qt: don't enable internal tslib-module debugging
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-09 14:42:51 +02:00
Michael Roth
7f541e3047 qt: remove unnecessary comment
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-09 14:41:23 +02:00
Michael Roth
03bdf67f43 qt: remove no longer needed 'x86x86fix' workaround
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-09 14:40:37 +02:00
Michael Roth
1cd28840db 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-09 14:38:04 +02:00
Michael Roth
ad1a8a156a qt: remove TARGET_CONFIGURE_OPTS from make invocation
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-09 14:37:05 +02:00
Michael Roth
ef951295bf qt: remove Makefile variable QT_QMAKE_AR
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-09 14:36:09 +02:00
Michael Roth
10efac17fd qt: enable proper re-configure
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-09 14:35:23 +02:00
Michael Roth
42325834c9 qt: remove useless target qt-status
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-10-09 14:32:49 +02:00
Thomas Petazzoni
3c35d55ea9 packages: use qstrip
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-09-05 14:43:17 +02:00
Will Newton
422ce6536b package: Remove unnecessary dependencies on uclibc.
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-09-03 20:22:38 +02:00
Thomas Petazzoni
314cdcbd25 qt: the GUI module requires the network module to work properly
Running a simple Qt GUI application on an embedded systems without
QtNetwork installed doesn't work, the dynamic loader complains that
QtNetwork is not present.

While I'm not a Qt build system expert, it looks like this dependency
really exists, since the src/gui/gui.pri file in Qt sources contains
the following line:

embedded: QT += network

Which would mean that the GUI module needs the network module to
operate properly. And a few files in src/gui/embedded/ also include
some QtNetwork stuff. This isn't really surprising since the Qt QWS
mechanism uses communication between processes through a Unix socket.

Therefore, we add a dependency on the network module in the GUI
module. We use a 'select' dependency here, since it's might not be
really obvious to the user that the GUI module requires the network
one.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-27 15:02:13 +02:00
Thomas Petazzoni
072d89a883 qt: fix build with external toolchain
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-27 11:54:35 +02:00
Thomas Petazzoni
2845fa66ce qt: put the Qt options into a submenu
Put the Qt options into a submenu to make the configuration interface
easier to use. The comment on the dependency on C++ has to be put
before the menuconfig definition, otherwise kconfig gets confused and
doesn't put the suboptions into a submenu.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-25 00:18:41 +02:00
Thomas Petazzoni
20d2c70fbd 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