summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase-native.inc
Commit message (Collapse)AuthorAgeFilesLines
* qtbase-native: fix install pathsMartin Jansa2013-05-071-0/+15
| | | | | | | | * 5.0.2+git was installing uic in wrong directory STAGING_DIR_NATIVE was there twice, while debuging this I've noticed that headers and docs are installed in this wrong directory also in other versions Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: drop EXTRA_ENVMartin Jansa2013-05-071-3/+0
| | | | | | | | | | | | | * all variables should be now correctly set by qmake * setting PARALLEL_MAKE in MAKEFLAGS can cause PARALLEL_MAKE * PARALLEL_MAKE processes, because first -j is applied on top level directory and then again in each subdir, but it's faster then make -j PARALLEL_MAKE only in top directory * setting QMAKE breaks build in src/tools/bootstrap, because it forces relative path bin/qmake which isn't correct Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: Apply 0001-Always-build-uic.patch for all versionsMartin Jansa2013-05-071-0/+4
| | | | | | | * when uic does not exist in QT_EXTERNAL_HOST_BINS it will silently switch to /usr/bin/qt5/uic and build will fail a bit later Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Find wayland-scanner correctlyMikko Levonmaa2013-05-051-0/+1
| | | | | | | * Remove silent rules for wayland-scanner Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> Signed-off-by: Martin Jansa <martin.jansa@lge.com>
* qmake5_base: define variables for paths used by qmake in one placeMartin Jansa2013-05-051-7/+8
| | | | | | | | | | | * makes it easier to change them, should be reused also in FILES_* variables * table of path variables and their different names available at https://github.com/meta-qt5/meta-qt5/wiki/Building-with-OE * all variables have OE_QMAKE_PATH_ prefix and then name from qmake varaible Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: remove some dead codeMartin Jansa2013-04-281-1/+0
|
* qt5: move SSTATE_SCAN_FILES to qmake5_base.bbclassMartin Jansa2013-04-281-2/+0
| | | | | * penalty for more replacements is better then to forget to add this in some component which will also install .prl files
* qtbase: Remove QT_DIR_NAME, QT_BASE_NAMEMartin Jansa2013-04-281-1/+0
| | | | | * QT_DIR_NAME is set in qmake5_base * QT_BASE_NAME isn't used
* qtbase: Fix INCDIR/LIBDIR paths in .prl filesMartin Jansa2013-04-281-0/+1
|
* qtbase: add patches to fix wrong libdir/include dirs in pkgconfig and ↵Martin Jansa2013-04-281-0/+3
| | | | | | | | | libtool files * qt_module.prf replacements were creating -L/usr/lib in .pc files which is bad for cross-compilation * also use '=' for sysroot in libtool files Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake: allow to disable debug outputMartin Jansa2013-04-281-1/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase-native: Enable debug output from Makefile generationMartin Jansa2013-04-281-2/+2
|
* qmake_base: remove QT_DIR_NAME from libdirMartin Jansa2013-04-281-0/+1
| | | | | | | | | * using ${libdir}/${QT_DIR_NAME} is causing pkgconfig files to be installed in this prefix too * modify ArchData variable to move mkspecs files to qt5 prefix (so that they don't conflict with qt4) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: improve internal build system to support OE way of building qtMartin Jansa2013-04-261-23/+28
| | | | | | | | | | | | | | | | | | | * add linux-oe-g++ mkspec directly with patch * add functions to read and eval OE_QMAKE functions from mkspec and also export them with QMakeVar to be available also for config.tests * add external-host-bindir parameter to skip building native tools even when we're in fact cross-compiling (because we have them from qtbase-native build already). * use separated ${B} and ${S} and clean ${B} when reconfiguring stalled qmake cache can be used when configure is reexecuted cleaning ${B} prevents that and provide cleaner separation * OE_QMAKE_AR cqs is added by Makefile, having it here too was causing issues * isEmpty(QT_EXTERNAL_HOST_BINS) doesn't work, so lets use exist() even when it allows to incorrectly set wrong directory and build native tools again (instead of skipping them) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: unify indentationMartin Jansa2013-04-171-40/+40
| | | | * use 4 spaces everywhere like meta-oe and other layers do now
* qtbase: replace g++.conf and linux.conf with qmake.confMartin Jansa2013-04-171-5/+15
| | | | | | | | | * g++.conf and linux.conf were outdated a lot, lacking new options like QMAKE_COMPILER causing a lot of warning like: Project WARNING: qmake spec does not announce the compiler family. Guessed gcc. * Instead of replacing whole common files, use custom qmake.conf which overwrites common setting after including it
* qmake: fix MAKEFLAGS when PARALLEL_MAKE has spaceMartin Jansa2013-04-171-1/+1
| | | | | | * 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-171-2/+1
|
* qt5-native, qtjsbackend-native: fix .pri and .prl pointing to WORKDIR or ↵Martin Jansa2013-04-171-10/+21
| | | | | | | | | | | | | | | | | | | | | 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-171-0/+63
* 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>