aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4
AgeCommit message (Collapse)Author
2012-02-01qt4-tools-nativesdk-4.8.0: fix buildEric Bénard
the build is actually failing because host g++ and ld are used to compile and link Signed-off-by: Eric Bénard <eric@eukrea.com>
2012-01-06qt4-x11-free.inc: use QT_BASE_NAME from qt4x11.bbclassOtavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-01-06qt4-embedded.inc: use QT_BASE_NAME from qt4e.bbclassOtavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2012-01-05qt4: add Upstream-Status to recently added qt-4.8.0 patchPaul Eggleton
Add Upstream-Status to qmake_cxx_eval.patch. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2012-01-04qt4: add version 4.8.0Paul Eggleton
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-04qt4: fix incorrect architecture for qt4 toolsPaul Eggleton
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]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-15Patch Upstream Status UpdatesSaul Wold
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-12-15qt-mobility: Fix QA error for debug filesSaul Wold
RP: Add PR bump Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-13qt4: use armv6 override instead of armv6-vfpMartin Jansa
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2011-12-13qt4.inc : Add uic, moc, rcc, and lrelease to tools package.Philip Balister
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.) 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>
2011-12-08qt4: various tidy-upsPaul Eggleton
* -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 Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-12-08qt4: fix debug symbol strippingPaul Eggleton
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. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-11-29qt-mobility: Add missing patchRichard Purdie
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-29qt4: qt-mobility: fix QML video player crashAnatolij Gustschin
Fix QML video player crash which happens when attempting to play OGG video files. Signed-off-by: Anatolij Gustschin <agust@denx.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-29qt4: fix sed to have correct *.pc filesEric Bénard
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} Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-26getVar/setVar cleanupsRichard Purdie
Complete the bb.data.getVar/setVar replacements with accesses directly to the data store object. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-15qt4-x11-free: bring back pkg-config fixupsSimon Busch
* 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 Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
2011-11-11qt-mobility: qa_configure stage failedDmitry Cherukhin
The catalogue /usr/lib removed from Makefiles used for building configure tests. Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
2011-11-10Convert to use direct access to the data store (instead of bb.data.*Var*())Richard Purdie
This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-17qt4: Added support for QtMobility 1.2Dmitry Cherukhin
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. Signed-off-by: Dmitry Cherukhin <dima_ch@emcraft.com>
2011-10-14qt4: use 4.7.4 as default preferenceOtavio Salvador
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe.Wenzong Fan
[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. Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com>
2011-10-12qt4: Drop old version 4.7.3Richard Purdie
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04qt4-embedded: move qt4-embedded-conf from RDEPENDS to RRECOMMENDSJames Limbouris
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. Signed-off-by: James Limbouris <james@digitalmatter.com.au> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04qt4: packaging fixupDmitry Eremin-Solenikov
Improve packaging: * Add phrasebook packages to DYNAMIC_PACKAGES * Correct phrasebook packages generation * Include more files into -dbg packages * Package fontdir and fonts README. Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04qt4: Fix translation supportOtavio Salvador
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] 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>
2011-10-04qt4: Update to latest version 4.7.4Eric Bénard
- 4.7.4 was release on the 1st of september, the changelog is available here : http://qt.gitorious.org/+qt-developers/qt/releases/blobs/v4.7.4/dist/changes-4.7.4 and mostly contains bug fix. - this patch include the fix for QTBUG-20925 which was a regression against 4.7.3 : https://bugreports.qt.nokia.com/browse/QTBUG-20925 http://qt.gitorious.org/qt/qt/commit/852abfca6f4c349dce9b895956922f96d82df579 thanks to Paul Eggleton to point us to this bug. Signed-off-by: Eric Bénard <eric@eukrea.com>
2011-10-04qt4: Fix translation supportOtavio Salvador
The translation support was disable in build. The fix-translation.patch was imported from OpenEmbedded to fix a linking issue in phonon translation support. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
2011-10-04qt4.inc: package qtdemo's docs in a separate packageDenis Carikli
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. Signed-off-by: Denis Carikli <denis@eukrea.com>
2011-10-04qt4(embedded and x11): Disable neon for armv6-vfpDenis Carikli
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. Signed-off-by: Denis Carikli <denis@eukrea.com>
2011-10-04qt4.inc: Remove the optional documentation package from the demo's RRECOMMENDSDenis Carikli
The documentation is 285M and doesn't fit on the NAND of many machines. Signed-off-by: Denis Carikli <denis@eukrea.com>
2011-10-04qt4: fix generated sdkEric Bénard
- 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). Signed-off-by: Eric Bénard <eric@eukrea.com>
2011-09-27qt4-embedded: move qte.sh profile script into own packageSimon Busch
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. Signed-off-by: Simon Busch <morphis@gravedo.de>
2011-09-27meta: qt4: fix postprocessing of pkg-config filesSimon Busch
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. Signed-off-by: Simon Busch <morphis@gravedo.de>
2011-09-15qt4: add blacklist-diginotar-certs patchEric Bénard
- 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/ Signed-off-by: Eric Bénard <eric@eukrea.com>
2011-08-26qt4-tools-nativesdk: remove gcc standard pathsKang Kai
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. Signed-off-by: Kang Kai <kai.kang@windriver.com>
2011-08-18qt4: allow a reduction in build timeAnders Darander
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() Signed-off-by: Anders Darander <anders@chargestorm.se>
2011-08-15qt4.inc: expand the package name for multilib caseYu Ke
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] Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-08-15qt4.inc: revise RRECOMMENDSYu Ke
using ${QT_BASE_NAME}-dbg as RRECOMMENDS is not correct in qt4-x11-free case, because ${QT_BASE_NAME}-dbg i.e. qt4-dbg does not exist this patch fix it by using ${PN} Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-08-15qt4: delete unpackaged uic3 to avoid unpackaged file warningPaul Eggleton
All the other utilities get deleted as they should not be packaged, delete this one as well. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-08-15qt4: package QML plugins and correct their install directoryPaul Eggleton
QML components from Qt were installed to ${prefix} before and never got packaged. This is now fixed and QML components are now installed into ${libdir}/${QT_DIR_NAME}/imports and packaged into qt4-*-qml-plugins package. Additionally qmlviewer and the examples/demos are now dependent upon these plugins as needed. Originally based on OE commit 4adf97be8c5b5f71ad92095a19968af534baa9e2 by Simon Busch <morphis@gravedo.de> Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-08-15qt4-native: restore build of uic3, qdbuscpp2xml and qdbusxml2cppPaul Eggleton
These tools are required to build some external utilities (such as those found in KDE). We avoid building qdbus and qdbusviewer as these are not required. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-08-15qt4: replace qt4-tools-native with qt4-nativePaul Eggleton
Installs native versions of the Qt libraries in addition to the tools, allowing compilation of external native tools that require Qt libs. PROVIDES qt4-tools-native so it should be a drop-in replacement. Developed with reference to the corresponding qt4-native changes in OE. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-07-26meta: Rename SITEINFO_ENDIANESS to SITEINFO_ENDIANNESSKhem Raj
There is this discrepency in spelling. Lets fix it in core. There are lot of layers using SITEINFO_ENDIANNESS This was shielded since meta-oe had its own copy of siteinfo class. But that class has now been deleted in favor of oe-core Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-13Patches: Fix Upstream-Status infoSaul Wold
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-07-07libQtOpenGL:Add libQtOpenGL to an lsb imageXiaofeng Yan
I make "opengl" as a DISTO_FEATURE for installing libQtOpenGL to image. Fix Bug [YOCTO #1020] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-05qt4: Package debug source filesRichard Purdie
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-05qt4: ensure target packages don't include host binariesPaul Eggleton
Remove uic, rcc, moc and lrelease from packaged files. This fixes the following QA warnings: qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg, ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/uic qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg, ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/rcc qt4-x11-free-4.7.3, wrong architecture, qt4-tools-dbg, ${WORKDIR}/packages-split/qt4-tools-dbg/usr/bin/.debug/moc qt4-x11-free-4.7.3, wrong architecture, qt4-tools, ${WORKDIR}/packages-split/qt4-tools/usr/bin/uic qt4-x11-free-4.7.3, wrong architecture, qt4-tools, ${WORKDIR}/packages-split/qt4-tools/usr/bin/rcc qt4-x11-free-4.7.3, wrong architecture, qt4-tools, ${WORKDIR}/packages-split/qt4-tools/usr/bin/moc qt4-x11-free-4.7.3, wrong architecture, qt4-linguist, ${WORKDIR}/packages-split/qt4-linguist/usr/bin/lrelease These utilities are all provided by qt4-tools-nativesdk in any case. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
2011-07-01Drop PRIORITY variableRichard Purdie
As discussed on the mailing list, this variable isn't useful and if wanted would be better implemented by distros using pn-X overrides. This patch executes: find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d' against the tree removing the referenced. Thanks to Phil Blundell for the command. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-22qt4-tools-nativesdk: fix compile failure in src/dbusPaul Eggleton
[Qt #17962] -- http://bugreports.qt.nokia.com/browse/QTBUG-17962 [YOCTO #1168] -- http://bugzilla.pokylinux.org/show_bug.cgi?id=1168 Fix "invalid conversion from 'const void*' to 'void*'" error compiling src/dbus/qdbusintegrator.cpp. It is assumed that the use of "const" here is incorrect as no other usage of Q_GLOBAL_STATIC_WITH_ARGS uses const prefix on the first (TYPE) argument. Patch was imported from the Qt bug tracker (see above reference); the patch was rejected but for procedural rather than validity reasons. Fixes [YOCTO #1168] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-06-13 22:51:26 +0000