The SDK is now called Qt SDK.
(From OE-Core rev: 7c5d520d24f40d844e60540663b34b47d9d8f21b)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 6523113a547042fc34110835fb658ee064d84a5f)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The source is no longer available from the original URL.
(From OE-Core rev: 502b0d1f68ad7668df153d3cfb8ca35f02313c1e)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The qtdemo can't launch via qtdemo-init initscript. Fix it.
(From OE-Core rev: bdd7a07db6b41c6c87c272d410af63c2d0251fc8)
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
change use of eglibc related variabled to glibc equivalents
(From OE-Core rev: fd15d6e0c8da75951a91d4467eda23c229b1026d)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The removed flags from this g++.conf file, which is installed to the
target as g++-unix.conf are added by gcc-base.conf . Do not add those
flags twice.
(From OE-Core rev: 3c49c575632cdac7bf950439b33773f09ae63354)
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(From OE-Core rev: 7472037569b42386592c060d54196f0c8b9e2d5d)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The base_contains is kept as a compatibility method and we ought to
not use it in OE-Core so we can remove it from base metadata in
future.
(From OE-Core rev: d83b16dbf0862be387f84228710cb165c6d2b03b)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Basically part of the headers/libs are installed in
${D}(${libdir}/${includedir}) instead of
${D}(${libdir}/${includedir})/qt4
* http://lists.openembedded.org/pipermail/openembedded-core/2013-October/085815.html
is related, but doesn't fix the issue completely, so better
revert the commit which introduced this issue
[YOCTO #5414]
This reverts commit f7409a9fe83ba2535a43f39ed57cd78242a88557.
(From OE-Core rev: 2b6a1cf9c7e05d204df82aa962d3ae09744dd86a)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update qmmp to 0.7.5 version
* update no-host-paths.patch
* remove no-sessionmanager.patch which is merged
(From OE-Core rev: fa10bd5aed84768ded25cdba348ce197a5fdbf2a)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Completes previous commit b5292d4115a4555a66b5e35acdc67dd71fb8577f.
Updates SUMMARY[doc] (meta/conf/documentation.conf).
Changes:
- rename DESCRIPTION with length < 80 to (non present tag) SUMMARY
- drop final point character at the end of SUMMARY string
- remove trailing whitespace of SUMMARY line
Note: don't bump PR
(From OE-Core rev: ad17dfd31a2b97b3e610a0ea0889f5ecb2a63b97)
Signed-off-by: Matthieu Crapet <Matthieu.Crapet@ingenico.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Also fix plugin descriptions to be more readable by adding missing
spaces.
(From OE-Core rev: 749df43649e4b2487e7d0a14b6cbf0f407baef6d)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These recipes all had a long DESCRIPTION but no SUMMARY; since the
SUMMARY is often displayed alone by package managers and the default
value ("${PN} version ${PV}") isn't particularly useful, we should
always try to set SUMMARY.
(From OE-Core rev: db02edd2e9d7645592933cbb25ea0ca4d6561392)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A lot of our recipes had short one-line DESCRIPTION values and no
SUMMARY value set. In this case it's much better to just set SUMMARY
since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY
is at least useful. I also took the opportunity to fix up a lot of the
new SUMMARY values, making them concisely explain the function of the
recipe / package where possible.
(From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62 added 'icu' to DEPENDS
in qt4-x11 only, but enabled icu globally in qt4.inc.
This breaks build of qt4-embedded because this recipe does not have
such a DEPENDS but uses qt4.inc:
| icu.cpp:42:28: fatal error: unicode/utypes.h: No such file or directory
| #include <unicode/utypes.h>
| ^
| compilation terminated.
| make: *** [icu.o] Error 1
Patch moves the 'icu' dependency into qt4.inc.
(From OE-Core rev: adb6e64d69fc947f2c8fa708dcbe854fd2b574f8)
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Cc: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
ICU presence is auto-detected at configure time and until recently (e68850 and
d61230) was pulled into most builds through harfbuzz and beecrypt. Now it's
floating and this leads to build failures.
As in all likelihood the majority of people were building this with ICU enabled,
add an explicit dependency.
(From OE-Core rev: 46dcec6fd455584d9b5d0d7ff1e5b36fbe5a2d62)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix the following warnings:
...
lib32-qt4-examples: found library in wrong location: /usr/bin/qt4/examples/tools/echoplugin/plugin/libechoplugin.so
lib32-qt4-examples: found library in wrong location: /usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_extrafilters.so
...
In oe-core f119566477243ce43b727492dc78b9cb3dd76de4, it added INSANE_SKIP
libdir for examples packages as it includes plugin shared libraries outside
of libdir.
But it hardcoded ${QT_BASE_NAME} as INSANE_SKIP's package name
and it didn't work while multilib enabled.
Add ${MLPREFIX} as package name's prefix in INSANE_SKIP
[YOCTO #5516]
(From OE-Core rev: d63588ddd5a1f08fff90f5bb3f7278490e359720)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This will allow apps using QLibraryInfo class to find qt.conf.
[YOCTO #5339]
(From OE-Core rev: fffa4c37c49b169f663d28612b9251819cef9577)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When installing the SDK to another location than the default one, qmake
will look for libraries, headers, etc. in the default location. That's
because the paths are hard-coded in the binary itself. Luckily, QT
allows to override this using a qt.conf file installed in the same
directory with the application executable. However, we already have a
patch that allows for the installation of qt.conf in another place and
read the location from QT_CONF_PATH environment variable.
Hence, install qt.conf in ${sysconfdir}. This will allow other apps, that
use QLibraryInfo class, to find it.
[YOCTO #5339]
(From OE-Core rev: 23f88695683a8e428375a8ccb6be935347a8768c)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This currently leads to a floating dependency on GTK+. Since most users
in an embedded context won't need this, just disable it by default.
Fixes [YOCTO #5116].
(From OE-Core rev: 6bef1e02dff6c6482791ab424d7e5dedeb840cf6)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
packagegroup-cross-canadian package name was changed to contain MACHINE.
Make the necessary changes here too.
[YOCTO #4783]
(From OE-Core rev: 8f8cd338faf63f665c2214f0110b712736f8ed5d)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Add DEPENDS on util-linux (for libblkid) and gstreamer (was likely
always being auto-detected since it is currently an unconditional
dependency of Qt itself in our Qt recipes)
* Use PACKAGECONFIG to allow individual configuration of pulseaudio and
bluetooth features rather than additional variables
* Generate a static platform configuration and tell the configure script
to use that instead of running compile tests during do_configure. This
should avoid the issue of camerabin sometimes being built and failing
as seen on the Yocto Project autobuilder.
(From OE-Core rev: 9d64f117cccf69916ce5b08039edcb3a19dc2b58)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously it worked for qt4-embedded only. qt4-x11-free has X11
libs between -lwebcore and -ljscore.
(From OE-Core rev: 5110f3894902db6e9a35cce40b91943b3b2ee237)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Removed patches integrated upstream.
Added INSANE_SKIP libdir for examples packages as it includes plugin
shared libraries outside of libdir.
(From OE-Core rev: f119566477243ce43b727492dc78b9cb3dd76de4)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We don't want this enabled just because we have EGL and OpenGL ES 2.0
enabled.
(From OE-Core rev: 85aa73d397cb42a2fc8d6f901f8db1d601972741)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Because qt could not be built on mips64 with 64 bits userspace, set
COMPATIBLE_HOST for qt related packagegroups to disable them on mips64
with 64 bit userspace too.
(From OE-Core rev: 5f4c5de0b32d546ed28108d2403be41c685e27c7)
Signed-off-by: Kai Kang <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove /usr/lib from ld rpath-link option to fix the below build error:
bitbake_build/tmp/sysroots/x86-kvm-guest/usr/lib/libpng16.so.16:
undefined reference to `inflateReset2@ZLIB_1.2.3.4'
since sysroot seems not work for rpath-link, and "rpath-link,/usr/lib" makes
ld to search host libraries for target libraries, once host has different
version zlib, the error will happen.
qmake uses QT_MOBILITY_LIB to generate "rpath-link,/usr/lib" when do_configure
but we can not add sysroot into QT_MOBILITY_LIB, since QT_MOBILITY_LIB is dir
which libraries will be installed to, so I remove this dir from rpath-link
before do_compile
(From OE-Core rev: f7409a9fe83ba2535a43f39ed57cd78242a88557)
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This fixes the following warnings when running Qt applications:
QIconvCodec::convertFromUnicode: using Latin-1 for conversion, iconv_open failed
QIconvCodec::convertToUnicode: using Latin-1 for conversion, iconv_open failed
Qt's QString class stores strings internally using UTF-16 encoding.
The UTF-16 iconv module is needed to convert between the system's local
8-bit representation and QString's UTF-16 encoding.
For example, the following functions would be affected:
QString::fromLocal8Bit(...)
QString::toLocal8Bit(...)
If the UTF-16 iconv module couldn't be loaded, it would use Latin-1
encoding instead of the system's encoding for conversion.
[YOCTO #349]
(From OE-Core rev: 2e9c8007bca684149d72e96423f30433b6665fad)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This avoids the following warning when running qmake:
Project WARNING: qmake spec does not announce the compiler family.
Guessed gcc.
(From OE-Core rev: 6c78f629323bea0be44181d60e3ce45be0416093)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qmake is trying to call native gdb and we don't depend on gdb-native
(or even provide gdb-native)
* fixes errors like this:
/bin/sh: gdb: command not found
/bin/sh: line 0: test: -gt: unary operator expected
(From OE-Core rev: 6456b596a73232429e0d223089f32dc350ea20b0)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
QMAKE_QT_CONFIG is set by the linux-oe-g++ mkspec but it is overwritten
with an empty value read from .qmake.cache. Avoid this by first checking
if the value from .qmake.cache is not empty before assigning it to
QMAKE_QT_CONFIG.
This allows variables from qconfig.pri such as QT_ARCH, QT_CONFIG,
QT_VERSION, etc. to be queried by qmake projects.
(From OE-Core rev: 5330905749828ea8befdee559c180754ac506b75)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
qmake2 was being built with paths different to the target Qt.
The incorrect paths can be seen by running qmake2 -query:
QT_INSTALL_DOCS:${STAGING_DIR_NATIVE}/usr/doc
should be /usr/share/doc/qt4
QT_INSTALL_PLUGINS:${STAGING_DIR_NATIVE}/usr/plugins
should be /usr/lib/qt4/plugins
QT_INSTALL_IMPORTS:${STAGING_DIR_NATIVE}/usr/imports
should be /usr/lib/qt4/imports
QT_INSTALL_TRANSLATIONS:${STAGING_DIR_NATIVE}/usr/translations
should be /usr/share/qt4/translations
QT_INSTALL_EXAMPLES:${STAGING_DIR_NATIVE}/usr/examples
should be /usr/bin/qt4/examples
QT_INSTALL_DEMOS:${STAGING_DIR_NATIVE}/usr/demos
should be /usr/bin/qt4/demos
QMAKE_MKSPECS:${STAGING_DIR_NATIVE}/usr/mkspecs
should be /usr/share/qt4/mkspecs
Use the same paths as target Qt for consistency. As the mkspecs are
installed to /usr/share/qt4/mkspecs not /usr/mkspecs, qmake2 was
unable to detect and load the webkit module (it is detected by loading
modules/qt_*.pri inside the mkspecs directory) so webkit was missing
from QT_CONFIG if a qmake project reads the QT_CONFIG variable.
(From OE-Core rev: 37b57b44ff83c718021da4f717fc66a28204c96c)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These tools are needed by some Qt projects (e.g. Qt Creator).
(From OE-Core rev: e2f3232fdc2836685549e59dc5c71363d3bbab5f)
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
