1 files changed, 26 insertions, 17 deletions
diff --git a/Source/WebCore/WebCore.pri b/Source/WebCore/WebCore.pri
index 98444c6e6..08db64c0c 100644
--- a/Source/WebCore/WebCore.pri
+++ b/Source/WebCore/WebCore.pri
@@ -65,6 +65,11 @@ INCLUDEPATH += \
     $$SOURCE_DIR/platform/graphics/texmap \
     $$SOURCE_DIR/platform/graphics/transforms \
     $$SOURCE_DIR/platform/image-decoders \
+    $$SOURCE_DIR/platform/image-decoders/bmp \
+    $$SOURCE_DIR/platform/image-decoders/ico \
+    $$SOURCE_DIR/platform/image-decoders/gif \
+    $$SOURCE_DIR/platform/image-decoders/jpeg \
+    $$SOURCE_DIR/platform/image-decoders/png \
     $$SOURCE_DIR/platform/leveldb \
     $$SOURCE_DIR/platform/mock \
     $$SOURCE_DIR/platform/network \
@@ -223,25 +228,29 @@ contains(DEFINES, WTF_USE_TEXTURE_MAPPER_GL=1)|contains(DEFINES, ENABLE_WEBGL=1)
     LIBS += -lsqlite3
 }
 
-contains(DEFINES, WTF_USE_QT_IMAGE_DECODER=0) {
-    INCLUDEPATH += \
-        $$SOURCE_DIR/platform/image-decoders/bmp \
-        $$SOURCE_DIR/platform/image-decoders/gif \
-        $$SOURCE_DIR/platform/image-decoders/ico \
-        $$SOURCE_DIR/platform/image-decoders/jpeg \
-        $$SOURCE_DIR/platform/image-decoders/png
+contains(DEFINES, WTF_USE_WEBP=1) {
+    INCLUDEPATH += $$SOURCE_DIR/platform/image-decoders/webp
+    LIBS += -lwebp
+}
 
-    haveQt(5) {
-        # Qt5 allows us to use config tests to check for the presence of these libraries
-        !contains(config_test_libjpeg, yes): error("JPEG library not found!")
-        !contains(config_test_libpng, yes): error("PNG library not found!")
+haveQt(5) {
+    # Qt5 allows us to use config tests to check for the presence of these libraries
+    contains(config_test_libjpeg, yes) {
+        DEFINES += HAVE_LIBJPEG=1
+        LIBS += -ljpeg
+    } else {
+        warning("JPEG library not found! QImageDecoder will decode JPEG images.")
     }
-
-    LIBS += -ljpeg -lpng
-
-    contains(DEFINES, WTF_USE_WEBP=1) {
-        INCLUDEPATH += $$SOURCE_DIR/platform/image-decoders/webp
-        LIBS += -lwebp
+    contains(config_test_libpng, yes) {
+        DEFINES += HAVE_LIBPNG=1
+        LIBS += -lpng
+    } else {
+        warning("PNG library not found! QImageDecoder will decode PNG images.")
+    }
+} else {
+    !win32-*:!mac {
+        DEFINES += HAVE_LIBJPEG=1 HAVE_LIBPNG=1
+        LIBS += -ljpeg -lpng
     }
 }