summaryrefslogtreecommitdiff
path: root/recipes-qt
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2014-10-17 14:42:18 +0200
committerMax Krummenacher <max.oss.09@gmail.com>2015-03-31 21:50:33 +0200
commitddf1e9e2c49cce9aa15de7b512bb0440c6a7e2a7 (patch)
tree76ba5b779abf39b240e08a7d1ca3ea81b0a00d00 /recipes-qt
parent9148de36cc9eb588c40918162cd2d88e6f0aa4bb (diff)
qt4: replace version with % wildcard
While at it replace Tegra machines with SOC family Conflicts: recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
Diffstat (limited to 'recipes-qt')
-rw-r--r--recipes-qt/qt4/qt4-embedded_%.bbappend (renamed from recipes-qt/qt4/qt4-embedded_4.8.5.bbappend)0
-rw-r--r--recipes-qt/qt4/qt4-x11-free_%.bbappend5
-rw-r--r--recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend9
3 files changed, 5 insertions, 9 deletions
diff --git a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend b/recipes-qt/qt4/qt4-embedded_%.bbappend
index 64d1d2f..64d1d2f 100644
--- a/recipes-qt/qt4/qt4-embedded_4.8.5.bbappend
+++ b/recipes-qt/qt4/qt4-embedded_%.bbappend
diff --git a/recipes-qt/qt4/qt4-x11-free_%.bbappend b/recipes-qt/qt4/qt4-x11-free_%.bbappend
new file mode 100644
index 0000000..0f0fb17
--- /dev/null
+++ b/recipes-qt/qt4/qt4-x11-free_%.bbappend
@@ -0,0 +1,5 @@
+# Build OpenGL/ES support if available
+
+QT_GLFLAGS_tegra = "-opengl es2 "
+
+DEPENDS_append_tegra += "virtual/libgles2"
diff --git a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend b/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
deleted file mode 100644
index 64a6655..0000000
--- a/recipes-qt/qt4/qt4-x11-free_4.8.5.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-# Build OpenGL/ES support if available
-
-QT_GLFLAGS_colibri-t20 = "-opengl es2 "
-QT_GLFLAGS_colibri-t30 = "-opengl es2 "
-QT_GLFLAGS_apalis-t30 = "-opengl es2 "
-
-DEPENDS_append_colibri-t20 = " virtual/libgles2"
-DEPENDS_append_colibri-t30 = " virtual/libgles2"
-DEPENDS_append_apalis-t30 = " virtual/libgles2"