aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-qt
Commit message (Collapse)AuthorAgeFilesLines
* qt5: update submodulesv5.6.35.6Mikko Gronoff2017-09-1423-23/+23
| | | | | | | | Update submodules to Qt 5.6.3 RC1 Task-number: QTBUG-63087 Change-Id: Ic1fefaa1b151026b685c7a71889582d825c4a871 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesMikko Gronoff2017-08-1411-12/+12
| | | | | | | Qt 5.6.3 (snapshot 2) Change-Id: Icd4a041a4923be083d93efafd6c1c3e58e441614 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* qt5: update submodulesMikko Gronoff2017-08-1132-199/+39
| | | | | | | Update submodules to Qt 5.6.3 (snapshot 1) Change-Id: I67d3799d7822173a6cbe9b3e60223dca79ae7f6e Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* Merge remote-tracking branch 'upstream/krogoth' into 5.6Mikko Gronoff2017-06-077-2/+164
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/krogoth: qtwebkit: depends on gperf-native cmake_qt5.bbclass: add qtbase-native to DEPENDS Update Qt5's git repositories to match new locations qtwebengine: Add gperf-native to DEPENDS qtwayland: Fix building of QWaylandIntegration if some Qt5 features are disabled. qt5: update submodules qtbase: avoid qmake errors due to missing oe-device-extra.pri qtdeclarative: add upstream patch to fix QtQml crash with GCC 6 Conflicts: recipes-qt/qt5/qtbase_git.bb Change-Id: Ic773b1eaa0d5c84316352ae41d7ec5cd2d5c8048
| * qtwebkit: depends on gperf-nativeGordan Markuš2017-02-201-1/+1
| | | | | | | | | | Signed-off-by: Gordan Markuš <gordan.markus@pelagicore.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * Update Qt5's git repositories to match new locationsVesa Jääskeläinen2016-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Qt5's repositories in github has changed locations. Qt5 itself and most of its modules are now under: github.com/qt Where as qt5-everywhere-demo is under: github.com/qt-labs Signed-off-by: Vesa Jääskeläinen <dachaac@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: Add gperf-native to DEPENDSFabio Berton2016-10-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error: FAILED: cd ../build/tmp/work/cortexa9hf-neon-mx6qdl-linux-gnueabi/qtwebengine/ 5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/src/3rdparty/chromium/ third_party/WebKit/Source/platform; gperf "--key-positions=*" -D -s 2 ColorData.gperf "--output-file=../build/tmp/work/cortexa9hf-neon-mx6qdl-linux- gnueabi/qtwebengine/5.6.99+5.7.0-beta+gitAUTOINC+dbf7dd2742_29c16917b3-r0/git/ src/core/Release/gen/blink/platform/ColorData.cpp" /bin/sh: gperf: command not found ninja: build stopped: subcommand failedP Change-Id: Ic28d0ac72fcbce8054638a3168b5d6a34bc129b5 Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwayland: Fix building of QWaylandIntegration if some Qt5 features are ↵Vesa Jääskeläinen2016-10-263-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | disabled. QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and QT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland. Signed-off-by: Vesa Jääskeläinen <dachaac@gmail.com> Tested-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: update submodulesMikko Gronoff2016-10-2625-70/+25
| | | | | | | | | | | | | | Update submodule SCREVs to Qt 5.6.2 release Signed-off-by: Mikko Gronoff <mikko.gronoff@qt.io> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: avoid qmake errors due to missing oe-device-extra.priJonathan Liu2016-09-151-0/+3
| | | | | | | | | | | | | | | | An empty oe-extra-extra.pri file is created if it does not exist to suppress qmake errors. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtdeclarative: add upstream patch to fix QtQml crash with GCC 6Jonathan Liu2016-09-152-0/+45
| | | | | | | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qtbase: fix cmake pathsSamuli Piippo2016-12-224-2/+89
| | | | | | | | | | | | | | | | | | | | Bring back patch for cmake to use OE_QMAKE_PATH_EXTERNAL_HOST_BIN to determine path to host binaries. Resolves QA Issue: Qt5Core.pc failed sanity test (tmpdir) in path. (cherry picked from commit 0fc7aeb1cbe2c63e24ce6ef06d290ac586133c2e) Change-Id: Iab19334b0f57a4867a78e0eaa8329c8d060e7f20 Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qt5: update submodulesv5.6.2Pasi Petäjäjärvi2016-10-1714-14/+14
| | | | | | | | | | | | | | | | | | updated final 5.6.2 content Change-Id: I577ae970c68ca3d794c823de82d42926506b04d4 Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: Jonathan Liu <net147@gmail.com>
* | qt5: Update submodulesMikko Gronoff2016-09-0925-41/+38
| | | | | | | | | | Change-Id: I8e71a3c84b439361eee8788c8315957fb1364e5a Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | Bump to Qt 5.6.2Samuli Piippo2016-08-221-1/+1
| | | | | | | | | | Change-Id: Idcb83b9be2033c5f3a234881de93b6bf12e3f89e Reviewed-by: David Schulz <david.schulz@qt.io>
* | Merge remote-tracking branch 'meta-qt5/krogoth' into master-mingwSamuli Piippo2016-08-1961-223/+293
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * qtquick1: fix qtwebkit supportAlexandre Belloni2016-08-081-2/+4
| | | | | | | | | | | | | | | | | | | | | | 40b7a93a3c6cf05136c606824c1cea848b75bcb6 ("qtquick1: allow to disable qtwebkit support") allowed to disable qtwebkit but actually disabled it in every cases. Use the same mechanism as qttools to implement the feature. Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: fix drm dependency for eglfs PACKAGECONFIGMartin Jansa2016-08-081-1/+1
| | | | | | | | | | | | * there isn't virtual/drm, just drm Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: upgrade to latest revisions in 5.6 branchMartin Jansa2016-08-0564-226/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * qtbase: add patch to make Qt5Config modules behave better with cmake buildsPascal Bach2016-06-072-0/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if a project if using the cmake bbclass and the CMakeLists.txt file uses find_package to find Qt5 and error like this is produced: | The imported target "Qt5::Core" references the file | | "/qmake" | | but this file does not exist. Possible reasons include: This is because OE_QMAKE_PATH_EXTERNAL_HOST_BINS is only set in the cmake_qt5 bblcass. To make it work better in that case the Qt5Config files check if OE_QMAKE_PATH_EXTERNAL_HOST_BINS is defined and bail out if not. For CMake this is the same as Qt5 wasn't found. Signed-off-by: Pascal Bach <pascal.bach@siemens.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * Change dependency from virtual/mesa to drm in the kms packageconfig.Teemu Holappa2016-05-061-1/+1
| | | | | | | | | | | | In some configurations there no provider for virtual/mesa, but only drm libaries. Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * replace base_contains by bb.utils.containsAndreas Müller2016-05-029-34/+34
| | | | | | | | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: update submodulesSamuli Piippo2016-06-0333-76/+73
| | | | | | | | | | | | | | | | | | NIS support leftover from Qt 3/4 were removed from qtbase with commit 644d0e75240811212ed9fd0c21e3bd05db3ba5db Change-Id: I335ef269126b89064a5038e0d200faf72a36bddf Reviewed-by: Teemu Holappa <teemu.holappa@theqtcompany.com> Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
* | qtbase: rebase patchSamuli Piippo2016-05-171-13/+14
| | | | | | | | | | Change-Id: I1f7eda0065f10cff9e6465b001f2ae4ac8edbc8b Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Merge remote-tracking branch 'meta-qt5/master' into master-mingwSamuli Piippo2016-05-0556-244/+199
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | replace base_contains by bb.utils.containsAndreas Müller2016-05-029-34/+34
| |/ | | | | | | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: upgrade to latest revision in 5.6 branchMartin Jansa2016-04-2162-268/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * qt5: set SRCREVs,PVs to 5.6.0Andreas Müller2016-04-2030-32/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qtquick1: LICENSE.LGPLv3: I checked git repository. To be honest: I have no idea what caused checksum change. JaMa: it was modified in this change: OE @ ~/projects/qt-project/qtquick1 $ git log --oneline 87f2415adf34da08e6cd58f5da6f6a7d0d9cf141..dcc5e5c01c28b227f0e5e5e4976a9d26e8a45295 -- LICENSE.LGPLv3 cd50897 Add the GPLv3 license text diff --git a/LICENSE.LGPLv3 b/LICENSE.LGPLv3 index 8fbb743..4d67bac 100644 --- a/LICENSE.LGPLv3 +++ b/LICENSE.LGPLv3 @@ -5,6 +5,8 @@ You may use, distribute and copy the Qt GUI Toolkit under the terms of GNU Lesser General Public License version 3, which is displayed below. + This license makes reference to the version 3 of the GNU General + Public License, which you can find in the LICENSE.GPLv3 file. * in some cases this is actually older SRCREV than what was used before (because normally the recipes use latest revision in stable - e.g. 5.6 branches, not the actuall tags). I'll upgrade to latest 5.6 revisions in follow-up commit (together with refreshing the .patch files and github.com/meta-qt5/qt* repositories to apply cleanly) Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtquickcontrols: fix compilation of examples/texteditorDenys Dmytriyenko2016-04-202-0/+31
| | | | | | | | | | | | | | | | git/examples/quick/controls/texteditor/src/documenthandler.cpp:136:12: error: invalid use of incomplete type 'class QDebug' qDebug() << "saved to" << localPath; Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtdeclarative: fix compilation of examples/qquickviewcomparisonDenys Dmytriyenko2016-04-202-0/+29
| | | | | | | | | | | | | | | | git/examples/quick/quickwidgets/qquickviewcomparison/mainwindow.cpp:180:14: error: 'QCoreApplication' has not been declared if (!QCoreApplication::arguments().contains(QStringLiteral("--no_render_alpha"))) Signed-off-by: Denys Dmytriyenko <denys@ti.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * quazip: update to 0.7.2Jonathan Liu2016-04-201-2/+2
| | | | | | | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtquickcontrols2: initial add 5.6.0Andreas Müller2016-04-201-0/+15
| | | | | | | | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
| * recipes: use new PACKAGECONFIG_CONFARGS instead of EXTRA_OECONFMartin Jansa2016-04-208-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | * this fixes builds for DISTROs which include no-static-libraries.inc * this change depends on oe-core change: http://patchwork.openembedded.org/patch/116719/ which was merged in this form: http://patchwork.openembedded.org/patch/120513/ to Yocto 2.1, if you want to use latest meta-qt5 with older oe-core you need to append EXTRA_OECONF to PACKAGECONFIG_CONFARGS Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | qt5: update submodulesSamuli Piippo2016-04-1331-91/+61
| | | | | | | | | | Change-Id: I984a2f3d412f4d36c79fda1f08662bffda266649 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | qt5: remove all mingw32 specific changesSamuli Piippo2016-03-094-186/+0
| | | | | | | | | | Change-Id: I41732cf1bb97e033c7e2170040834004996d12b1 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* | Merge remote-tracking branch 'meta-qt5/master' into HEADSamuli Piippo2016-03-085-39/+68
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * meta-qt5/master: qtwebengine: enable ARMv7VE support Add .gitignore to ignore .pyc/.pyo files gdb: include readline in default PACKAGECONFIG libconnman-qt5: update to 1.0.98 qtwebkit: backport patch to fix linking with qtwebkit libconnman-qt5: remove blacklist qtbase: fix up pkgconfig replacements Conflicts: recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch Change-Id: I7dfa3f9828a9ef587676d4ce21e676679abc98ec
| * qtwebengine: enable ARMv7VE supportJonathan Liu2016-03-071-0/+1
| | | | | | | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * libconnman-qt5: update to 1.0.98Jonathan Liu2016-02-271-2/+2
| | | | | | | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebkit: backport patch to fix linking with qtwebkitJonathan Liu2016-02-272-0/+34
| | | | | | | | | | Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * libconnman-qt5: remove blacklistJonathan Liu2016-02-271-2/+0
| | | | | | | | | | | | | | | | The package no longer fails sanity test because of connman-qt5.pc containing references to build host paths. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: fix up pkgconfig replacementsJonathan Liu2016-02-271-29/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The replacements were being done in qt_module.prf which is not included when building 3rd party libraries. To resolve this, move the replacements from qt_module.prf to qt.prf which is included when building any qmake project. The pkgconfig include replacement is removed as it doesn't seem to be needed anymore and causes issues when the includedir path in pkgconfig has part of its path replaced with ${includedir} resulting in a circular reference that causes the OE package_do_pkgconfig task to fail. Signed-off-by: Jonathan Liu <net147@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Merge remote-tracking branch 'meta-qt5/master' into master-mingwSamuli Piippo2016-02-2936-42/+46
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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: add runtime dependency to xkeyboard-configSamuli Piippo2016-02-251-1/+1
| | | | | | | | | | | | | | | | When qtbase is configured with xkbcommon-evdev (usually without X), make sure xkeyboard-config is installed to provide keymap database. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * libconnman-qt5: Blacklist because of connman-qt5.pcMartin Jansa2016-02-241-0/+2
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qt5: skip libdir for ${PN}-dbg and dev-elf for ${PN}-examples-devMartin Jansa2016-02-201-1/+2
| | | | | | | | | | | | * the examples are installed in locations, QA checks don't like Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtbase: upgrade SRCREVs a bit moreMartin Jansa2016-02-2013-20/+20
| | | | | | | | | | | | * to make sure that qtbase modules report 4.6.1 version Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * nativesdk-qtbase: use runtime linked dbusSamuli Piippo2016-02-201-1/+2
| | | | | | | | | | | | | | | | Remove direct dependency to nativesdk-dbus. Instead configure qtbase to use runtime linked dbus library, if that is found. Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* | Merge remote-tracking branch 'meta-qt5/master' into master-mingwSamuli Piippo2016-02-2252-205/+220
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * qttransltations: Add PACKAGE for qtwebengine and qtquickcontrols2Martin Jansa2016-02-201-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fixes QA warning: WARNING: qttranslations-5.5.99+5.6.0-rc+gitAUTOINC+ce85e4ee4e-r0 do_package: QA Issue: qttranslations: Files/directories were installed but not shipped in any package: /usr/share/qt5/translations/qtquickcontrols2_uk.qm /usr/share/qt5/translations/qtwebengine_de.qm /usr/share/qt5/translations/qtwebengine_ru.qm /usr/share/qt5/translations/qtwebengine_uk.qm /usr/share/qt5/translations/qtwebengine_en.qm Please set FILES such that these items are packaged. Alternatively if they are unneeded, avoid installing them or delete them within do_install. qttranslations: 5 installed and not shipped files. [installed-vs-shipped] Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| * qtwebengine: Hide textrel QA warning until there is proper fix for itMartin Jansa2016-02-201-0/+3
| | | | | | | | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>