Title: [116507] trunk/Source/WebCore
Revision
116507
Author
[email protected]
Date
2012-05-09 02:07:41 -0700 (Wed, 09 May 2012)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (116506 => 116507)


--- trunk/Source/WebCore/ChangeLog	2012-05-09 09:04:02 UTC (rev 116506)
+++ trunk/Source/WebCore/ChangeLog	2012-05-09 09:07:41 UTC (rev 116507)
@@ -1,3 +1,16 @@
+2012-05-09  Zoltan Horvath  <[email protected]>
+
+        [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  <[email protected]>
 
         Add identifying methods for date/time input types.

Modified: trunk/Source/WebCore/WebCore.pri (116506 => 116507)


--- trunk/Source/WebCore/WebCore.pri	2012-05-09 09:04:02 UTC (rev 116506)
+++ trunk/Source/WebCore/WebCore.pri	2012-05-09 09:07:41 UTC (rev 116507)
@@ -233,10 +233,10 @@
     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!")
+        !contains(config_test_libpng, yes): error("PNG library not found!")
     }
 
-    LIBS += -ljpeg -lpng12
+    LIBS += -ljpeg -lpng
 
     contains(DEFINES, WTF_USE_WEBP=1) {
         INCLUDEPATH += $$SOURCE_DIR/platform/image-decoders/webp
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to