diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-17 23:32:56 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-18 23:04:41 +0000 |
| commit | e2707a016c3475c167a421c9c73d88f81cc61bd1 (patch) | |
| tree | e4bae2a878e4c97496dcd536af717f093c9579f2 /recipes-qt/qt5/qtremoteobjects_git.bb | |
| parent | 07784245c1822766d54405d835ac2dc08652df1a (diff) | |
| download | meta-qt5-e2707a016c3475c167a421c9c73d88f81cc61bd1.tar.gz | |
qt5: upgrade to 5.12.3
* be aware that in 3 qt* project the v5.12.3 tag wasn't created yet:
qtknx_git.bb:# v5.12.3 tag wasn't created yet
qtmqtt_git.bb:# v5.12.3 tag wasn't created yet
qtopcua_git.bb:# v5.12.3 tag wasn't created yet
* and qttools, qt3d, qtremoteobjects v5.12.3 tag isn't in 5.12 branch
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qtremoteobjects_git.bb')
| -rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index ff934bde..d68644db 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
| @@ -12,7 +12,7 @@ require qt5-git.inc | |||
| 12 | DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" | 12 | DEPENDS += "qtbase qtdeclarative qtremoteobjects-native" |
| 13 | 13 | ||
| 14 | # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.12 | 14 | # Patches from https://github.com/meta-qt5/qtremoteobjects/commits/b5.12 |
| 15 | # 5.12.meta-qt5.1 | 15 | # 5.12.meta-qt5.2 |
| 16 | SRC_URI += " \ | 16 | SRC_URI += " \ |
| 17 | file://0001-Allow-a-tools-only-build.patch \ | 17 | file://0001-Allow-a-tools-only-build.patch \ |
| 18 | " | 18 | " |
| @@ -24,6 +24,9 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
| 24 | 24 | ||
| 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
| 26 | 26 | ||
| 27 | SRCREV = "1c19349a28a75eec386b84af142fc571e492a3c3" | 27 | # Use 119b222dd5ee8f4410f87c5854e6e9ee65436309 instead of |
| 28 | # db1e447c46062946e57d7de9c0e0ea5fddc997f6 because the v5.12.3 tag wasn't | ||
| 29 | # merged to 5.12 branch yet | ||
| 30 | SRCREV = "119b222dd5ee8f4410f87c5854e6e9ee65436309" | ||
| 28 | 31 | ||
| 29 | BBCLASSEXTEND += "native nativesdk" | 32 | BBCLASSEXTEND += "native nativesdk" |
