summaryrefslogtreecommitdiffstats
path: root/recipes-qt/qt5/qt3d_git.bb
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-08-04 13:55:31 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2021-08-04 13:55:31 +0200
commitb5916b969ed0794a5b1bd049387ad0ef762a6662 (patch)
tree9e46b88a2a0e4c2de19213f3eac7b73621ef7946 /recipes-qt/qt5/qt3d_git.bb
parentb3995cd83ed67897ef1db010052eb807c19d6483 (diff)
downloadmeta-qt5-upstream/jansa/warrior-overrides.tar.gz
Convert to new override syntaxupstream/jansa/warrior-overrides
This is the result of automated script (0.9.1) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-qt/qt5/qt3d_git.bb')
-rw-r--r--recipes-qt/qt5/qt3d_git.bb8
1 files changed, 4 insertions, 4 deletions
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 3690b3b0..18a25433 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = " \
9" 9"
10 10
11DEPENDS += "qtbase" 11DEPENDS += "qtbase"
12DEPENDS_class-target += "qtdeclarative qt3d-native" 12DEPENDS:class-target += "qtdeclarative qt3d-native"
13 13
14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.12 14# Patches from https://github.com/meta-qt5/qt3d/commits/b5.12
15# 5.12.meta-qt5.2 15# 5.12.meta-qt5.2
@@ -18,8 +18,8 @@ SRC_URI += " \
18" 18"
19 19
20PACKAGECONFIG ??= "" 20PACKAGECONFIG ??= ""
21PACKAGECONFIG_class-native ??= "tools-only" 21PACKAGECONFIG:class-native ??= "tools-only"
22PACKAGECONFIG_class-nativesdk ??= "tools-only" 22PACKAGECONFIG:class-nativesdk ??= "tools-only"
23PACKAGECONFIG[tools-only] = "" 23PACKAGECONFIG[tools-only] = ""
24PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp" 24PACKAGECONFIG[system-assimp] = "-feature-system-assimp,-no-feature-system-assimp,assimp"
25PACKAGECONFIG[qtgamepad] = ",,qtgamepad" 25PACKAGECONFIG[qtgamepad] = ",,qtgamepad"
@@ -29,7 +29,7 @@ EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}"
29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}" 29EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tools-only', 'CONFIG+=tools-only QMAKE_USE_PRIVATE+=zlib', '', d)}"
30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}" 30EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'qtgamepad', 'CONFIG+=OE_QTGAMEPAD_ENABLED', '', d)}"
31 31
32do_configure_prepend() { 32do_configure:prepend() {
33 # disable qtgamepad test if it isn't enabled by PACKAGECONFIG 33 # disable qtgamepad test if it isn't enabled by PACKAGECONFIG
34 sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \ 34 sed -e 's/^\(qtHaveModule(gamepad)\)/OE_QTGAMEPAD_ENABLED:\1/' -i \
35 ${S}/src/input/frontend/frontend.pri \ 35 ${S}/src/input/frontend/frontend.pri \