summaryrefslogtreecommitdiffstats
path: root/meta/recipes-qt/qt4/qt4-tools-nativesdk.inc
Commit message (Collapse)AuthorAgeFilesLines
* qt4: move functions from python to shell styleDongxiao Xu2012-05-311-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: 98cb2efe4e9f3092d531c9fc809406c3ef559725) Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> [SG: Resolve merge conflicts for 1.2.1] Signed-off-by: Scott Garman <scott.a.garman@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk: improve and tidy up qmake buildPaul Eggleton2012-02-281-9/+13
| | | | | | | | | | | | | * Use the same method to build qmake as in the qt4 target recipes * We always have qmake from qt4-native so don't check if it exists - just skip the check like we do in the qt4 target recipes. This saves us a patch. * Replace qt4-tools-native in DEPENDS with qt4-native (From OE-Core rev: 71153270466352245fe2aa3318bbabb1f8062ed2) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk: fix build of 4.7.4Paul Eggleton2012-02-281-4/+7
| | | | | | | | | | | Commit 4ccae37db1aa77a1d15098c3720ea6e2d383fbdc introduced a sed command line to modify a file that only exists in 4.8.0, thus do_configure of 4.7.4 was failing; so make this conditional upon the file existing. (From OE-Core rev: 0b948d20b835387702a4f5e103eaae5b4a330edd) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk-4.8.0: fix buildEric Bénard2012-02-011-3/+7
| | | | | | | | | | the build is actually failing because host g++ and ld are used to compile and link (From OE-Core rev: 4ccae37db1aa77a1d15098c3720ea6e2d383fbdc) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add version 4.8.0Paul Eggleton2012-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | 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: Fix translation supportOtavio Salvador2011-10-041-1/+1
| | | | | | | | | | | The translation support was disable in build. The fix-translation.patch was imported from OpenEmbedded to fix a linking issue in phonon translation support. (From OE-Core rev: 8d5a5d78f9e83c64ebddcecd7c4fd89cc1264163) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: fix generated sdkEric Bénard2011-10-041-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | - 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). (From OE-Core rev: 5f6fb92b939147d2d6aa7790a378d4b7cce3ada5) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: add blacklist-diginotar-certs patchEric Bénard2011-09-151-1/+1
| | | | | | | | | | | - 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/ (From OE-Core rev: abf51c33aba51782246a9136dddb53893216f518) Signed-off-by: Eric Bénard <eric@eukrea.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk: remove gcc standard pathsKang Kai2011-08-291-7/+2
| | | | | | | | | | | 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. (From OE-Core rev: be86cbf54f3aeeda1105acd153fe09348a7ac267) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Drop PRIORITY variableRichard Purdie2011-07-011-1/+0
| | | | | | | | | | | | | | | | 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. (From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk: fix compile failure in src/dbusPaul Eggleton2011-06-221-0/+1
| | | | | | | | | | | | | | | | | | | | [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] (From OE-Core rev: 17d5422460bf9074223475b15d128171d12b170a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk: drop freetype include as we build with -no-freetypePaul Eggleton2011-06-221-1/+0
| | | | | | | | | | | | | Freetype support is disabled so there's no need to point to the freetype headers. Prompted by OE commit 4931b37c8faf1eef7322cc82bf979885c770f4e0 from Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> (From OE-Core rev: bc5647504268ec4ef8a20dd1a6f9bdf7e6849ba7) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk: fix unpack failure due to missing g++.confPaul Eggleton2011-06-221-2/+3
| | | | | | | | | | | | | | FILESPATHPKG was being used to in order to bring in linux.conf and g++.conf in this recipe, however this probably never worked since FILESPATHPKG always has the MACHINE appended to it and these are not machine-specific files. The only reason it built was that these two files could be found within the "files" subdir until we removed Qt 4.6.3. Using FILESEXTRAPATHS (as qt4-tools-native does) solves this. (From OE-Core rev: 49102f3728425cacfaeb384491b9355bfa2a4230) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4-tools-nativesdk: -arch is required for nativesdk buildIlya Yanok2011-05-131-0/+3
| | | | | | | | | | We need to pass correct -arch option to configure to fix building in case of SDK_ARCH != BUILD_ARCH. (From OE-Core rev: af22757737f3b5e2d58eba8c5e01176ac26592c5) Signed-off-by: Ilya Yanok <yanok@emcraft.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* qt4: Add qt4-tools-nativesdk based on qt4-tools-sdk from OpenEmbeddedPaul Eggleton2011-02-011-0/+111
Differences from OpenEmbedded qt4-tools-sdk: * Convert to nativesdk and make fixes necessary to build * Use .inc file in 4.6.3 version * Add LIC_FILES_CHKSUM * Fix LICENSE to match other Qt4 recipes * Use http source URL to match other Qt4 recipes * Whitespace fixes Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-03 19:33:04 +0000