diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-01-27 19:16:27 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-01-31 09:40:43 +0100 |
| commit | c7ec5568d86396de9571e1de111b92c9e6f86f20 (patch) | |
| tree | 970c6365321a35892afd49e5449b2aa3f8a96170 | |
| parent | e49c07f5d6336dd538fdbf0917df9bf2e24c9238 (diff) | |
| download | meta-qt5-c7ec5568d86396de9571e1de111b92c9e6f86f20.tar.gz | |
qt5-native.inc, nativesdk-qt5.inc, nativesdk-packagegroup-qt5-toolchain-host: reorder inherits to fix new QA check
* 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 e92cb9d4..03e294fd 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}" |