1 files changed, 48 insertions, 0 deletions
diff --git a/patches/qt-embedded-linux-opensource-src-4.4.0/fix-configure-disable.diff b/patches/qt-embedded-linux-opensource-src-4.4.0/fix-configure-disable.diff
new file mode 100644
index 000000000..b0bfa91ad
--- /dev/null
+++ b/patches/qt-embedded-linux-opensource-src-4.4.0/fix-configure-disable.diff
@@ -0,0 +1,48 @@
+Subject: fix disabling jpeg/mng/tiff
+From: Michael Olbrich <m.olbrich@pengutronix.de>
+
+Setting -no-libjpeg, -no-libmng and -no-libtiff does not work.
+This patch ensures that these are disabled even if the corresponding
+libraries are found. The method is copied from the libpng handling.
+
+Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
+---
+ configure |   11 +++++++++--
+ 1 file changed, 9 insertions(+), 2 deletions(-)
+
+Index: b/configure
+===================================================================
+--- a/configure
++++ b/configure
+@@ -4776,7 +4776,9 @@ fi
+ if [ "$CFG_INOTIFY" = "yes" ]; then
+     QT_CONFIG="$QT_CONFIG inotify"
+ fi
+-if [ "$CFG_LIBJPEG" = "system" ]; then
++if [ "$CFG_LIBJPEG" = "no" ]; then
++    CFG_JPEG="no"
++elif [ "$CFG_LIBJPEG" = "system" ]; then
+     QT_CONFIG="$QT_CONFIG system-jpeg"
+ fi
+ if [ "$CFG_JPEG" = "no" ]; then
+@@ -4784,6 +4786,9 @@ if [ "$CFG_JPEG" = "no" ]; then
+ elif [ "$CFG_JPEG" = "yes" ]; then
+     QT_CONFIG="$QT_CONFIG jpeg"
+ fi
++if [ "$CFG_LIBMNG" = "no" ]; then
++    CFG_MNG="no"
++fi
+ if [ "$CFG_LIBMNG" = "system" ]; then
+     QT_CONFIG="$QT_CONFIG system-mng"
+ fi
+@@ -4808,7 +4813,9 @@ if [ "$CFG_GIF" = "no" ]; then
+ elif [ "$CFG_GIF" = "yes" ]; then
+     QT_CONFIG="$QT_CONFIG gif"
+ fi
+-if [ "$CFG_LIBTIFF" = "system" ]; then
++if [ "$CFG_LIBTIFF" = "no" ]; then
++    CFG_TIFF="no"
++elif [ "$CFG_LIBTIFF" = "system" ]; then
+     QT_CONFIG="$QT_CONFIG system-tiff"
+ fi
+ if [ "$CFG_TIFF" = "no" ]; then