summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* qtbase: drop qmake.conf.sh and qplatformdefsMartin Jansa2013-04-173-50/+0
| | | | | * defaults in linux-g++ are correct, we need only to modify common linux.conf and g++-unix.conf
* qtbase: correctly configureMartin Jansa2013-04-173-35/+38
|
* qtbase: don't touch STAGING and bypass sstateMartin Jansa2013-04-173-34/+19
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add patch to eval QMAKE_CXXMartin Jansa2013-04-172-0/+36
| | | | * fixes errors in log.do_configure trying to call wrong CXX
* qmake5_base: define both QMAKESPEC and let recipe select which one to useMartin Jansa2013-04-171-3/+6
| | | | | | | | | * different platform/xplatform can enable cross-compile build in upstream qmake but that's not the same as what recipes are doing (upstream builds native tools when bootstraping target qtbase, recipes build native tools with separate qtbase-native and then want to skip building tools) * still separate variables for both QMAKESPECs can be useful e.g. for other native recipes
* qmake: fix MAKEFLAGS when PARALLEL_MAKE has spaceMartin Jansa2013-04-172-2/+2
| | | | | | * quotes are needed, because some people have '-j 9' instead of '-j9' * this can in theory cause PARALLEL_MAKE x PARALLEL_MAKE threads, because MAKE itself is using PARALLEL_MAKE threads to run inner makes
* qtbase: use the same patch for qt.conf override for target and nativeMartin Jansa2013-04-175-65/+48
|
* qt5-native, qtjsbackend-native: fix .pri and .prl pointing to WORKDIR or ↵Martin Jansa2013-04-176-72/+63
| | | | | | | | | | | | | | | | | | | | | absolute sysroot * fix paralel build * default make does good job, cleans mkspecs, installs all headers and libs needed for qtjsbackend-native * move native tools to QT_DIR_NAME prefix, this way qt4 and qt5 can be staged at the same time * only variables referencing WORKDIR are now QMAKE_PRL_BUILD_DIR ./x86_64-linux/usr/lib/libQt5Network.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/network/ ./x86_64-linux/usr/lib/libQt5Xml.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/xml/ ./x86_64-linux/usr/lib/libQt5Bootstrap.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/tools/bootstrap/ ./x86_64-linux/usr/lib/libQt5Concurrent.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/concurrent/ ./x86_64-linux/usr/lib/libQt5Core.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/corelib/ ./x86_64-linux/usr/lib/libQt5Test.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/testlib/ ./x86_64-linux/usr/lib/libQt5Sql.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/sql/ ./x86_64-linux/usr/lib/libQt5DBus.prl:QMAKE_PRL_BUILD_DIR = /OE/oe-core/tmp-eglibc/work/x86_64-linux/qt5-native/5.0.1-r0.0/qtbase-opensource-src-5.0.1/src/dbus/ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-native: rename to qtbase-native to avoid confusionMartin Jansa2013-04-179-8/+7
| | | | | | | * we also had PROVIDES for qt5-tools-native, this makes it a bit easier to see what is what * drop FILESEXTRAPATHS, not needed after renaming to match BPN with qtbase patches Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.0.1Eric Blade2013-02-1813-37/+35
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5-native: Getting rid of printf statements in qmakeMikko Levonmaa2013-02-172-4/+2
| | | | | | | | They will cause the building of cmake-native to fail as it will parse the output of qmake -query and is not expecting to find the added lines in the output Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
* qt5: move module specific files to own directoriesMartin Jansa2013-01-015-1/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: remove unused qmake-build.conf.shMartin Jansa2013-01-012-32/+0
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade recipes to use 5.0.0 tarballsMartin Jansa2012-12-2018-58/+79
| | | | | | | * and change DEFAULT_PREFERRENCE for git recipes negative again * bump SRCREV in git recipes to latest and update PV Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: don't touch STAGING_DATADIRMartin Jansa2012-12-191-1/+0
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase, qtdeclarative: bump SRCREV to latestMartin Jansa2012-12-173-3/+3
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Merge pull request #7 from levonmaa/masterOtavio Salvador2012-12-172-1/+6
|\ | | | | Fix up prl and pkgconfig file generation and paths for the qt.conf
| * qmake5: library path correction in generated qt.confMikko Levonmaa2012-12-141-1/+1
| | | | | | | | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
| * qtbase: fix up prl and pkgconfig file generationMikko Levonmaa2012-12-141-0/+5
|/ | | | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
* qt5: fixup FILES_ entriesMartin Jansa2012-12-122-11/+8
| | | | | | * some are not needed as they are included in default value Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: use lastest SRCREV in stable branchesMartin Jansa2012-12-126-9/+9
| | | | | | * master branches were removed today and old SRCREVs are invalid now Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtjsbackend: use common qt5.incMartin Jansa2012-12-121-12/+3
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtdeclarative: use common qt5.inc, fix invalid PACKAGESMartin Jansa2012-12-121-13/+3
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: move qtbase specific stuff from qt5.inc to qtbase.incMartin Jansa2012-12-122-93/+99
| | | | | | | * qt5.inc should be used by all qtmodule.inc * add missing PACKAGES in qt5.inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: disable xcbMartin Jansa2012-12-121-2/+5
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Merge pull request #6 from levonmaa/qtjsbackend-native-fixOtavio Salvador2012-12-1114-43/+64
|\ | | | | fix qtjsbackend-native build
| * qtjsbackend: fix native dependencyMikko Levonmaa2012-12-114-5/+29
| | | | | | | | | | | | Also fixes the broken qtjsbackent-native recipe Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
| * qtdeclarative: fix typoMartin Jansa2012-12-111-1/+1
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtjsbackend: fix SRC_URI formattingMartin Jansa2012-12-112-3/+3
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtjsbackend_4.999+git: use common structure and bump SRCREV to latestMartin Jansa2012-12-112-9/+6
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtdeclarative_4.999+git: use common structure and bump SRCREV to latestMartin Jansa2012-12-111-4/+3
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtdeclarative: LIC_FILES_CHKSUM should be in source, not COMMON_LICENSE_DIRMartin Jansa2012-12-111-1/+2
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5-4.999+git.inc: update PV for SRCREVs after 5.0.0-rc1Martin Jansa2012-12-111-1/+1
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase, qt5-native: upgrade to 5.0.0-rc1Martin Jansa2012-12-115-18/+18
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5-4.999+git.inc: fix PV formatMartin Jansa2012-12-111-1/+1
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase-4.999+git: bump SRCREV to latestMartin Jansa2012-12-111-1/+1
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5-native-4.999+git: bump SRCREV to latestMartin Jansa2012-12-111-1/+1
|/ | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Merge pull request #5 from levonmaa/masterOtavio Salvador2012-12-1016-26/+264
|\ | | | | Fixed installations and recipes for qtjsbackend and qtdeclarative
| * qtdeclarative: packaging update and recipe cleanupMikko Levonmaa2012-12-092-9/+15
| | | | | | | | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
| * qtjsbackend: SHA bumpMikko Levonmaa2012-12-095-7/+5
| | | | | | | | | | | | Also uses the same qmake.conf as other modules Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
| * qtbase: fix installationsMikko Levonmaa2012-12-092-17/+27
| | | | | | | | | | | | | | | | | | | | Created new variables OE_CROSS_INSTALL_DATA and OE_CROSS_HOST_DATA to support the installation and configuration of qtbase and dependant modules. Added paths for Qml2Imports Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
| * qt5-native, qtbase: Git version is preferredMikko Levonmaa2012-12-095-5/+7
| | | | | | | | | | | | Atleast until qt5 is offciall released. Also updated git SHAs Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
| * qtdeclarative: Initial recipeMikko Levonmaa2012-12-073-0/+47
| | | | | | | | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
| * qtjsbackend: fixed packagingMikko Levonmaa2012-12-071-3/+3
| | | | | | | | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
| * qtjsbackend: Initial recipeMikko Levonmaa2012-12-077-0/+151
| | | | | | | | Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
| * Updated QT_CONF_PATH default values in qmake5_baseMikko Levonmaa2012-12-072-14/+38
| | | | | | | | | | | | | | | | | | This allows the subsequent modules to install correctly. Also during do_configure we stage target specific file into the staging area and modify some prf files inorder to make the module (qt_lib_<module>.pri) files install correctly Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
* | Merge pull request #3 from levonmaa/masterOtavio Salvador2012-12-056-15/+49
|\| | | | | qtbase: mkspecs are now staged correctly
| * qtbase: mkspecs are now staged correctlyMikko Levonmaa2012-12-046-15/+49
|/ | | | | | | | | | | | They are placed under STAGING_DATADIR as they need to be kept separate from the native side. The reason for doing so is that some qt modules require native tools and the mkspecs in STAGING_DATADIR_NATIVE cannot be polluted with the target mkspecs There are still some packaging issues Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
* qt5-native: explicitly disable xcbMartin Jansa2012-12-041-1/+1
| | | | | | | | | | | | | | | | | * otherwise we need for -system-xcb libxcb-native libxau-native libxdmcp-native xcb-util-wm-native xcb-util-image-native xcb-util-keysyms-native or for -qt-xcb libxcb-native libxau-native libxdmcp-native and fix underlinking in xcb linking test (QMAKE_LIBS_XCB) | linking xcb | /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXau.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link) | /usr/lib/gcc/x86_64-pc-linux-gnu/4.7.2/../../../../x86_64-pc-linux-gnu/bin/ld: warning: libXdmcp.so.6, needed by /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so, not found (try using -rpath or -rpath-link) | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauDisposeAuth' | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XauGetBestAuthByAddr' | /OE/oe-core/tmp-eglibc/sysroots/x86_64-linux/usr/lib/libxcb.so: undefined reference to `XdmcpWrap' Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* Merge pull request #2 from levonmaa/masterMartin 'JaMa' Jansa2012-12-037-20/+97
|\ | | | | Updating recipes to use correct tools and fixing installations