diff options
| author | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-05 13:09:34 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@theqtcompany.com> | 2016-04-05 13:09:34 +0300 |
| commit | 856015411d555cf14665491f18abf71b5121f5ed (patch) | |
| tree | 7afca648e6f0098b41409a1d41b9d4fdc760f543 /recipes-qt/qt5/qttranslations_git.bbappend | |
| parent | 2d926de7f7ccb9f5cb22fb22360207780f920752 (diff) | |
| parent | 2c1c64fbcce018dd02fcf03bd3fcc25127dee438 (diff) | |
| download | meta-boot2qt-856015411d555cf14665491f18abf71b5121f5ed.tar.gz | |
Merge remote-tracking branch 'origin/fido' into dev
* origin/fido:
qt5: 5.6.0 branches were removed, using 5.6 instead
Conflicts:
recipes-qt/qt5/qtconnectivity_git.bbappend
Change-Id: I040f0e26941aca43eabebda65b177bf533bef0d6
Diffstat (limited to 'recipes-qt/qt5/qttranslations_git.bbappend')
| -rw-r--r-- | recipes-qt/qt5/qttranslations_git.bbappend | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/recipes-qt/qt5/qttranslations_git.bbappend b/recipes-qt/qt5/qttranslations_git.bbappend index 9c5261a..5045c67 100644 --- a/recipes-qt/qt5/qttranslations_git.bbappend +++ b/recipes-qt/qt5/qttranslations_git.bbappend | |||
| @@ -19,5 +19,4 @@ | |||
| 19 | ## | 19 | ## |
| 20 | ############################################################################## | 20 | ############################################################################## |
| 21 | 21 | ||
| 22 | QT_MODULE_BRANCH = "5.6.0" | ||
| 23 | SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" | 22 | SRCREV = "41d212290c3822b8eef151785d89ac5f5b246bde" |