diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-01-27 19:16:27 +0100 |
---|---|---|
committer | Martin 'JaMa' Jansa <Martin.Jansa@gmail.com> | 2021-01-30 15:20:56 +0100 |
commit | 2b33a5d5e888370bb56685b86aa82b73624f19f0 (patch) | |
tree | 6dc00dc95d73f00b5f6a67bdf5b2bc153bbbdbd9 | |
parent | a66af3392070a722a806e116ef931c7d62504064 (diff) | |
download | meta-qt5-upstream/jansa/gatesgarth.tar.gz |
qt5-native.inc, nativesdk-qt5.inc, nativesdk-packagegroup-qt5-toolchain-host: reorder inherits to fix new QA checkupstream/jansa/gatesgarthupstream/gatesgarth-nextupstream/gatesgarth
* fixes:
WARNING: meta-qt5/recipes-qt/qt5/qtbase-native_git.bb: QA Issue: qtbase-native: native/nativesdk class is not inherited last, this can result in unexpected behaviour. [native-last]
WARNING: meta-qt5/recipes-qt/qt5/nativesdk-qtbase_git.bb: QA Issue: nativesdk-qtbase: native/nativesdk class is not inherited last, this can result in unexpected behaviour. [native-last]
WARNING: meta-qt5/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb: QA Issue: nativesdk-packagegroup-qt5-toolchain-host: native/nativesdk class is not inherited last, this can result in unexpected behaviour. [native-last]
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/nativesdk-qt5.inc | 2 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-native.inc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb index de0527c5..3a4d25ac 100644 --- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb +++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb | |||
@@ -3,7 +3,7 @@ | |||
3 | SUMMARY = "Host packages for the Qt5 standalone SDK or external toolchain" | 3 | SUMMARY = "Host packages for the Qt5 standalone SDK or external toolchain" |
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | 5 | ||
6 | inherit nativesdk packagegroup | 6 | inherit packagegroup nativesdk |
7 | 7 | ||
8 | PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" | 8 | PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" |
9 | 9 | ||
diff --git a/recipes-qt/qt5/nativesdk-qt5.inc b/recipes-qt/qt5/nativesdk-qt5.inc index 2eb8c142..5472012c 100644 --- a/recipes-qt/qt5/nativesdk-qt5.inc +++ b/recipes-qt/qt5/nativesdk-qt5.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | inherit nativesdk qmake5_base | 1 | inherit qmake5_base nativesdk |
2 | 2 | ||
3 | # we don't want conflicts with qt4 | 3 | # we don't want conflicts with qt4 |
4 | OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" | 4 | OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" |
diff --git a/recipes-qt/qt5/qt5-native.inc b/recipes-qt/qt5/qt5-native.inc index 76816027..3afc3f28 100644 --- a/recipes-qt/qt5/qt5-native.inc +++ b/recipes-qt/qt5/qt5-native.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | inherit native qmake5_base | 1 | inherit qmake5_base native |
2 | 2 | ||
3 | # we don't want conflicts with qt4 | 3 | # we don't want conflicts with qt4 |
4 | OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" | 4 | OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}" |