Changeset 116507 in webkit

Timestamp:

May 9, 2012 2:07:41 AM (12 years ago)

Author:

zoltan@webkit.org

Message:

[Qt] Build fix when using libpng version != 1.2
​https://bugs.webkit.org/show_bug.cgi?id=85614

Reviewed by Eric Seidel.

Don't enforce the version of libpng when passing the option to the linker.

No new tests, no intended functionality change.

• WebCore.pri:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.pri (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-09  Zoltan Horvath  <zoltan@webkit.org>
+
+        [Qt] Build fix when using libpng version != 1.2
+        https://bugs.webkit.org/show_bug.cgi?id=85614
+
+        Reviewed by Eric Seidel.
+
+        Don't enforce the version of libpng when passing the option to the linker.
+
+        No new tests, no intended functionality change.
+
+        * WebCore.pri:
+
 2012-05-09  Oli Lan  <olilan@chromium.org>
 

trunk/Source/WebCore/WebCore.pri

@@ -234 +234 @@
         # 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(config_test_libpng, yes): error("PNG library not found!")
+    }
+
+    LIBS += -ljpeg -lpng
 
     contains(DEFINES, WTF_USE_WEBP=1) {