[Qt] Set WebCore imagedecoders as default and add fallback to QImageDecoder
[WebKit-https.git] / Source / WebCore / WebCore.pri
old mode 100644 (file)
new mode 100755 (executable)
index 6f31472..ca7e683
@@ -64,6 +64,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/gif \
+    $$SOURCE_DIR/platform/image-decoders/ico \
+    $$SOURCE_DIR/platform/image-decoders/jpeg \
+    $$SOURCE_DIR/platform/image-decoders/png \
     $$SOURCE_DIR/platform/leveldb \
     $$SOURCE_DIR/platform/mock \
     $$SOURCE_DIR/platform/network \
@@ -222,28 +227,19 @@ 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
-
-    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 1.2 library not found!")
-    }
-
-    LIBS += -ljpeg -lpng12
+contains(DEFINES, WTF_USE_WEBP=1) {
+    INCLUDEPATH += $$SOURCE_DIR/platform/image-decoders/webp
+    LIBS += -lwebp
+}
 
-    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 1.2 library not found!")
 }
 
+LIBS += -ljpeg -lpng12
+
 win32-*|wince* {
     DLLDESTDIR = $${ROOT_BUILD_DIR}/bin