summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt
Commit message (Collapse)AuthorAgeFilesLines
* 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-256-11/+11
| | | | | | | | | | | 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>
* Revert "qt-mobility: remove /usr/lib from ld rpath-link option"Martin Jansa2014-04-041-6/+0
| | | | | | | | | | | | | | | | | | | | * 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>
* qmmp: update to 0.7.5Kai Kang2014-03-173-30/+10
| | | | | | | | | | | | 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>
* qt-mobility: fix metaobjectbuilder build errorsHongxu Jia2014-02-282-0/+4708
| | | | | | | | | | | | | | | | | | | | | | | | Backport upstream patches to fix the build errors: ipc/qmetaobjectbuilder.cpp:803:65: error: invalid conversion from \ 'QMetaObjectExtraData::StaticMetacallFunction {aka void (*)(QObject*, \ QMetaObject::Call, int, void**)}' to 'QtMobility::QMetaObjectBuilder:: \ StaticMetacallFunction {aka int (*)(QMetaObject::Call, int, void**)} \ Upstream-commit: http://qt.gitorious.org/qt-mobility/qt-mobility/commit/f102053b28009b3094b0e5777177208afa6097c5 Task-number: QTMOBILITY-1990 [YOCTO #4575] (From OE-Core rev: a4b9e424a7186bc3ba49c2566237600ed1682d7f) Signed-off-by: Wenzong Fan <wenzong.fan@windriver.com> Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 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>
* recipes: convert remaining SUMMARY/DESCRIPTION cosmetic issues (part 2)Matthieu Crapet2014-02-205-5/+5
| | | | | | | | | | | | | | | | | | 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>
* qmmp: add SUMMARY and tweak DESCRIPTIONPaul Eggleton2014-01-021-1/+1
| | | | | | | | | | 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>
* Update after toplevel LICENSE file checksum changeRichard Purdie2014-01-022-2/+2
| | | | | | (From OE-Core rev: bbd88aebcabbb19c27a7d752d4a5b8ad9ff9412e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: set SUMMARY and tweak DESCRIPTIONPaul Eggleton2014-01-022-1/+3
| | | | | | | (From OE-Core rev: da0a84295583aaf9f943f7e3a64373079a70024d) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Add missing SUMMARY valuesPaul Eggleton2014-01-021-0/+1
| | | | | | | | | | | | 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>
* Replace one-line DESCRIPTION with SUMMARYPaul Eggleton2014-01-028-8/+9
| | | | | | | | | | | | | | 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>
* qt4: fixed dependency on icuEnrico Scholz2013-12-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | 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-302-2/+2
| | | | | | | | | | | | | | 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: add upstream QTBUG-34218/QTBUG-34234 misaligned selection patchJonathan Liu2013-10-302-0/+76
| | | | | | | | (From OE-Core rev: 3af8f2e0697a9523d3b505ba4c48eca35f6de3a9) 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>
* meta-toolchain-qt: put QT_CONF_PATH in environment scriptLaurentiu Palcu2013-10-291-0/+1
| | | | | | | | | | | 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>
* nativesdk-qt4-tools: create qt.conf fileLaurentiu Palcu2013-10-291-0/+6
| | | | | | | | | | | | | | | | | | | | 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>
* qt4: add upstream QTBUG-31579 patch for QPainter regressionJonathan Liu2013-10-142-0/+49
| | | | | | | | (From OE-Core rev: a5afc67cbfc32beb3be10392bf9788cfc3610ab1) 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-x11-free: disable QGtkStylePaul Eggleton2013-09-261-1/+1
| | | | | | | | | | | | 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>
* qt-mobility: fix build without X11Eric Bénard2013-09-222-0/+74
| | | | | | | | | | | | | else we get : arm-oe-linux-gnueabi-g++ -march=armv7-a -mthumb-interwork -mfloat-abi=softfp -mfpu=neon .../... ibQtSystemInfoE.so.1 -o libQtSystemInfoE.so.1.2.0 .../... -lblkid -ludev -lX11 -lXrandr -lQtDBusE -lQtXmlE -lQtGuiE -lEGL -lQtNetworkE -lQtCoreE -lpthread .../build/tmp-defaultsetup-eglibc-eglibc/sysroots/x86_64-linux/usr/libexec/armv7a-vfp-neon-oe-linux-gnueabi/gcc/arm-oe-linux-gnueabi/4.8.1/ld: cannot find -lXrandr make[2]: *** [../../lib/libQtSystemInfoE.so.1.2.0] Error 1 (From OE-Core rev: 21857f0842501b0c72c77e5fb290aec85b1c28ff) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-toolchain-qt: include the proper cross-canadian packageLaurentiu Palcu2013-09-101-1/+1
| | | | | | | | | | | | 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>
* qt4: add upstream QTBUG-32534 patch for QHttpMultiPart upload corruptionJonathan Liu2013-08-062-0/+44
| | | | | | | | (From OE-Core rev: 59c02272fe77589e265da6fc3fa3db0c76bcdf52) 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>
* qtdemo-init: fix bashismChen Qi2013-08-061-4/+4
| | | | | | | | (From OE-Core rev: 4758e71de8589bc85d317ee6abb187d563771633) 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>
* qt-mobility: tighten up config generation and use PACKAGECONFIGPaul Eggleton2013-07-181-6/+35
| | | | | | | | | | | | | | | | | | * 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>
* 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: add upstream QTBUG-31579 patch to fix polyline drawing regressionJonathan Liu2013-07-102-0/+149
| | | | | | | | (From OE-Core rev: 9cec5833bd1a19794a0d7d77c2412d451dc30dc8) 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: Take PV increase opportunity to drop PRRichard Purdie2013-07-054-8/+0
| | | | | | (From OE-Core rev: b97570c66737a6c404b49459cd95184abb855399) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: upgrade to 4.8.5Jonathan Liu2013-07-0540-399/+23
| | | | | | | | | | | | 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: disable qmeegographicssystemhelperPaul Eggleton2013-07-052-0/+29
| | | | | | | | | | | 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>
* qt-mobility: fix build in the absence of xvideoHongxu Jia2013-07-052-1/+28
| | | | | | | | | | | | | QMake pro files don't explicitly define QT_NO_XVIDEO if the configuration lacks xvideo, but plugins code relies on this define. [YOCTO #4775] (From OE-Core rev: 0d7b208d09e6511dbedfde60abd4bef9a0c596ee) 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>
* Disable build qt related packagegroups on mips64 with 64 bits userspaceKai Kang2013-06-283-0/+9
| | | | | | | | | | | 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>
* qt-mobility: remove /usr/lib from ld rpath-link optionRoy.Li2013-06-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | 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>
* 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: set QMAKE_COMPILER to gcc in mkspecJonathan Liu2013-06-141-0/+2
| | | | | | | | | | | 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>
* qt4: disable gdb_dwarf_indexJonathan Liu2013-06-141-0/+3
| | | | | | | | | | | | | * 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>
* qt4: fix QMAKE_QT_CONFIG being overwritten with empty valueJonathan Liu2013-06-112-0/+40
| | | | | | | | | | | | | | | | 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>
* qt4-native: update configure paths to match targetJonathan Liu2013-06-111-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* qt4-native: build lconvert and xmlpatternsJonathan Liu2013-06-111-1/+3
| | | | | | | | | | 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>
* qt4-x11-free: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: cf5c9ee6128cbec3bf7d74210bd968fba9ac87da) 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-native: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: b56ee1a32f047da288bc7b2435470609b70319fe) 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-embedded: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: 246d16f453466ab609861e170d0b51d7dd23e91a) 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>
* qt-mobility: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: 74fc4c0d17f72f5b59b8da6e03d3a50e8c66d76d) 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>
* nativesdk-qt4-tools.inc: update HOMEPAGEJonathan Liu2013-06-111-1/+1
| | | | | | | | (From OE-Core rev: dbd5c1fda3b477e861a979e98a4f879071bebc37) 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: 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>
* qt: fix warning -Wunused-local-typedefs introduced by gcc 4.8Andreas Müller2013-05-215-3/+42
| | | | | | | | | | | | | | | | | | in meta-oe maliit-framework failed with | In file included from /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt4/QtCore/QtCore:53:0, | from ../utils/core-utils.cpp:18: | /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt4/QtCore/qtconcurrentfilter.h: In function 'QtConcurrent::ThreadEngineStarter<void> QtConcurrent::filterInternal(Sequence&, KeepFunctor, Redu | /home/andreas/tmp/oe-core-eglibc/sysroots/overo/usr/include/qt4/QtCore/qtconcurrentfilter.h:108:47: error: typedef 'Iterator' locally defined but not used [-Werror=unused-local-typedefs] | typedef typename Sequence::const_iterator Iterator; | ^ | cc1plus: all warnings being treated as errors (From OE-Core rev: 4cb93a42bae3dfa53880a9475a92cc046dde5767) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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-022-3/+3
| | | | | | | | | | | | | | | | | | | 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-embedded: bump PR to allow removal of meta-oe bbappendPaul Eggleton2013-04-161-1/+1
| | | | | | | | | | The meta-oe bbappend only increments PRINC, if we bump INC_PR here we can remove that. (From OE-Core rev: 9e74a1c9cb753a426b55544cc41860edb98e8d33) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packagegroup-qte-toolchain-target: bump PR to allow removal of meta-oe bbappendPaul Eggleton2013-04-161-1/+1
| | | | | | | | | | The meta-oe bbappend only increments PRINC, if we bump PR here we can remove that. (From OE-Core rev: 7aadfe2f293da665236aede5cb03f801d420d050) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-x11-free: bump PR to allow removal of meta-oe bbappendPaul Eggleton2013-04-161-1/+1
| | | | | | | | | | The meta-oe bbappend only increments PRINC, if we bump INC_PR here we can remove that. (From OE-Core rev: 976a06f41558d2246173414658d9f7b8eee193d6) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 01:15:43 +0000