diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-20 14:42:03 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-07-25 12:14:12 +0200 |
| commit | 3da4d425d06f74dbb0b5334f1f62efa20bd02176 (patch) | |
| tree | 184dda0f22642b4a63ea7ebfbc879c672ae90bc3 /recipes-qt/qt5/qt3d_git.bb | |
| parent | 5eb22ffbfafc558a66943e666c415a9749a39e2b (diff) | |
| download | meta-qt5-3da4d425d06f74dbb0b5334f1f62efa20bd02176.tar.gz | |
qt3d, qtjsondb: bump SRCREV and set MODULE_VERSION
* drop INC_PR/PR where possible
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 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 87d009e7..4a816c96 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
| @@ -4,8 +4,13 @@ require ${PN}.inc | |||
| 4 | # last tag before this SRCREV is 5.0.0-beta1 | 4 | # last tag before this SRCREV is 5.0.0-beta1 |
| 5 | PV = "4.999+5.0.0-beta1+git${SRCPV}" | 5 | PV = "4.999+5.0.0-beta1+git${SRCPV}" |
| 6 | 6 | ||
| 7 | PR = "${INC_PR}.0" | ||
| 8 | |||
| 9 | QT_MODULE_BRANCH = "master" | 7 | QT_MODULE_BRANCH = "master" |
| 10 | 8 | ||
| 11 | SRCREV = "0158ce783a61bac3e4f4ff619b0601daf9174ce6" | 9 | SRCREV = "d517d39d5491bc95b1dddc3ff5cb880bd3bd0058" |
| 10 | |||
| 11 | do_configure_prepend() { | ||
| 12 | # Temporary hack to get qt3d build for Qt 5.1.0 | ||
| 13 | if ! grep -q MODULE_VERSION ${S}/.qmake.conf; then | ||
| 14 | echo "MODULE_VERSION = 5.1.0" >> ${S}/.qmake.conf | ||
| 15 | fi | ||
| 16 | } | ||
