diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-19 15:30:56 +0100 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-06-10 12:11:51 +0200 |
commit | 6374736f37378501793a5191b48545c1fecc0c48 (patch) | |
tree | 06516ff2623180d41dddbdf91af3d3701c261a8c /recipes-qt/qt5/qt3d_git.bb | |
parent | 9957ec5d0176912e189cf7e243617ed9c3cde57a (diff) |
recipes-git: Upgrade from latest origin/release to latest origin/stable
* there wont be 5.2.2 release, so start preparation for 5.3.0
* probably latest 5.3.0-beta1 snapshot was released yesterday, so this
should be reasonably close
* probably wont be merged before creating new release branch for Yocto 1.6
* qtbase: Fix build with X.h included from egl.h
* nativesdk-qt*: Add git recipes
5.2.1 isn't compatible with qtbase-native from git
* qtbase: upgrade to latest stable revision
* 0006-configure-make-pulseaudio-alsa-freetype-a-configurab.patch
was upstreamed in:
0c3301f configure: make pulseaudio and alsa configurable options
* 0005-qt_module-Fix-pkgconfig-replacement.patch
is hopefully resolved in:
eaefbe3 snuff -L/-I with system paths when installing meta files
a33afed de-duplicate setup of libdir replacement in prl files
aa20e7f reshuffle code for clarity
ee86ce8 don't attempt to replace include paths in meta files
but this needs to be double checked
* recipes-git: Upgrade to latest origin/stable
* qt5-git.inc: update LICENSE.LGPL checksum
* only year was updated:
- The Qt Toolkit is Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+ The Qt Toolkit is Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
* qtbase: add 2 patches to fix build issues
* LIC_FILES_CHKSUM: update other git recipes
* qtlocation: bump SRCREV and add to qt5-versions
* qt5-versions.inc: Add line for qttools and fix it for nativesdk-qttools
* qtquick1: fix LIC_FILES_CHKSUM
* qttools: update LIC_FILES_CHKSUM and patches
* new qtdiag needs to be disabled as well because it depends on gui which isn't enabled
in qtbase-native, disable qtpaths as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt3d_git.bb')
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index aaa9c04f..0438dd9d 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb @@ -4,11 +4,4 @@ require ${PN}.inc QT_MODULE_BRANCH = "master" # last tag before this SRCREV is 5.0.0-beta1, but version says 5.3.0 already -SRCREV = "d3338a9f7fcac109d7bc7f600d5974ff333782ad" - -do_configure_prepend() { - # Temporary hack to get qt3d build for Qt 5.1.0 - if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then - echo "MODULE_VERSION = 5.3.0" >> ${S}/.qmake.conf - fi -} +SRCREV = "36a829ad6fb44fd01f490c35e011f6fd2470ffdd" |