[Qt] Fix Qt-Mac build after libxml patch
authornoam.rosenthal@nokia.com <noam.rosenthal@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Apr 2012 13:11:39 +0000 (13:11 +0000)
committernoam.rosenthal@nokia.com <noam.rosenthal@nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Apr 2012 13:11:39 +0000 (13:11 +0000)
https://bugs.webkit.org/show_bug.cgi?id=84313

Use direct include/library paths instead of PKGCONFIG when on Mac.

Reviewed by Simon Hausmann.

No new tests, build fix.

* WebCore.pri:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@114627 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/WebCore.pri

index 9b77188..1a25d66 100644 (file)
@@ -1,3 +1,16 @@
+2012-04-19  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Qt] Fix Qt-Mac build after libxml patch
+        https://bugs.webkit.org/show_bug.cgi?id=84313
+
+        Use direct include/library paths instead of PKGCONFIG when on Mac.
+
+        Reviewed by Simon Hausmann.
+
+        No new tests, build fix.
+
+        * WebCore.pri:
+
 2012-04-18  Vsevolod Vlasov  <vsevik@chromium.org>
 
         Web Inspector: No response body available for cached resource requests with error status codes.
index cdaeb73..eba26dd 100644 (file)
@@ -113,7 +113,12 @@ INCLUDEPATH += $$WEBCORE_GENERATED_SOURCES_DIR
 
 contains(DEFINES, ENABLE_XSLT=1) {
     contains(DEFINES, WTF_USE_LIBXML2=1) {
-        PKGCONFIG += libxslt
+        mac {
+            INCLUDEPATH += /usr/include/libxml2
+            LIBS += -lxml2 -lxslt
+        } else {
+            PKGCONFIG += libxslt
+        }
     } else {
         QT *= xmlpatterns
     }