summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase.inc
Commit message (Collapse)AuthorAgeFilesLines
* Allow to control (disable) widgets buildOleg Shparber2013-05-281-0/+2
|
* qtbase: Don't use immediate expansion for OE_QMAKE_QMAKE_ORIGMartin Jansa2013-05-241-1/+1
| | | | | | * full path is part of sstate checksum with immediate expansion Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh patches, drop 2 unusedMartin Jansa2013-05-211-10/+9
| | | | | | | | | | | | | * drop Change-Ids, add Upstream-Status * 0010-qmake-property-rename-QT_INSTALL_CONFIGURATION-to-QT.patch was rejected upstream, 0007 was only in meta-qt5/qtbase repo, but wasn't used in recipes * 0004-Disable-mkv8snapshot.patch and 0005-AddSynchoronization-qimagereader.patch are special, because they are applied only to 5.0.0 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: drop setting arch and endianMartin Jansa2013-05-091-3/+0
| | | | | | | | | * endian option was removed from configure * arch/host-arch option is now deprecated and configure shows warning when it's used * both are now autodetected Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: use EXTRA_OEMAKE also in config.tests executed in do_configureMartin Jansa2013-05-091-0/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: move virtual/libgl dependency to extra variableSimon Busch2013-05-091-5/+11
| | | | | | | | | | | | | | * makes it easier to change desktop gl to gles2 in .bbappend * we cannot explicitly disable opengl with -no-opengl, because then it fails to build (probably only when mesa headers are found in sysroot) /qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:62:72: error: 'QPlatformOpenGLContext' has not been declared /qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp: In constructor 'QEGLPlatformContext::QEGLPlatformContext(const QSurfaceFormat&, int*, EGLDisplay, EGLenum)': /qtbase-opensource-src-5.0.0/src/platformsupport/eglconvenience/qeglplatformcontext.cpp:69:70: error: invalid static_cast from type 'int*' to type 'QEGLPlatformContext*' The same with 5.0.2 Signed-off-by: Simon Busch <morphis@gravedo.de> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake5: Fix cleaning separate build directory and use it by defaultMartin Jansa2013-05-091-6/+0
| | | | | | | | | | | | * "${B}/*" in quotes doesn't match anything, better to remove whole directory (incluing .files) and recreate it * not sure why I've added quotes after testing first version, we don't expect B with spaces.. but I'm a bit scared with rm -rf ${SOME_VAR} after one glibc upgrade cleaned my whole disk and attached NFS array when OLD_LOCALE_PATH wasn't detected correctly... * qmake works well with separate B, use it by default Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake5_base: export OE_QMAKE variables only in qtbase recipesMartin Jansa2013-05-091-0/+11
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: drop 'unset LD', qmake should now handle QMAKE_LINK correctlyMartin Jansa2013-05-091-3/+0
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add patch to fix build with LD exported in envMartin Jansa2013-05-091-0/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake5: use QT_CONF_PATH variable in do_generate_qt_config_fileMartin Jansa2013-05-091-1/+1
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: move variables used only in qtbase to qtbase.incMartin Jansa2013-05-071-4/+45
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: drop EXTRA_ENVMartin Jansa2013-05-071-6/+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: 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-18/+18
| | | | | | | | | | | * 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>
* qmake5_base: add qmake5_base_do_configure which allows to declare ↵Martin Jansa2013-05-051-4/+20
| | | | | | | | | QMAKE_VARSUBST_* * don't export it, let recipe decide where to call it or even if it should be called (native recipes are not using it) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: move do_install modifications to shared qt5.inc and reuse do_configureMartin Jansa2013-04-281-11/+0
|
* qtbase: remove some dead codeMartin Jansa2013-04-281-3/+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-3/+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: Override all paths and export sysrootMartin Jansa2013-04-281-23/+39
| | | | | | * otherwise sysroot from native build can leak to target build * missing paths like Qml2Imports were defaulting to devault /usr/qml * synchronize values between qt.conf and configure params
* 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>
* qt5: package files with and without QT_DIR_NAME prefixMartin Jansa2013-04-281-1/+1
| | | | | | * makes it easier to modify paths without QA warnings about unpackaged files Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake: allow to disable debug outputMartin Jansa2013-04-281-2/+2
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qmake_base: remove QT_DIR_NAME from libdirMartin Jansa2013-04-281-2/+2
| | | | | | | | | * 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>
* qt5: Add mkspecs package and update FILES to package ${QT_DIR_NAME} directoriesMartin Jansa2013-04-281-3/+3
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: temporary disable target qmake build and add PN-mkspecsMartin Jansa2013-04-281-12/+16
|
* qtbase: improve internal build system to support OE way of building qtMartin Jansa2013-04-261-40/+38
| | | | | | | | | | | | | | | | | | | * 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-6/+5
| | | | * use 4 spaces everywhere like meta-oe and other layers do now
* qtbase: add udev to DEPENDSMartin Jansa2013-04-171-1/+1
| | | | | | * it's autodetected, causing undeterministic builds Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: replace g++.conf and linux.conf with qmake.confMartin Jansa2013-04-171-0/+11
| | | | | | | | | * 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
* qtbase: drop qmake.conf.sh and qplatformdefsMartin Jansa2013-04-171-8/+0
| | | | | * defaults in linux-g++ are correct, we need only to modify common linux.conf and g++-unix.conf
* qtbase: correctly configureMartin Jansa2013-04-171-28/+33
|
* qtbase: don't touch STAGING and bypass sstateMartin Jansa2013-04-171-33/+5
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add patch to eval QMAKE_CXXMartin Jansa2013-04-171-0/+1
| | | | * fixes errors in log.do_configure trying to call wrong CXX
* qtbase: use the same patch for qt.conf override for target and nativeMartin Jansa2013-04-171-1/+1
|
* qt5-native, qtjsbackend-native: fix .pri and .prl pointing to WORKDIR or ↵Martin Jansa2013-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | * 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: remove unused qmake-build.conf.shMartin Jansa2013-01-011-1/+0
| | | | 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: 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-121-0/+3
| | | | | | * some are not needed as they are included in default value Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: move qtbase specific stuff from qt5.inc to qtbase.incMartin Jansa2012-12-121-0/+97
| | | | | | | * 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>
* qtbase: partially resolves module pri installationMikko Levonmaa2012-12-031-4/+2
| | | | | | | The pri files get correctly placed under the work dir, but fail to stage correctly. Also there are some packaging issues Signed-off-by: Mikko Levonmaa <mikko.levonmaa@gmail.com>
* qtbase: Replace patch to allow specification of qt.conf fileOtavio Salvador2012-11-191-1/+1
| | | | | | | | This patch has been cleaned to the minimum version and is ready for sending to upstream. Once it is accepted, a backport of the final version will be included here. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* qtbase: Drop unused patch for setting qt.conf override supportOtavio Salvador2012-11-191-1/+0
| | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
* qt5: split QT_CONFIG_FLAGS to more separate variablesMartin Jansa2012-11-181-0/+2
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: add recipe for git versionMikko Levonmaa2012-11-151-0/+23
Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>