* without = it can add g++ prefix multiple time when you reexecute do_configure (e.g. after failure)
(From OE-Core rev: 4f891901bcf7be95cebca1a7296e7ea656adee74)
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>
* changes in licenses are only s/Nokia/Digia/
(From OE-Core rev: 5d898695ab3ce368a1d1f2066bb980ee829ae077)
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 the upstream status for patches of long building path.
(From OE-Core rev: 58b83f7dad8f0d252f8028349d734987081b7507)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* inherit qt4x11 which inherits qmake2 and sets DEPENDS already.
* Remove pkgconfig from inherit since quicky doesn't actually use
pkg-config nor does it produce a .pc file
(From OE-Core rev: 62db8745c1b907ebec222751cd9cb174dd5f2f96)
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>
qt4x11 already inherits qmake2 so it doesn't need to be inherited again.
(From OE-Core rev: ed96c0a6a5a394842777a1413b89d3ea3aabb532)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* inherit qt4x11 which inherits qmake2 and sets DEPENDS already
* Remove pkgconfig from inherit since quicky doesn't actually use
pkg-config nor does it produce a .pc file
* Move packaging definitions to the end
(From OE-Core rev: e5e6a02923ca28dd6863dcf96c1d0619f049c64a)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the TMPDIR has more than 256 chars, building qt4-native fails.
This violates the 410 length limit of TMPDIR.
This patch makes building qt4-native succeed with a long building
path (410 for example) by extending its static arrays' sizes by
256 chars.
[YOCTO #2766]
(From OE-Core rev: a635553cf46a7e43e81eab1a1baeae98312881d2)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When building a QT application using OE_QMAKE_CC/OE_QMAKE_CXX, the
--sysroot was not included and the compilation would fail. The user had
to add the option manually which was not very user friendly. This
happened only when installing the SDK in another location than the
default one. Since CC/CXX/LD had this option already included, reuse them.
[YOCTO #3409]
(From OE-Core rev: 758f56523daa7d8c8b459757c70b50421d28b8dd)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
upstream does not need GLU since:
commit e7eed096a0c33607a7a37baaf06e5952dc9d556b
Author: Bj<C3><B8>rn Erik Nilsen <bjorn.nilsen@nokia.com>
Date: Mon Aug 9 14:07:01 2010 +0200
Remove dependency of OpenGL Utility Library (GLU).
GLU is not part of standard OpenGL and is not used internally in Qt,
so we should not depend on it.
Task-number: QT-12227
Reviewed-by: kim
(From OE-Core rev: 181874ba8033535bb4ce2b36725ae0a71c27b3bd)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* to keep ${PN}-locale from
bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*"
(From OE-Core rev: 73252b16b501c0986b0ca0895e4534895a9ba3db)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake uses PACKAGES_DYNAMIC as regexp
^ could make matching faster (and it will be more clear that we're expecting regexp not glob)
* made all those last '-' optional, use .* (or nothing)
(From OE-Core rev: 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-embedded was forcing -DQT_KEYPAD_NAVIGATION which depends on feature-completer
* separate variable makes it easier to not enable QT_KEYPAD_NAVIGATION in some upper layer where we have disabled feature-completer
(From OE-Core rev: 0479242a18661cb7fc3d76d208c82fe6ae4378ce)
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>
Without this, circular dependencies are found when attempting to build
multilib versions of qt4 (or bitbake world in a multilib enabled build).
(From OE-Core rev: b2e8cc5ae227656211fb7f32260e7dc4e2fb556e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sofar only formal changes, but to test that everything still builds the same
(From OE-Core rev: 054a0e6c850f92c03fbb6314702de4e6318ccd25)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* in preparation for upgrade to 4.8.3
(From OE-Core rev: 24bf06bbcda4c0dfdad33cdff6394faa52657bb9)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* faster lookup in FILESPATH as small bonus
(From OE-Core rev: 8cc54d2d154b2ed9f931da39d75dc9c135f5e26d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* make it easier to override them in bbappend
* convert pulseaudio to more common -pulseaudio/-no-pulseaudio form
(From OE-Core rev: 34e3687394c6fa18ef0443d63b8d7d0a68c441e0)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* releases.qt-project.org has 4.8.1 as well as 4.8.3
(From OE-Core rev: f12df439b893c70a8cd271ff8b8e6d760b78a2b3)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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>
Eric Bénard
Martin Jansa
Chen Qi
Paul Eggleton
Laurentiu Palcu
Ross Burton
Richard Purdie
Mark Hatle
Wenzong Fan
Kang Kai
Valentin Popa
Anders Darander
Andrei Gherzan
Otavio Salvador