summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4.inc
Commit message (Collapse)AuthorAgeFilesLines
* qt4: remove recipes and classesAlexander Kanavin2016-01-071-392/+0
| | | | | | | | | | | | Qt4 is no longer supportd upstream, but it is still needed for LSB compliancy. Qt4 recipes have been moved to a separate meta-qt4 layer to be consistent with meta-qt3 and meta-qt5. (From OE-Core rev: cb89d2b25b4edb1241bc5426a69a6bc44df9be2c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package: Add auto package splitting of .debug filesRichard Purdie2015-12-161-0/+1
| | | | | | | | | | | | | Creating FILES_${PN}-dbg is tedious and also pretty pointless. We might as well assume ".debug" is a special directory name and split into -dbg automatically. This change does so without changing the rest of the splitting logic too much. It can be disabled for the cases where we really do want manual control of the -dbg packages (e.g. qt4) with NOAUTOPACKAGEDEBUG = "1". (From OE-Core rev: da5ec06814e105451cca11cce76b5c5231110524) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fixes for sed commandRobert Yang2015-07-121-3/+0
| | | | | | | | | | | | | | * There is no $$QT_BUILD_TREE/bin/lrelease in any .pro file, so remove the sed command. * Only translations/translations.pro has "qtPrepareTool(LRELEASE", so use the file name directly rather than find all the .pro files. * The SEDME in linux.conf had been gone in 2010, and no '-Wl,-rpath-link' in linux.conf either, so remove the sed commands. (From OE-Core rev: e519ce3675a90ce6583ced9ddb84260ff08bc74b) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Add explict getVar param for (non) expansionRichard Purdie2015-06-231-1/+1
| | | | | | | | | | | | | | Rather than just use d.getVar(X), use the more explict d.getVar(X, False) since at some point in the future, having the default of expansion would be nice. This is the first step towards that. This patch was mostly made using the command: sed -e 's:\(getVar([^,()]*\)\s*):\1, False):g' -i `grep -ril getVar *` (From OE-Core rev: ab7c1d239b122c8e549e8112c88fd46c9e2b061b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: unconditionally disable gstreamer 0.10 support in qt webkitAlexander Kanavin2015-05-301-0/+1
| | | | | | | | | | | | | Previously it was auto-detected in a broken way, which was causing build errors for qt-mobility. Qt4 build will fail if some gstreamer 0.10 packages are available at build time, but not all. It will not fail if none of the packages are available or if all of them are available. We can't guarantee either, hence this patch. (From OE-Core rev: 968973d55d4b33e1a929ed4cdf9387fcaba2d93f) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: disable Phonon frameworkAlexander Kanavin2015-05-201-2/+2
| | | | | | | | | | | This allows removal of gstreamer 0.10 dependency from Qt4 recipe https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 (From OE-Core rev: 096b71a5c24378a449bc38063316555f02af8e18) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipes: Remove references to eglibcKhem Raj2014-09-011-1/+1
| | | | | | | | | 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>
* qt4: upgrade to version 4.8.6Paul Eggleton2014-06-031-1/+1
| | | | | | | | | | | | * Remove patches merged upstream * Add a qtscript translation package for an additional .qm file added in this release (From OE-Core rev: 32a9c7101c7212c69d40893ee597eaf34955b641) 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>
* qt4: Explicitly disable sqlite2Martin Jansa2014-05-061-1/+1
| | | | | | | | | | | | | | | | | * notice that this disables only sqlite2 (sqlite dependency), sqlite (sqlite3 dependency) stays enabled * fixes these errors detected by test-dependencies.sh: qt4-embedded/qt4-embedded-plugin-sqldriver-sqlite2/latest doesn't exist qt4-embedded/qt4-embedded-plugin-sqldriver-sqlite2-dbg/latest doesn't exist qt4-x11-free/qt4-plugin-sqldriver-sqlite2/latest doesn't exist qt4-x11-free/qt4-plugin-sqldriver-sqlite2-dbg/latest doesn't exist (From OE-Core rev: 279c221d9dfce43254ed1f03cf84ea454cc7b485) 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>
* Globally replace 'base_contains' calls with 'bb.utils.contains'Otavio Salvador2014-04-251-2/+2
| | | | | | | | | | | 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>
* qt4: fixed dependency on icuEnrico Scholz2013-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* qt4-x11-free: depend on ICURoss Burton2013-11-301-1/+1
| | | | | | | | | | | | | | 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>
* lib32-qt4-examples: fix QA warnings and INSANE_SKIP not workHongxu Jia2013-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | 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>
* qt4-x11-free: fix post-processing of QtWebKit.pcAndreas Oberritter2013-07-131-1/+2
| | | | | | | | | | | 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>
* qt4: upgrade to 4.8.5Jonathan Liu2013-07-051-0/+2
| | | | | | | | | | | | 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>
* qt4: add eglibc-gconv-utf-16 to QtCore RRECOMMENDS when using glibcJonathan Liu2013-06-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* qt4: fix path to demos documentationJonathan Liu2013-05-301-1/+1
| | | | | | | | | | | The qt4-demos-doc package is not created when building qt4-x11-free because ${docdir}/qtopia/qch/qt.qch doesn't exist. (From OE-Core rev: 3c73eeda461bf2ea23bf7969b8a8f9c574c75277) 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>
* qt4: remove trailing slash from prefixPaul Barker2013-05-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | The trailing slashs on "Prefix=${prefix}/" and "-prefix ${prefix}/" are passed through to the generated pkgconfig files and may be joined to paths like "/include" yielding a final path with a double forward-slash (eg. "/usr//include"). This may end up in the debugging symbols in other applications or libraries which depend on qt4 which in turn causes the debugedit program to fail with the message "canonicalization unexpectedly shrank by one character" when it tries to replace the double forward-slash with a single forward-slash. Thus the function split_and_strip_files fails and ultimately do_package fails. As this slash is removed from the prefix it is added into the regular expression used to fix up pkgconfig files later in the recipe. This error was seen in vlc in meta-openembedded and should be solved by this change in openembedded-core. (From OE-Core rev: 61a7329a5c1f0b84f447256134f5a77917f07f38) Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Fix sundry erroneous assumptions about ${prefix}Phil Blundell2013-05-021-1/+1
| | | | | | | | | | | | | | | | | | | FILES_${QT_BASE_NAME}-tests was hard-coded to "/usr/tests/..." but Qt actually installs these files into ${prefix}/tests. Conversely, FILES_${PN}-dbg in qt4.inc was defined in terms of ${exec_prefix}/src, which appears commendable but doesn't actually match where package.bbclass will put the sources since the latter is hard-coded to /usr/src. This fixes a large number of "installed but not shipped" warnings when ${prefix} is set to something other than /usr. (From OE-Core rev: c0cfd4f84c8f4843027332cfd6cf99c452c50dbb) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc: package keyboard driversAndreas Oberritter2013-03-051-0/+1
| | | | | | | | | | | | | | | | | * Fixes the following packaging error, if compiled with -plugin-kbd-linuxinput: | WARNING: For recipe qt4-embedded, the following files/directories were installed but not shipped in any package: | WARNING: /usr/lib/qtopia/plugins/kbddrivers/.debug | WARNING: /usr/lib/qtopia/plugins/kbddrivers/.debug/libqlinuxinputkbddriver.so * No PR bump, because -plugin-kbd-linuxinput is not enabled by default. (From OE-Core rev: f477717a6e9b5820b6e6e505d64adb5d3a64abc7) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: use system SQLitePaul Eggleton2013-02-111-1/+1
| | | | | | | | | | | | | | We've always been depending on external SQLite, however by default Qt builds using its own internal copy of SQLite. Add the configure option to actually use the external SQLite library and make it clearer which version is in use. Fixes [YOCTO #2514]. (From OE-Core rev: 33e0afd2fffdef4dccfce6383bc646f975972b1e) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* PACKAGES_DYNAMIC: use += instead of = in most casesMartin Jansa2012-10-191-1/+1
| | | | | | | | | | * 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>
* PACKAGES_DYNAMIC: use regexp not globMartin Jansa2012-10-191-1/+1
| | | | | | | | | | | * 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.inc: move more options to separate variablesMartin Jansa2012-10-021-3/+16
| | | | | | | | | | * 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>
* qt4: Update qt4.inc to remove staticdev deps in -dbg packagesMark Hatle2012-09-121-1/+1
| | | | | | | | | | | | 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>
* qt4: make font packaging specific to embedded versionPaul Eggleton2012-07-311-24/+1
| | | | | | | | | | | | | | | 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>
* qt4: allow recipes building commercial editionPaul Eggleton2012-07-311-1/+6
| | | | | | | | | | | | | | | | | | | | | | | 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>
* Remove a number of unneeded import os/bb callsRichard Purdie2012-07-191-3/+1
| | | | | | | | | | 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>
* Convert tab indentation in python functions into four-spaceRichard Purdie2012-07-191-50/+50
| | | | | | (From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: move functions from python to shell styleDongxiao Xu2012-05-081-2/+3
| | | | | | | | | | | | | | | | | 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>
* qt4: add RPROVIDES/RREPLACES for qmake2 recipePaul Eggleton2012-03-191-0/+3
| | | | | | | | | | | | 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>
* qt4: package static libraries correctly to fix warningsSaul Wold2012-03-151-3/+16
| | | | | | | | | | WARNING: QA Issue: non -staticdev package contains static .a library: qt4-demos path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-demos/usr/bin/qt4/demos/shared/libdemo_shared.a' WARNING: QA Issue: non -staticdev package contains static .a library: qt4-examples path '/work/i586-poky-linux/qt4-x11-free-4.7.4-r39.7/packages-split/qt4-examples/usr/bin/qt4/examples/tools/plugandpaint/plugins/libpnp_basictools.a' (From OE-Core rev: d4f1ef6b8297826230a68e535098709d07de1f48) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix deps in libQtWebkit.la and QtWebKit.pcAndreas Oberritter2012-03-131-0/+1
| | | | | | | | | | | | | * 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>
* meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)Richard Purdie2012-03-051-11/+11
| | | | | | | | sed \ -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data.expand *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)Richard Purdie2012-03-051-3/+3
| | | | | | | | | | | | 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>
* qt4: make pulseaudio support conditional upon DISTRO_FEATURESPaul Eggleton2012-03-021-0/+2
| | | | | | | | | | | | | | 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>
* qt4.inc: depend on tiffAndreas Oberritter2012-02-281-2/+2
| | | | | | | | | | | * 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>
* qt4: build qmake for the targetPaul Eggleton2012-02-281-4/+43
| | | | | | | | | | | | | | | | | | | | | | | 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>
* qt4: add version 4.8.0Paul Eggleton2012-01-041-3/+9
| | | | | | | | | | | | | | | | | | | | | | | 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>
* qt4.inc : Add uic, moc, rcc, and lrelease to tools package.Philip Balister2011-12-131-7/+2
| | | | | | | | | | | | | | | | | | | 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>
* qt4: various tidy-upsPaul Eggleton2011-12-081-1/+5
| | | | | | | | | | | | | | | | | | * -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>
* qt4: fix sed to have correct *.pc filesEric Bénard2011-11-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | 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>
* getVar/setVar cleanupsRichard Purdie2011-11-271-12/+12
| | | | | | | | | 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>
* Convert to use direct access to the data store (instead of bb.data.*Var*())Richard Purdie2011-11-101-10/+10
| | | | | | | | | | | | | | | | | 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 *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free: Fix broken regexes in qt4-x11-free's recipe.Wenzong Fan2011-10-141-5/+5
| | | | | | | | | | | | | | | [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: packaging fixupDmitry Eremin-Solenikov2011-10-041-5/+8
| | | | | | | | | | | | | Improve packaging: * Add phrasebook packages to DYNAMIC_PACKAGES * Correct phrasebook packages generation * Include more files into -dbg packages * Package fontdir and fonts README. (From OE-Core rev: 4e3c29dd90f583cafe7a7fc863efb3720096d67b) Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4.inc: package qtdemo's docs in a separate packageDenis Carikli2011-10-041-1/+7
| | | | | | | | | | | | | | 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>
* qt4.inc: Remove the optional documentation package from the demo's RRECOMMENDSDenis Carikli2011-10-041-2/+1
| | | | | | | | | 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>
* meta: qt4: fix postprocessing of pkg-config filesSimon Busch2011-09-281-3/+1
| | | | | | | | | | | | | 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>
* qt4: allow a reduction in build timeAnders Darander2011-08-191-6/+7
| | | | | | | | | | | | | | | 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>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-21 21:33:19 +0000