diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-18 10:32:33 +0200 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2015-11-19 06:49:30 +0000 |
| commit | 7f4374e0451cf3cc4101d675139372184a10a204 (patch) | |
| tree | 0582bcd1a448986b02eef785ed7802c1d87429fe /recipes-qt/qt5-addons | |
| parent | 679567dfdc6709417f57f0497252a4315d9b3a19 (diff) | |
| download | meta-boot2qt-7f4374e0451cf3cc4101d675139372184a10a204.tar.gz | |
qt5: upgrade to Qt 5.6
Move to latest revision of meta-qt5 that pulls in Qt 5.6.
- Qt Quick Compiler needs follow 5.6 branch.
- Disable compilation of qgltf host toool from Qt3D, that does not
compile with GCC 4.9.1
Change-Id: Idf0437cff1debf6db558959b357dae3279466163
Reviewed-by: Gatis Paeglis <gatis.paeglis@theqtcompany.com>
Diffstat (limited to 'recipes-qt/qt5-addons')
| -rw-r--r-- | recipes-qt/qt5-addons/qtquickcompiler_git.bb (renamed from recipes-qt/qt5-addons/qtquickcompiler_3.0.bb) | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb b/recipes-qt/qt5-addons/qtquickcompiler_git.bb index 6226e6e..1bd37e6 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler_3.0.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler_git.bb | |||
| @@ -30,9 +30,9 @@ SRC_URI = " \ | |||
| 30 | git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ | 30 | git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ |
| 31 | " | 31 | " |
| 32 | 32 | ||
| 33 | # v3.0.0 | 33 | # v5.6.0 |
| 34 | SRCREV = "7e29e55c8315cc5e944505f13c24893d0f54efeb" | 34 | SRCREV = "07aeee460cc170eef28c05ce13aa30408f558215" |
| 35 | BRANCH = "3.0" | 35 | BRANCH = "5.6" |
| 36 | 36 | ||
| 37 | S = "${WORKDIR}/git" | 37 | S = "${WORKDIR}/git" |
| 38 | 38 | ||