diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-23 09:33:45 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2019-04-26 06:31:50 +0000 |
commit | 8586caf2f2f5c11fb2ddff29eefe5dd7fc08cf38 (patch) | |
tree | 2f31f838a723fe098458d3659106cf335b63b9d5 | |
parent | 7dc422d94a0028cd5b31aff4e1c5409fb3f66dc4 (diff) | |
download | meta-qt5-8586caf2f2f5c11fb2ddff29eefe5dd7fc08cf38.tar.gz |
qt5: update SRCREVs after v5.12.3 tags were downmerged to 5.12 branch
* v5.12.3 tags in qt3d, qtknx, qtmqtt, qtopcua, qttools, qtremoteobjects are fine now
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/qt5/qt3d_git.bb | 5 | ||||
-rw-r--r-- | recipes-qt/qt5/qtknx_git.bb | 3 | ||||
-rw-r--r-- | recipes-qt/qt5/qtmqtt_git.bb | 3 | ||||
-rw-r--r-- | recipes-qt/qt5/qtopcua_git.bb | 3 | ||||
-rw-r--r-- | recipes-qt/qt5/qtremoteobjects_git.bb | 5 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 5 |
6 files changed, 6 insertions, 18 deletions
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb index 7c1d7fea..bcc63058 100644 --- a/recipes-qt/qt5/qt3d_git.bb +++ b/recipes-qt/qt5/qt3d_git.bb | |||
@@ -36,9 +36,6 @@ do_configure_prepend() { | |||
36 | ${S}/src/quick3d/imports/input/importsinput.pro | 36 | ${S}/src/quick3d/imports/input/importsinput.pro |
37 | } | 37 | } |
38 | 38 | ||
39 | # Use e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246 instead of | 39 | SRCREV = "7da5c4c35a657ea43663b4ed0d65e896b8db5c69" |
40 | # 7da5c4c35a657ea43663b4ed0d65e896b8db5c69 because the v5.12.3 tag wasn't | ||
41 | # merged to 5.12 branch yet | ||
42 | SRCREV = "e84d8d2a81eb81f9b1ea9f40d4da36d09a97b246" | ||
43 | 40 | ||
44 | BBCLASSEXTEND += "native nativesdk" | 41 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qtknx_git.bb b/recipes-qt/qt5/qtknx_git.bb index aeb48885..ead1b19b 100644 --- a/recipes-qt/qt5/qtknx_git.bb +++ b/recipes-qt/qt5/qtknx_git.bb | |||
@@ -9,5 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | # v5.12.3 tag wasn't created yet | 12 | SRCREV = "0dfc76b080df56ef1638bd6a9deb7325692bc242" |
13 | SRCREV = "ae6c0fe18fff0bedced9800b11940f396b66596d" | ||
diff --git a/recipes-qt/qt5/qtmqtt_git.bb b/recipes-qt/qt5/qtmqtt_git.bb index 05c6c75a..d83ce919 100644 --- a/recipes-qt/qt5/qtmqtt_git.bb +++ b/recipes-qt/qt5/qtmqtt_git.bb | |||
@@ -9,5 +9,4 @@ LIC_FILES_CHKSUM = " \ | |||
9 | 9 | ||
10 | DEPENDS += "qtbase" | 10 | DEPENDS += "qtbase" |
11 | 11 | ||
12 | # v5.12.3 tag wasn't created yet | 12 | SRCREV = "6281dd7e375f94a5e7f78055c0bebba93a2b0e02" |
13 | SRCREV = "acff2f2611e271b83c9190b060d42c88bb292fa5" | ||
diff --git a/recipes-qt/qt5/qtopcua_git.bb b/recipes-qt/qt5/qtopcua_git.bb index a19c3855..a86abbca 100644 --- a/recipes-qt/qt5/qtopcua_git.bb +++ b/recipes-qt/qt5/qtopcua_git.bb | |||
@@ -15,5 +15,4 @@ SECURITY_STRINGFORMAT = "" | |||
15 | 15 | ||
16 | DEPENDS += "qtbase qtdeclarative" | 16 | DEPENDS += "qtbase qtdeclarative" |
17 | 17 | ||
18 | # v5.12.3 tag wasn't created yet | 18 | SRCREV = "56d2b5df55c9a6ea7d21f3412193903f2504249e" |
19 | SRCREV = "e42d517e350c18d6e6c5c3081e3005f10a5c20ab" | ||
diff --git a/recipes-qt/qt5/qtremoteobjects_git.bb b/recipes-qt/qt5/qtremoteobjects_git.bb index d68644db..d4fd74cc 100644 --- a/recipes-qt/qt5/qtremoteobjects_git.bb +++ b/recipes-qt/qt5/qtremoteobjects_git.bb | |||
@@ -24,9 +24,6 @@ PACKAGECONFIG[tools-only] = "CONFIG+=tools-only" | |||
24 | 24 | ||
25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" | 25 | EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}" |
26 | 26 | ||
27 | # Use 119b222dd5ee8f4410f87c5854e6e9ee65436309 instead of | 27 | SRCREV = "db1e447c46062946e57d7de9c0e0ea5fddc997f6" |
28 | # db1e447c46062946e57d7de9c0e0ea5fddc997f6 because the v5.12.3 tag wasn't | ||
29 | # merged to 5.12 branch yet | ||
30 | SRCREV = "119b222dd5ee8f4410f87c5854e6e9ee65436309" | ||
31 | 28 | ||
32 | BBCLASSEXTEND += "native nativesdk" | 29 | BBCLASSEXTEND += "native nativesdk" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index 0ac8a76f..d2b905b6 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -32,10 +32,7 @@ EXTRA_QMAKEVARS_PRE += " \ | |||
32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ | 32 | ${@bb.utils.contains('PACKAGECONFIG', 'qtwebkit', '', 'CONFIG+=noqtwebkit', d)} \ |
33 | " | 33 | " |
34 | 34 | ||
35 | # Use 50335cb26bb88930f5e2a204642439cc9a4d2282 instead of | 35 | SRCREV = "1f8d498752fed0b2b92d6a619aa11524dd771998" |
36 | # 1f8d498752fed0b2b92d6a619aa11524dd771998 because the v5.12.3 tag wasn't | ||
37 | # merged to 5.12 branch yet | ||
38 | SRCREV = "50335cb26bb88930f5e2a204642439cc9a4d2282" | ||
39 | 36 | ||
40 | BBCLASSEXTEND = "native nativesdk" | 37 | BBCLASSEXTEND = "native nativesdk" |
41 | 38 | ||