diff options
author | Andreas Oberritter <obi@opendreambox.org> | 2012-02-27 18:03:22 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-02-28 12:27:51 +0000 |
commit | 13949f2100d179ead5136fa9d636c09588d4b0b4 (patch) | |
tree | 5feca00273fccaa60f305f917cdd882d0fbb13fb /meta/recipes-qt | |
parent | 36a0bde5593991655074575239bab461552b6c98 (diff) | |
download | poky-13949f2100d179ead5136fa9d636c09588d4b0b4.tar.gz |
qt4.inc: depend on tiff
* Fixes the following error with qt4-embedded-4.8.0 and possibly others:
| ../../../gui/image/qtiffhandler.cpp:48:20: fatal error: tiffio.h: No such file or directory
(From OE-Core rev: d0853052228128ccca2b744dae9c4dceae23067a)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-qt')
-rw-r--r-- | meta/recipes-qt/qt4/qt4-embedded.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4-x11-free.inc | 2 | ||||
-rw-r--r-- | meta/recipes-qt/qt4/qt4.inc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-qt/qt4/qt4-embedded.inc b/meta/recipes-qt/qt4/qt4-embedded.inc index e472af5b48..80948f3698 100644 --- a/meta/recipes-qt/qt4/qt4-embedded.inc +++ b/meta/recipes-qt/qt4/qt4-embedded.inc | |||
@@ -2,7 +2,7 @@ DESCRIPTION = "Qt is a versatile cross-platform application framework -- this is | |||
2 | SECTION = "libs" | 2 | SECTION = "libs" |
3 | HOMEPAGE = "http://qt.nokia.com" | 3 | HOMEPAGE = "http://qt.nokia.com" |
4 | DEPENDS += "directfb tslib" | 4 | DEPENDS += "directfb tslib" |
5 | INC_PR = "r40" | 5 | INC_PR = "r41" |
6 | 6 | ||
7 | QT_BASE_LIB ?= "libqt-embedded" | 7 | QT_BASE_LIB ?= "libqt-embedded" |
8 | 8 | ||
diff --git a/meta/recipes-qt/qt4/qt4-x11-free.inc b/meta/recipes-qt/qt4/qt4-x11-free.inc index 40939deb1c..75487f756b 100644 --- a/meta/recipes-qt/qt4/qt4-x11-free.inc +++ b/meta/recipes-qt/qt4/qt4-x11-free.inc | |||
@@ -5,7 +5,7 @@ HOMEPAGE = "http://qt.nokia.com" | |||
5 | SECTION = "x11/libs" | 5 | SECTION = "x11/libs" |
6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" | 6 | DEPENDS += "virtual/libgl virtual/libx11 fontconfig libxft libxext libxrender libxrandr libxcursor" |
7 | 7 | ||
8 | INC_PR = "r37" | 8 | INC_PR = "r38" |
9 | 9 | ||
10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " | 10 | QT_GLFLAGS ?= "${@base_contains('DISTRO_FEATURES', 'opengl', '-opengl', '-no-opengl', d)} " |
11 | QT_GLFLAGS_qemux86 = "-opengl" | 11 | QT_GLFLAGS_qemux86 = "-opengl" |
diff --git a/meta/recipes-qt/qt4/qt4.inc b/meta/recipes-qt/qt4/qt4.inc index 1e76decff1..75abe6e029 100644 --- a/meta/recipes-qt/qt4/qt4.inc +++ b/meta/recipes-qt/qt4/qt4.inc | |||
@@ -1,6 +1,6 @@ | |||
1 | inherit qmake_base | 1 | inherit qmake_base |
2 | 2 | ||
3 | DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3" | 3 | DEPENDS += "qt4-tools-native freetype jpeg libpng zlib dbus openssl glib-2.0 gstreamer gst-plugins-base sqlite3 tiff" |
4 | 4 | ||
5 | require qt4_arch.inc | 5 | require qt4_arch.inc |
6 | QT_ARCH := "${@qt_arch(d)}" | 6 | QT_ARCH := "${@qt_arch(d)}" |
@@ -15,7 +15,7 @@ QT_GLFLAGS ?= "" | |||
15 | 15 | ||
16 | QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ | 16 | QT_CONFIG_FLAGS += "-release -no-cups -reduce-relocations \ |
17 | -shared -no-nas-sound -no-nis \ | 17 | -shared -no-nas-sound -no-nis \ |
18 | -system-libjpeg -system-libpng -system-zlib \ | 18 | -system-libjpeg -system-libpng -system-libtiff -system-zlib \ |
19 | -no-pch -qdbus -stl -glib -phonon -webkit \ | 19 | -no-pch -qdbus -stl -glib -phonon -webkit \ |
20 | -xmlpatterns -no-rpath -qt3support -silent \ | 20 | -xmlpatterns -no-rpath -qt3support -silent \ |
21 | ${QT_SQL_DRIVER_FLAGS} \ | 21 | ${QT_SQL_DRIVER_FLAGS} \ |