diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-18 10:14:32 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-18 10:15:24 +0300 |
| commit | abd29cce5e3cc3b0d0d2cf023bb9d327ef96f548 (patch) | |
| tree | f58615ff2ceb23fe22d15901e977772d865ebf80 /recipes-qt/qt5-addons | |
| parent | 64d0d088725b7ad70080068c3eb9f5dccec9bd32 (diff) | |
| parent | 293bb2b4195281d7b4a56f16c77bdf16831334e4 (diff) | |
| download | meta-boot2qt-abd29cce5e3cc3b0d0d2cf023bb9d327ef96f548.tar.gz | |
Merge remote-tracking branch 'origin/fido' into dev
* origin/fido:
Move usage of internal mirrors into a bbclass
Use --internal arg to fetch playground repos
qtquickcompiler: update revision to work with Qt 5.6.1
qt5: update submodules
gcc: patch already applied on oe layer
Update revisions for poky and openembedded
Fix meta-environment to work without changes in local.conf
Disabled SSTATE_MIRRORS and PRE_MIRRORS.
setup-environment: prevent basename argument being parsed as option.
Do not pull internal repos when initializing for all devices
Conflicts:
conf/local.conf.sample
recipes-qt/qt5/nativesdk-qtbase_git.bbappend
recipes-qt/qt5/qt3d_git.bbappend
recipes-qt/qt5/qtbase-native_git.bbappend
recipes-qt/qt5/qtbase_git.bbappend
recipes-qt/qt5/qtcanvas3d_git.bbappend
recipes-qt/qt5/qtconnectivity_git.bbappend
recipes-qt/qt5/qtdeclarative_git.bbappend
recipes-qt/qt5/qtgraphicaleffects_git.bbappend
recipes-qt/qt5/qtimageformats_git.bbappend
recipes-qt/qt5/qtlocation_git.bbappend
recipes-qt/qt5/qtmultimedia_git.bbappend
recipes-qt/qt5/qtquickcontrols2_git.bb
recipes-qt/qt5/qtquickcontrols_git.bbappend
recipes-qt/qt5/qtsensors_git.bbappend
recipes-qt/qt5/qtserialbus_git.bb
recipes-qt/qt5/qtserialport_git.bbappend
recipes-qt/qt5/qtsvg_git.bbappend
recipes-qt/qt5/qttools_git.bbappend
recipes-qt/qt5/qttranslations_git.bbappend
recipes-qt/qt5/qtwayland-native_git.bbappend
recipes-qt/qt5/qtwayland_git.bbappend
recipes-qt/qt5/qtwebchannel_git.bbappend
recipes-qt/qt5/qtwebengine_git.bbappend
recipes-qt/qt5/qtwebsockets_git.bbappend
recipes-qt/qt5/qtxmlpatterns_git.bbappend
scripts/manifest.xml
scripts/manifest_jethro.xml
Change-Id: I17c4dd6890dc4475171133cede4dc7e6217222d6
Diffstat (limited to 'recipes-qt/qt5-addons')
| -rw-r--r-- | recipes-qt/qt5-addons/qtquickcompiler_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-qt/qt5-addons/qtquickcompiler_git.bb b/recipes-qt/qt5-addons/qtquickcompiler_git.bb index b09af7c..42013e7 100644 --- a/recipes-qt/qt5-addons/qtquickcompiler_git.bb +++ b/recipes-qt/qt5-addons/qtquickcompiler_git.bb | |||
| @@ -29,7 +29,7 @@ SRC_URI = " \ | |||
| 29 | git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ | 29 | git://codereview.qt-project.org/qt/tqtc-qmlcompiler;branch=${BRANCH};protocol=ssh \ |
| 30 | " | 30 | " |
| 31 | 31 | ||
| 32 | SRCREV = "494283b7bf77f2801021e185c95ef948632ddddf" | 32 | SRCREV = "ea222ff87942781d1091fdcd0385a0c842d21e15" |
| 33 | BRANCH = "5.6" | 33 | BRANCH = "5.6" |
| 34 | 34 | ||
| 35 | S = "${WORKDIR}/git" | 35 | S = "${WORKDIR}/git" |