the build is actually failing because host g++ and ld are used to
compile and link
(From OE-Core rev: 4ccae37db1aa77a1d15098c3720ea6e2d383fbdc)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allow setting default runtime graphics system engine for Qt4
applications per machine.
Depending on the GPU and Xorg driver, this can boost and impact
significantly the drawing performance. The default setting is to
'raster' as this offer best performance for most machines GPUs.
(From OE-Core rev: ddd3f453e93e460d8db0fcdd04fb4633fe2ebceb)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Version 4.8.0 makes a few minor changes in the internal build system -
the following issues had to be worked around:
* The -qt-gif configure option has been removed. This is actually the
default and has been for some time, so remove it from qt4.inc.
* The mkspecs have been refactored requiring us to copy our g++.conf
file over the top of g++-unix.conf instead. Some modifications to this
file were also necessary to remove some settings that are now in other
conf files (and we don't modify those values in any case).
* The LD environment variable needs to be unset during configure, or
else the configure script overrides our value of QMAKE_LINK which
selects ${CXX} as our linker.
* QMAKE_CXX contains a reference to OE_QMAKE_CXX which the configure
script does not expect and cannot expand and this results in webkit
being disabled, so add a workaround for this.
(From OE-Core rev: 6b2a5d15ad20573502142b635e6cab9bcfb3b40a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Don't install the native staging versions of the qt4 tools in the bin
directory; we have been doing this for a very long time but it is no
longer necessary since we specify them via the QMAKE_UIC, QMAKE_MOC etc.
variables. Doing so was sometimes resulting in those executables being
the ones that end up being packaged (probably only sometimes due to
different date/time values on the staging files and the interaction
with make).
Fixes [YOCTO #1856].
(From OE-Core rev: dc154d698b3b455a35b65935f7f04a3b4f72f8b6)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These binaries are needed in the target tools package so we can build
qt apps on the target. You also need to install qmake from meta-oe.
Tested by building gnuradio on the USRP e100 with qt support.
(This effectively reverses OE-core rev
69eeb3d2276e5b10d084b47d308ecfc8daf8b467, however test builds for
qemux86 and qemumips produced no packaging warnings such as those
described in that commit, and the architecture of the executables is
correct.)
(From OE-Core rev: c96db08915a554fb5e4bb2c360b919c8392b32c6)
Signed-off-by: Philip Balister <philip@balister.org>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* -reduce-relocations is already specified in qt4.inc, no need to add it
in qt-${PV}.inc
* Add QT_GLFLAGS to QT_CONFIG_FLAGS in qt4.inc rather than spreading it
through other inc files.
* Add "-xmlpatterns -no-rpath -qt3support -silent" to QT_CONFIG_FLAGS in
qt4.inc rather than qt-${PV}.inc; these have been supported since at
least 4.5.2 and therefore shouldn't be version-specific.
* Move "-no-fast -silent -no-rpath" to EXTRA_OECONF in qt4-native.inc
rather than the versioned recipes for the same reason
* Remove redundant setting of LICENSE in qt4-embedded.inc
(From OE-Core rev: c9f714062c1100cedbcb2c16d16656e3f5442133)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Adds a patch imported from Debian to not strip the executables as part
of the Qt build process. This fixes the warnings shown at packaging
stage as well as the content of the debug symbol packages.
(From OE-Core rev: c2f6dc09a7663f69308558553be9420df3a81b6b)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix QML video player crash which happens when attempting
to play OGG video files.
(From OE-Core rev: aadca104f18eb1df7495ec24649042276be01985)
Signed-off-by: Anatolij Gustschin <agust@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
it seems sed doesn't handle \? properly if the string in not between
quotes.
without this patch, we get something like (for example for QtDBusE.pc :
Libs: -L${libdir} -lQtDBusE
Libs.private: -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board/
usr/lib -L/usr/lib -L/home/ebenard/WORK/setup-scripts/build/tmp-angstrom_2010_x-eglibc/sysroots/board
/usr/lib -lQtXmlE -L/usr/lib -lQtCoreE -lpthread
Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}
with the patch we get what is expected :
Libs: -L${libdir} -lQtDBusE
Libs.private: -lQtXmlE -lQtCoreE -lpthread
Cflags: -DQT_SHARED -I/usr/include/qtopia -I${includedir}
(From OE-Core rev: 2e635b4fe6be9d5bfcdd837a523833b7eb0819a0)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Complete the bb.data.getVar/setVar replacements with accesses
directly to the data store object.
(From OE-Core rev: 2864ff6a4b3c3f9b3bbb6d2597243cc5d3715939)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* With b40b9c024be5e1ec81a31961158b3e6b529acfe0 some pkg-config fixups where removed from
qt4.inc which breaks the pkg-config files for qt4-embedded. Without that the pkg-config
files for qt4-x11-free are broken. So this patch puts the fixes into the qt4-x11-free.inc
file to be used by qt4-x11-free and not qt4-embedded.
* Resending because nobody replied on
http://www.mail-archive.com/openembedded-core@lists.openembedded.org/msg10609.html
(From OE-Core rev: 9086c7e2e106fb5188963a5dac4e1f1ff9d759d4)
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The catalogue /usr/lib removed from Makefiles used for building configure tests.
(From OE-Core rev: 815560c0ee5a1a984b7d0fc8417c46606854e7fe)
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
qmmp: remove old recipe and add new recipe
Use do_split_package for each grouping and name them correctly besides updating package.
The format to name plugins of qmmp:
qmmp-plugin-<group>-<library> with the Description: Qmmp<Group> plugin for %s"
(From OE-Core rev: fff02c7c2c1c6ab0ceb1f888134d381d8b612884)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Fix dESCRIPTION -> DESCRIPTION
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The QtMobility is a Qt add-on which allows to include standard mobile
functionality to Qt applications. For details, see
http://qt.nokia.com/products/qt-addons/mobility/
The patch is intended to add support for the QtMobility 1.2 package to OE.
Added two recipes:
1) qt-mobility-x11 builds the QtMobility 1.2 package
on the basis of Qt/X11 using the qt4-x11-free package;
2) qt-mobility-embedded builds the QtMobility 1.2 package
on the basis of Qt/Embedded using the qt4-embedded package.
(From OE-Core rev: 5395ab6dc7cf3f1e1fd082b28cef50001d235750)
Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #1671]
qt4-x11-free's recipe includes a sed script to sanitize it's .prl files,
which are used by qmake to generate a list of libs and includes in the
Makefiles it generates. It however, fails to take into account the possibility
of trailing slashes, and thus leaves them in, and breaks gcc's syntax.
Update these regexes to account for them.
(From OE-Core rev: 8d580ed449c09a64483519d66e14a2e3b071806a)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
qt4-embedded-conf contains an environment setup script for profile.d.
It has been packaged seperately to allow for its exclusion, but this is
only practical if it is added to RRECOMMENDS, rather than RDEPENDS.
(From OE-Core rev: e0c2a62fcadc5095729229e83975f35fe0c3fa8f)
Signed-off-by: James Limbouris <james@digitalmatter.com.au>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The translation support was disable in build. The
fix-translation.patch was imported from OpenEmbedded to fix a linking
issue in phonon translation support.
[Dmitry Eremin-Solenikov: ported to apply to qt 4.7.4 build, bumped PR]
(From OE-Core rev: 4fc51a28bd171ea93fecee6326c69c6494023f76)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The translation support was disable in build. The
fix-translation.patch was imported from OpenEmbedded to fix a linking
issue in phonon translation support.
(From OE-Core rev: 8d5a5d78f9e83c64ebddcecd7c4fd89cc1264163)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The documentation was 285M and doesn't fit on the NAND of many machines,
but in another had part of the documentation is needed for the
QT demos, so we split the documentation: so qt demo only RRECOMMAND
the documentation that it really needs.
Thanks to Eric Bénard for explaining me how to split it.
(From OE-Core rev: 97446651cd5128ca7a549df677c920e2463c46f9)
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without the -no-neon flag, neon is "autodetected"
by looking if the compiler is capable of compiling
a neon test, and succeed, and neon is then enabled
during the compilation.
(From OE-Core rev: 026b59180fe3fbeb43cfd143f053ef33f482ef0c)
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The documentation is 285M and doesn't fit on the NAND of many machines.
(From OE-Core rev: 64d6a6ceceb1f1a599b8140f30071f8bc8e60393)
Signed-off-by: Denis Carikli <denis@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- qt4-tools-nativesdk : actually the qmake binary which gets installed
comes from the native recipe. This patch fix this problem by launching
configure twice : once to compile qmake using the right toolchain for
nativesdk, and a second time using the native qmake to compile all the
other tools for the nativesdk. Then we install the right qmake.
- mkspec : the link actually created in qt4-tools-nativesdk's
do_install point to nowhere so remove it and generate the link in
meta-toolchain-qte as it's the only place where we have all the variable
to create it.
- toolchain_create_sdk_env_script_append : we need to add OE_QMAKE_CFLAGS,
OE_QMAKE_CXXFLAGS and OE_QMAKE_LDFLAGS else the sdk won't find these
variables that are inserted by qmake in the Makefiles.
- with this patch, oe-core generates a working meta-toolchain-qte which
can compile a small example and is properly recognized by qtcreator (this
brings oe-core's meta-toolchain-qte to oe-dev's functional state).
(From OE-Core rev: 5f6fb92b939147d2d6aa7790a378d4b7cce3ada5)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use ${POKY_BASE_INSTALL} in order to have the base files and
tools in the image.
(From OE-Core rev: c2f4bae0a100f3752153ecb93adb9ede4f55322a)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We don't want to pull the whole qt suite in our images when only installing a tiny setup
which needs the profile script for several configuration issues. This moves the qte.sh
profile script into a qt4-embedded-conf package which is automatically installed when an
image depends on qt4-embedded.
(From OE-Core rev: bed68b561056e0f454c0bf527997f82b63122773)
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building qt4-embedded the generated and cleaned pkg-config files for qt are wrong.
The Cflags variable contains something like ${includedir}/qtopia/QtCore where
${includedir} is already /usr/include/qtopia/QtCore.
This patch reverts the fix up of the Cflags variable implemented in do_install.
(From OE-Core rev: b40b9c024be5e1ec81a31961158b3e6b529acfe0)
Signed-off-by: Simon Busch <morphis@gravedo.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- this patch comes from Nokia and blacklist all DigiNotar intermediates
and root certificates, more details are available here :
http://labs.qt.nokia.com/2011/09/07/what-the-diginotar-security-breach-means-for-qt-users-continued/
(From OE-Core rev: abf51c33aba51782246a9136dddb53893216f518)
Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
qt-demo-init initscript lacks some quotes, which makes it bave not fulle
correct. Fix that.
(From OE-Core rev: 84395cd31afd78a84d82a80297fe06f10406d57b)
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
"/bin/sh" is needed by qt4e-demo-image, So I add busybox for fixing this problem.
[YOCTO #999]
(From OE-Core rev: 5f06d5012bfa8b2bd83092e41ab29babdfd4605e)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #999]
qt4e-demo-image needs qt-demo-init when starting qtdemoE.
qt-demo-init was pulled from Openembeded.
(From OE-Core rev: e21e8b502ab2f982836cf1f7a30e33bff1bd5b7b)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[YOCTO #999]
Copy metadata of qt4e-demo-image from OE for easy testing qt4embeded on embedded platform.
This image was tested on qemuarm and can run program "qtdemoE".
(From OE-Core rev: 612ab0aaf3e693b90bb18234e2517bfc87ee3f7c)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gcc-crosssdk can't find the standard headers before, and it was fixed.
So it is not needed to search the gcc standard paths by
qt4-tools-nativesdk itself.
(From OE-Core rev: be86cbf54f3aeeda1105acd153fe09348a7ac267)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When reducing build time by adding QT_DISTRO_FLAGS from the set '-no-gui -nomake tools
-nomake examples -nomake demos -nomake docs', build failure can occur, due to not building
all tools.
* Make rm not error out when removing one of the, possibly, non-existing tools.
* Only try to rename qtdemo, if qtdemo exists.
* Check if the phrasebook path exists, and only then call do_split_packages()
(From OE-Core rev: 51ef8335df895603e75345a18aaefe2359b2387f)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
in the qt4.inc python annomyous code, there is case where package name
is set to "${QT_BASE_LIB}-tool", and FILE_${QT_BASE_LIB}-tool is set to xxx.
here QT_BASE_NAME=qt4. multilib.bbclass will try to rename the FILE_qt4_tool to
FILE_lib64_qt4_tool. unfortunately, there is only FILE_${QT_BASE}-tool, no
FILE_qt4-tool, so FILE_lib64_qt4_tool will not be defined.
to fix this issue, this patch expand the QT_BASE_LIB when assigning the package
name.
FIX [YOCTO #1344]
(From OE-Core rev: b5d381133660fe338796b965131cee39cec01b96)
Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Martin Jansa
Khem Raj
Eric Bénard
Tom Zanussi
Otavio Salvador
Paul Eggleton
Saul Wold
Philip Balister
Richard Purdie
Anatolij Gustschin
Simon Busch
Dmitry Cherukhin
Xiaofeng Yan
Wenzong Fan
James Limbouris
Dmitry Eremin-Solenikov
Denis Carikli
Kang Kai
Anders Darander
Yu Ke