summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'meta-qt5/krogoth' into master-mingwSamuli Piippo2016-08-191-14/+14
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/krogoth: qtquick1: fix qtwebkit support qtbase: fix drm dependency for eglfs PACKAGECONFIG cmake_qt5.bbclass: when using _prepend don't forget to add space at the end qt5: upgrade to latest revisions in 5.6 branch qtbase: add patch to make Qt5Config modules behave better with cmake builds cmake_qt5: prepend the Qt5 specific CMake variables to EXTRA_OECMAKE Change dependency from virtual/mesa to drm in the kms packageconfig. replace base_contains by bb.utils.contains Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0011-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtenginio_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick1_git.bb recipes-qt/qt5/qtquickcontrols/0001-texteditor-fix-invalid-use-of-incomplete-type-class-.patch recipes-qt/qt5/qtquickcontrols2_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qtsystems_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtx11extras_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I1da3a7689e16e5ffaa6e31030729a4f2f29c501d
| * qt5: upgrade to latest revisions in 5.6 branchMartin Jansa2016-08-051-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * LIC_FILES_CHKSUM were changed because of this small change: commit 4343c4e731c3268614fc79c9c42b4e5e4d59d7e6 Author: Sze Howe Koh <szehowe.koh@gmail.com> Date: Tue Jun 14 19:12:35 2016 +0800 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" * -no-nis option was removed from qtbase in: commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Author: Ralf Nolden <nolden@kde.org> Date: Fri May 20 22:03:39 2016 +0200 Cleanup NIS support leftover from Qt 3/4 * allow to disable eglfs independently from gles2, because eglfs-egldevice may be autodetected when libdrm was built before qtbase since this upstream commit: commit 5c6d27b8dfa695ab04766a1711b00421dba9c7d0 Author: Ralf Nolden <nolden@kde.org> Date: Tue May 17 12:38:44 2016 +0200 Make eglfs-egldevice check work with pkgconfig as well and then it fails to build, because libdrm could be removed from sysroot and drm.h is missing. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Merge remote-tracking branch 'meta-qt5/master' into master-mingwSamuli Piippo2016-05-051-6/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: replace base_contains by bb.utils.contains qt5: upgrade to latest revision in 5.6 branch qt5: set SRCREVs,PVs to 5.6.0 qtquickcontrols: fix compilation of examples/texteditor qtdeclarative: fix compilation of examples/qquickviewcomparison quazip: update to 0.7.2 qtquickcontrols2: initial add 5.6.0 qmake5_base: use remove-libtool bbclass recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONF Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtenginio_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick1_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtwebsockets_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I703197bf7b3802fa22d48a7c9eb04cfa25657c9f
| * qt5: upgrade to latest revision in 5.6 branchMartin Jansa2016-04-211-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtsvg/0001-textobject.pro-use-DEPLOYMENT-only-for-wince-like-ot.patch and qtwebkit/0004-Fix-linking-with-libpthread.patch were resolved upstream * all patches were refreshed with: git format-patch --no-numbered --no-signature -NUMBER to remove numbering from Subject (it's good enough in filename) and to remove git version from signature (so it doesn't look differently when generated on different hosts with different git version). Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Merge remote-tracking branch 'meta-qt5/master' into master-mingwSamuli Piippo2016-02-291-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qtbase: add runtime dependency to xkeyboard-config recipetool: add support for Qt5 to meta-qt5 libconnman-qt5: Blacklist because of connman-qt5.pc qt5: skip libdir for ${PN}-dbg and dev-elf for ${PN}-examples-dev qtbase: upgrade SRCREVs a bit more nativesdk-qtbase: use runtime linked dbus Conflicts: recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb Change-Id: I51f42699487c82a5f0e9c52f5fd5c5bf4bd51eff
| * qtbase: upgrade SRCREVs a bit moreMartin Jansa2016-02-201-2/+2
| | | | | | | | | | | | * to make sure that qtbase modules report 4.6.1 version Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Merge remote-tracking branch 'meta-qt5/master' into master-mingwSamuli Piippo2016-02-221-11/+11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qttransltations: Add PACKAGE for qtwebengine and qtquickcontrols2 qtwebengine: Hide textrel QA warning until there is proper fix for it qtwebengine: Fix QA warning qtwebkit: Fix QA Warning examples: fix few thousands host-user-contaminated QA warnings qtbase: Don't install libQt* files twice qtbase: Resolve QA warning about /bin/bash dependency qtbase: Fix WORKDIR references in pkg-config files qt5: upgrade to latest revisions in 5.6 branch (5.6 RC) qmake5_base: delete *.la files qt5: add Qml support to lupdate qt3d: support qgltf in native and nativesdk builds qt5: use common PACKAGECONFIG to build examples qt5-git.inc: Ensure we export the SRCREV as the module name qtbase: Fix installation of fonts and libraries Conflicts: classes/qmake5_base.bbclass recipes-qt/qt5/nativesdk-qtbase_git.bb recipes-qt/qt5/qt3d_git.bb recipes-qt/qt5/qt5-git.inc recipes-qt/qt5/qtbase-native_git.bb recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch recipes-qt/qt5/qtbase/0003-Add-external-hostbindir-option.patch recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch recipes-qt/qt5/qtbase/0010-Add-external-hostbindir-option-for-native-sdk.patch recipes-qt/qt5/qtbase_git.bb recipes-qt/qt5/qtcanvas3d_git.bb recipes-qt/qt5/qtconnectivity_git.bb recipes-qt/qt5/qtdeclarative_git.bb recipes-qt/qt5/qtenginio_git.bb recipes-qt/qt5/qtgraphicaleffects_git.bb recipes-qt/qt5/qtimageformats_git.bb recipes-qt/qt5/qtlocation_git.bb recipes-qt/qt5/qtmultimedia_git.bb recipes-qt/qt5/qtquick1_git.bb recipes-qt/qt5/qtquickcontrols_git.bb recipes-qt/qt5/qtscript_git.bb recipes-qt/qt5/qtsensors_git.bb recipes-qt/qt5/qtserialport_git.bb recipes-qt/qt5/qtsvg_git.bb recipes-qt/qt5/qtsystems_git.bb recipes-qt/qt5/qttools_git.bb recipes-qt/qt5/qttranslations_git.bb recipes-qt/qt5/qtwayland-native_git.bb recipes-qt/qt5/qtwayland_git.bb recipes-qt/qt5/qtwebchannel_git.bb recipes-qt/qt5/qtwebengine_git.bb recipes-qt/qt5/qtwebkit_git.bb recipes-qt/qt5/qtxmlpatterns_git.bb Change-Id: I0a7763f973c32df796cb3e37c753ddbfe43c4521
| * qt5: upgrade to latest revisions in 5.6 branch (5.6 RC)Martin Jansa2016-02-201-11/+11
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Do not add -target to a cross build qmake.David Schulz2016-02-081-5/+1
| | | | | | | | | | | | | | Otherwise qmake isn't installed correctly to the sysroot. Change-Id: If4883471d99e036be405018dcd8441b7b507283e Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* | Add Windows host support.David Schulz2016-02-031-1/+1
|/ | | | | | Change-Id: I964ede0e49b63f0ff85adc2ad4d260abbe5f8f79 Signed-off-by: David Schulz <david.schulz@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
* qtbase: include oe-device-extra.pri unconditionallySamuli Piippo2015-11-111-1/+1
| | | | | | | | | | | configure parses through the mkspec, but does not handle conditions at all, so oe-device-extra.pri was not included at configure phase. For example QT_QPA_DEFAULT_PLATFORM had no effect for configure. include() is conditional and won't break build even when oe-device-extra.pri does not exist. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.6 branch (5.6.0-alpha1+)Martin Jansa2015-11-111-11/+23
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.5 branch (5.5.1+)upstream/jansa/jethrojansa/jethroMartin Jansa2015-10-231-2/+2
| | | | | | | * this is probably last upgrade for jethro branch, master will switch to 5.6 soon Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: use extra .pri file from linux-oe-g++ mkspecSamuli Piippo2015-10-151-4/+6
| | | | | | | | | Load additional oe-device-extra.pri in the default linux-oe-g++ mkspec to allow simple changing of target dependent values. This is useful for any target that needs to specify e.g., QMAKE_LIBS_EGL or other additional configs. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.5 branchesMartin Jansa2015-09-251-7/+7
| | | | | | * qtbase/0008-Fix-build-with-clang-3.7.patch is now applied upstream Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh patchesMartin Jansa2015-08-251-8/+8
| | | | | | * based on b5.5.0 branches in https://github.com/meta-qt5/qtbase Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes-git: upgrade to 5.5Martin Jansa2015-08-181-19/+20
| | | | | | | | | | * based on my WIP patch + fixes from John Mullen * I was trying to get rhid of 0003-Add-external-hostbindir-option.patch and 0010-Add-external-hostbindir-option-for-native-sdk.patch by using upstream configure parameter added in some previous version, but I've failed, so now good-old -external-hostbindir parameter is back Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to latest revision in 5.4 branchesMartin Jansa2015-06-041-2/+2
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: rename <module>-git directories with patches to just <module>Martin Jansa2015-05-281-0/+351
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: drop recipes for 5.4.1 versionMartin Jansa2015-05-281-351/+0
| | | | | | | | * we don't plan to keep 2 versions, one from tarballs and one from git now there is 5.4.2 in git recipes and 5.4.1 tarballs aren't very useful anymore Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: Refresh patches to match git recipesMartin Jansa2015-02-271-5/+6
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Add gcc to QMAKE_COMPILER variable.Julien Brianceau \(jbriance\)2015-01-051-1/+1
| | | | | | | | | | According to mkspecs/features/spec_post.prf, QMAKE_COMPILER variable should at least contain gcc for linux-oe-g++ platform. This patch fixes a crash issue in QtWebKit introduced in v5.4.0 by: https://qt.gitorious.org/qt/qtwebkit/commit/34d4628b981add039a9a349723cbdff1dadca144 Signed-off-by: Julien Brianceau <jbriance@cisco.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: upgrade from 5.3.2 to 5.4.0Jonathan Liu2014-12-111-14/+14
| | | | | | | | MJ: nativesdk-qtbase, nativesdk-qttools, qtbase-native: Drop unnecessary LICENSE/LIC_FILES_CHKSUM MJ: qtwebkit: move leveldb dependency to .inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Jonathan Liu <net147@gmail.com>
* qt*: refresh the patchesMartin Jansa2014-10-041-4/+4
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* recipes: upgrade from 5.3.0 to 5.3.1Martin Jansa2014-07-061-19/+65
| | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: Refresh patches to match with b5.3.0* branches on github.com/meta-qt5Martin Jansa2014-06-101-9/+9
| | | | | | * move more patches to "shared" section Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: Upgrade from 5.2.0 to 5.2.1Martin Jansa2014-02-191-7/+7
| | | | | | | | | * qtwayland: Use default LICENSE and LIC_FILES_CHKSUM * license texts were added in qtwayland commit 26bdc66fe6c4499332b2ead886a806d09aa07a8a * qtdeclarative, qtserialport: Update QT_MODULE_BRANCH * SHA-1 of v5.2.1 tag is only in release branch Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: upgrade to 5.2.0Martin Jansa2014-01-121-0/+304
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * drop 0027-Fix-misaligned-selection-region-with-text-when-cente.patch resolved in upstream commit 5d8a882c11201a29475c5ea71cfb76c9de6573f5 * drop 0020-Use-BGRA-extension-in-bindTexture.patch resolved in upstream commit e1325cf26e146b68725cc1a0a02b274ce3dfbe5c * drop 0008-wayland-scanner-disable-silent-rules.patch resolved upstream in: commit 2ff2a7c32d76b9e58b800f12469f112cfdb6ad3c Author: Jan Arne Petersen <jan.petersen@kdab.com> Date: Fri Jul 19 14:35:19 2013 +0200 Fix wayland-scanner to work with CONFIG+=silent * squash to match more with structure of https://github.com/meta-qt5/qtbase/tree/stable * qtmodules: bump SRCREVs for 5.2.0 tags now all modules using qt5-git should be newer than any 5.1.* version * qtbase: fix paths in packageconfig *.pc files include- and lib-paths contained build-sysroot paths * qtwebkit: Explicitly add ICU libraries to LIBS fails to build without this * qtjsbackend: remove for git versions Found in [1]: Qt Qml is now using its own built-in Javascript engine and does not depend on V8 anymore. As such the QtJSBackend shared library has disappeared. [1] http://blog.qt.digia.com/blog/2013/09/30/qt-5-2-alpha-available/ * qt5: Upgrade 5.1.1 recipes to 5.2.0 to match git recipes qtjsbackend is now completely gone it allows to share more .patch files and configuration in .inc again Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qt5: drop 5.0.0 and 5.0.1 versionsMartin Jansa2013-05-281-304/+0
| | | | | | | | | | | | | | | | * maintaining 4 different versions requires a lot more testing of changes in .inc files and we have only one version of modules without release (only one _git.bb) and it's impossible to find SRCREV which would be compatible with all 4 versions. * 0005-AddSynchoronization-qimagereader.patch was already backported to 5.0.2 in upstream * 0001-Flickable-Fix-bug-when-flicking-twice-using-touches.patch was already applied in 5.0.2 * 5.0.2 is now default version (based on DEFAULT_PREFERENCE and in qt5-versions.inc Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* qtbase: refresh patches, drop 2 unusedMartin Jansa2013-05-211-2/+1
| | | | | | | | | | | | | * 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: Find wayland-scanner correctlyMikko Levonmaa2013-05-051-6/+8
| | | | | | | * Remove silent rules for wayland-scanner Signed-off-by: Mikko Levonmaa <mikko.levonmaa@palm.com> Signed-off-by: Martin Jansa <martin.jansa@lge.com>
* qtbase: refresh patches and add missing to 5.0.2 and git versionsMartin Jansa2013-04-281-1/+1
|
* qtbase: improve internal build system to support OE way of building qtMartin Jansa2013-04-261-0/+303
* 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>