It appears that the qt4.inc had a copy/paste error relating to creating
a list of staticdev packages, that caused them to show up as dependencies
in the -dbg package.
(From OE-Core rev: a7c5cec5fc63b4a26d84673460426b35669068dc)
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These are needed to support upgrading from task-* to packagegroup-*
within existing target images at runtime.
Note: these settings will very likely be moved out to a separate inc
file at some point in the future.
(From OE-Core rev: 5dd4de086d744c81d2275077ad0e0022204b0a68)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allow references to the old task packages to continue to work. This does
not add RPROVIDES for everything, just those packages that are likely to
have been referred to.
(From OE-Core rev: b41c45972a6d359f034615471959c84aee2bc456)
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>
Try to avoid confusion with the Qt demos distributed with Qt itself.
(From OE-Core rev: dbbcc0cb9d2cbc66027c800075b94eb9b7110a00)
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>
Since package groups don't actually fetch or distribute anything and we
no longer run do_configure we don't need to set this variable anymore.
(From OE-Core rev: 4c511f77e38cbc9d8d633fef3b1ab4cf93440258)
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>
* Eliminate the -base package, there's only one package and it might as
well be the main one.
* Rename to packagegroup-core-qt4e to match other package group recipes
* Fix and tidy up qt4e-demo-image at the same time
(From OE-Core rev: 9dddc9dfdc84401fee3b48eb3aba0cabdcf4d05a)
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>
Also clean out items already handled by that class (dev/dbg packages,
ALLOW_EMPTY, etc.)
(From OE-Core rev: 65fca4458cfe1d647c7ea1d4588dc449739a73eb)
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>
"Package group" is a much more appropriate name for these than task,
since we use the word task to describe units of work executed by
BitBake.
(From OE-Core rev: 424dcf7046e4ad09dcc664eb1992201195247fcf)
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>
As discussed on the mailing lists, using a suffix to package names is
hard and has lead to many recipes having to do PKGSUFFIX games. Its
looking extremely hard to scale nativesdk much further without hacking
many recipes.
By comparison, using a prefix like multilib does works much better and
doesn't involve "hacking" as many recipes. This change converts nativesdk
to use a prefix using the existing multilib infrastructure.
(From OE-Core rev: 81813c0e322dc04ce4b069117188d8a54dfddb8c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This issue is that with C++ compiler process an old version of kernel
header file, coincidently that file has a variable named 'new':
* 'embedded/qkbdtty_qws.cpp' include 'linux/vt.h';
* '/usr/include/linux/vt.h' has below code on SLED-11.x:
+ unsigned int new;
On mostly hosts it has been changed to: new -> newev.
[YOCTO #2845]
(From OE-Core rev: bb4b71552da0d1f4396955f35db5819f88a7d2ae)
Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Qt 4's lib/fonts files are intended only for installation with
Qt Embedded [1] so only install and package them with the embedded
version.
Fixes [YOCTO #2809].
[1] http://lists.qt-project.org/pipermail/interest/2012-July/003062.html
(From OE-Core rev: 64369219e3e03cacfaef8df6e3eec507140bdd7d)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To enable building the commercial edition of Qt (through additional
recipes that are *not* provided by OE-Core) we need to tweak a few
things:
* Don't make recipes that inherit qt4x11.bbclass depend on qt4-x11-free
- instead add qt4-x11 to DEPENDS and then have qt4-x11-free include
this in its PROVIDES. A commercial equivalent recipe should do the
same.
* Add a QT_LICENSE_FILE variable that can be used to specify the license
file required by the commercial edition.
* Add a QT_LICENSE_FLAGS variable which the recipe can set to select the
license option being used. The default of "-opensource" retains the
current behaviour; a commercial recipe should set it to "-commercial".
Fixes [YOCTO #2505].
(From OE-Core rev: 2be0058fc4acddab611637656183accd052b40eb)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* this patch depends on http://patchwork.openembedded.org/patch/32085/
(From OE-Core rev: 2792569605b50bdad8b2b8398c823dd08006daf1)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update qmmp to 0.6.1
Remove spaces at end of lines.
(From OE-Core rev: 66dcf21fb3e3249c6e04fdae3eb0400c2ae7d13f)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The bb and os modules are always imported so having these extra import calls
are a waste of space/execution time. They also set a bad example for people
copy and pasting code so clean them up.
(From OE-Core rev: 7d674820958be3a7051ea619effe1a6061d9cbe2)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After the change to shell style functions (from python style), the
ability to use oe_filter_out on QT_CONFIG_FLAGS got broken.
This patch solves that by referring to QT_ARCH in a more correct way.
(From OE-Core rev: abd5d5a712686a379a1a1da29d78a0f374f13e33)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As module-init-tools package does not exist anymore there's no reason to
have it in the IMAGE_INSTALL package list. If RPM package manager is
used, build will fail with:
Unable to find package module-init-tools (module-init-tools)!
[Yocto #2580]
(From OE-Core rev: 85d612737d050d4633013c706d9ad6b8169814af)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We have 4.8.1 now and 4.7.4 is obsolete.
(From OE-Core rev: cb945328fe019c246c520904c02ca29d3798df07)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
App/ExportWizard.cpp depends on wizard.h which depends on ui_wizard. The last one
should be already generated before compiling ExportWizard.cpp.
[YOCTO #2297]
(From OE-Core rev: 2cf6e7cf81c0b864b5d51be60094a6eb3e584383)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To allow the use of Qt applications started manually to use the
configured graphics system the setting needs to be available in user
environment. This moves the setting to /etc/profile.d ensuring it is
set and available. This allow the removal of x11-common as dependency.
(From OE-Core rev: 3804784b6200f82f5d8d6f533ce5e1a36ee2aeac)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In qt4's do_configure operation, it will refer to some variables that
are derived from 'd', however these variable values may be not correct
in multilib case since the extraction of these variables happens before
the multilib handler.
The fix is to move these python style functions back to shell style.
This fixes [YOCTO #2355]
[RP: Fix whitepace]
(From OE-Core rev: 977ba301a1063a84b865ddf7367c35827fbffc86)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gcc 4.7 uncovers a type mismatch in the code. And this commit fixes the issue:
| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/qemux86/usr/include/glib-2.0/glib/gthread.h:58:7: error: 'union' tag used in naming 'struct _GMutex' [-Werror=permissive]
| In file included from ./wtf/Platform.h:1217:0,
| from ./config.h:30,
| from wtf/gobject/GOwnPtr.cpp:19:
| wtf/gobject/GTypedefs.h:55:16: note: 'struct _GMutex' was previously declared here
NOTE: package qt4-x11-free-4.8.1-r41.1: task do_compile: Failed
(From OE-Core rev: 1923455340fca5e4b68a2c3ac3566a99baa93cd9)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This change introduces two new patches to Qt 4.8. One prevents the build
system from using the -fuse-ld=gold GCC flag as this isn't upstream and
therefore not supported by many toolchains out there. The second patch
fixes a compile time error when using toolchains based on GCC 4.7.
(From OE-Core rev: c98d60923b84bcd285644cecaed1fa0455747a2f)
Signed-off-by: Ken Werner <ken.werner@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Is it possible to enable the "-sm -accessibility" in oe-core, please?
There is a meta-kde layer which requires the "-sm -accessibility", but
they are disabled in meta/recipes-qt/qt4/qt4.inc:
QT_DISTRO_FLAGS ?= "-no-accessibility -no-sm"
I checked the log of the qt4, can't find the related log for
"-no-accessibility -no-sm".
Another way is use the bbappend, but it would be great if it can be
enabled in oe-core.
This only enables for qt4-x11, doesn't enable for qt4-embedded, and
have done testing on: qemux86, qemuarm, qemumips, qemuppc.
(From OE-Core rev: 678973a9ad258b466295a666cbcd56df15a57c7c)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* No changes other than source checksums and PR at recipe level.
* DEFAULT_PREFERENCE still set to -1
(From OE-Core rev: 6a21cf0068234152b3f13866dc7c05adc6d0d9c9)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes [YOCTO #2227]
I've updated the image descriptions per the bug description.
(From OE-Core rev: 479b020edbc609c3ae1e3846e9e0d1643ac10059)
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
g++ 4.7 is detecting inheritence problems
which we solve by explictly specifying
elements in constructors
(From OE-Core rev: 553ac1bf0ebf2ecf4e45ace4016b50c810ef7b26)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
C getpid needs unistd.h for getting
its signature
(From OE-Core rev: da89bb83298eaf28faebcc8782f207927fbe190a)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
QMake pro files don't explicitly define QT_NO_OPENGL if the
configuration lacks opengl, but example code relies on this define.
[rebased to current code - sgw]
(From OE-Core rev: 4ca9ecbdd60f99101b0f6d9fadeb431b3790010a)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
OE-Classic and meta-oe provide a qmake2 recipe; since this has been
obsoleted by the recent change to provide qmake within the tools package
and (in the latter case) will soon be removed, add an RREPLACES to aid
upgrades and RPROVIDES to make it easy to install.
(From OE-Core rev: 9ba01c3b7ce3d9f822e1cc08cd032e019a15180f)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix the following warnings:
WARNING: QA Issue: package qt-mobility-x11 contains bad RPATH /home/user/qt/lib:/home/user/qt/lib${WORKDIR}/qt-mobility-opensource-src-1.2.0/lib:/home/user/qt/lib/media/large/tmp/sysroots/qemux86/usr/lib:/home/user/qt/lib/usr/lib in file ${WORKDIR}/packages-split/qt-mobility-x11/usr/bin/qt4/examples/QtMobility/qml_device
WARNING: QA Issue: package qt-mobility-x11 contains bad RPATH /home/user/qt/lib:/home/user/qt/lib${WORKDIR}/qt-mobility-opensource-src-1.2.0/lib:/home/user/qt/lib/media/large/tmp/sysroots/qemux86/usr/lib:/home/user/qt/lib/usr/lib in file ${WORKDIR}/packages-split/qt-mobility-x11/usr/bin/qt4/examples/QtMobility/qml_device
(From OE-Core rev: de5a8e843d85b4d08cc5b75ec10709e96a709a90)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Both files contain -L../../WebCore/release -L../../JavaScriptCore/release -lwebcore -ljscore
* These paths and libs don't get installed.
* When building a shared lib with libtool, that links
with libQtWebKit, libtool adds these unneeded parameters
to the linker command-line, thus linking fails.
(From OE-Core rev: 4c41a3204ef72f53813ddc86fe525fa9c6714daa)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:
sed \
-e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
-e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
-i `grep -ril getVar *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a pulseaudio DISTRO_FEATURES item and disable pulseaudio support in
phonon within Qt4 if it is not present; otherwise it is a race condition
as to whether it is enabled or disabled or breaks the build.
Note that this adds pulseaudio to DISTRO_FEATURES_BACKFILL thus leaving
existing distro configurations unaffected.
(From OE-Core rev: b82c216c1ee8e2a009e87856b7adad08f7f50482)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Fixes the following error with qt4-embedded-4.8.0 and possibly others:
| ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No such file or directory
(From OE-Core rev: d0853052228128ccca2b744dae9c4dceae23067a)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Use the same method to build qmake as in the qt4 target recipes
* We always have qmake from qt4-native so don't check if it exists -
just skip the check like we do in the qt4 target recipes. This
saves us a patch.
* Replace qt4-tools-native in DEPENDS with qt4-native
(From OE-Core rev: 71153270466352245fe2aa3318bbabb1f8062ed2)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Commit 4ccae37db1aa77a1d15098c3720ea6e2d383fbdc introduced a sed command
line to modify a file that only exists in 4.8.0, thus do_configure of
4.7.4 was failing; so make this conditional upon the file existing.
(From OE-Core rev: 0b948d20b835387702a4f5e103eaae5b4a330edd)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
qmake was not being built at all (since we had the host version from
qt4-native) and the default is to build for the host machine within
configure. With a minor hack we can build qmake for the target as well,
which is useful if you want to build Qt 4 software on an actual device.
This is now installed as part of the tools package (together with uic,
moc etc.)
Additionally, add an environment setup script (installed in
/usr/share/qt4/environment-setup or /usr/share/qtopia/environment-setup
for the embedded version) as part of the mkspecs package since the
mkspecs will not work without the paths set up by this script. The code
to create this script was adapted from the qmake2 recipe in meta-oe.
Also move do_compile() from qt-${PV}.inc up to qt4.inc as both versions
have the exact same content.
(From OE-Core rev: 4306606489a2d922595d4c86a21c496bbd8a607e)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ensure the Qt configure script can can detect the compiler correctly as
g++. This fixes the following compile error with gcc 4.6:
./wtf/NullPtr.h:48:1: error: identifier 'nullptr' will become a keyword in C++0x [-Werror=c++0x-compat]
(From OE-Core rev: f29bb5b2a99ecef46e5570bf3336e9680c0b6705)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Mark Hatle
Paul Eggleton
Richard Purdie
Martin Jansa
Wenzong Fan
Kang Kai
Valentin Popa
Anders Darander
Laurentiu Palcu
Andrei Gherzan
Otavio Salvador
Dongxiao Xu
Nitin A Kamble
Saul Wold
Ken Werner
Robert Yang
Andreas Oberritter
Elizabeth Flanagan
Khem Raj
Ciprian Ciubotariu