diff options
| author |   Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
|---|---|---|
| committer | Cliff Brake <cbrake@bec-systems.com> | 2010-09-13 14:15:35 -0400 |
| commit | 4ee358534793381d2e87b01781079a3354fd5c1c (patch) | |
| tree | 729f8b0ce4bdbcd8a16f561fb68da0d66c3a3eb8 /recipes/qt4 | |
| parent | beb17e26ee9b4bc0cf334c3b30560c6eb66b1299 (diff) | |
| parent | eda06ec3dde6169a46797f876a82499c4fff8f62 (diff) | |
| download | openembedded-testing_2010-09-13.tar.gz | |
Merge branch 'org.openembedded.dev' into testing-nexttesting_2010-09-13
Diffstat (limited to 'recipes/qt4')
| -rw-r--r-- | recipes/qt4/qt4-embedded-gles_4.6.0.bb | 1 | ||||
| -rw-r--r-- | recipes/qt4/qt4-embedded-gles_4.6.2.bb | 1 | ||||
| -rw-r--r-- | recipes/qt4/qt4-embedded-gles_4.6.3.bb | 1 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free-gles_4.5.2.bb | 1 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free-gles_4.6.0.bb | 1 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free-gles_4.6.2.bb | 1 | ||||
| -rw-r--r-- | recipes/qt4/qt4-x11-free-gles_4.6.3.bb | 1 |
7 files changed, 7 insertions, 0 deletions
diff --git a/recipes/qt4/qt4-embedded-gles_4.6.0.bb b/recipes/qt4/qt4-embedded-gles_4.6.0.bb index 3b3ea153f1..3e132bf753 100644 --- a/recipes/qt4/qt4-embedded-gles_4.6.0.bb +++ b/recipes/qt4/qt4-embedded-gles_4.6.0.bb @@ -10,3 +10,4 @@ require qt-4.6.0.inc FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded" DEPENDS += "virtual/egl" +require recipes/egl/egl.inc diff --git a/recipes/qt4/qt4-embedded-gles_4.6.2.bb b/recipes/qt4/qt4-embedded-gles_4.6.2.bb index 21c461a11c..0b047fc5de 100644 --- a/recipes/qt4/qt4-embedded-gles_4.6.2.bb +++ b/recipes/qt4/qt4-embedded-gles_4.6.2.bb @@ -11,3 +11,4 @@ SRC_URI += "file://cursor-hack.diff" FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded" DEPENDS += "virtual/egl" +require recipes/egl/egl.inc diff --git a/recipes/qt4/qt4-embedded-gles_4.6.3.bb b/recipes/qt4/qt4-embedded-gles_4.6.3.bb index 21c461a11c..0b047fc5de 100644 --- a/recipes/qt4/qt4-embedded-gles_4.6.3.bb +++ b/recipes/qt4/qt4-embedded-gles_4.6.3.bb @@ -11,3 +11,4 @@ SRC_URI += "file://cursor-hack.diff" FILESPATHPKG .= ":qt4-embedded-${PV}:qt4-embedded" DEPENDS += "virtual/egl" +require recipes/egl/egl.inc diff --git a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb index 3fe721810f..57e15242ed 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.5.2.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.5.2.bb @@ -11,6 +11,7 @@ require qt4-x11-free_${PV}.bb PR = "${INC_PR}.3" DEPENDS += "virtual/egl" +require recipes/egl/egl.inc PROVIDES += "qt4-x11-free" #SRC_URI += "file://sgx-hack.patch" SRC_URI += "file://hack-out-pg_config.patch" diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb index dfd53e53a9..0821595f88 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.6.0.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.6.0.bb @@ -13,4 +13,5 @@ QT_CONFIG_FLAGS += " \ FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" DEPENDS += "virtual/egl" +require recipes/egl/egl.inc PROVIDES += "qt4-x11-free" diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb index 307770f0dc..b7cbde5591 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.6.2.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.6.2.bb @@ -13,4 +13,5 @@ QT_CONFIG_FLAGS += " \ FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" DEPENDS += "virtual/egl" +require recipes/egl/egl.inc PROVIDES += "qt4-x11-free" diff --git a/recipes/qt4/qt4-x11-free-gles_4.6.3.bb b/recipes/qt4/qt4-x11-free-gles_4.6.3.bb index 307770f0dc..b7cbde5591 100644 --- a/recipes/qt4/qt4-x11-free-gles_4.6.3.bb +++ b/recipes/qt4/qt4-x11-free-gles_4.6.3.bb @@ -13,4 +13,5 @@ QT_CONFIG_FLAGS += " \ FILESPATHPKG .= ":qt4-x11-free-${PV}:qt4-x11-free" DEPENDS += "virtual/egl" +require recipes/egl/egl.inc PROVIDES += "qt4-x11-free" |