diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-01-09 17:05:25 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-14 13:50:19 +0100 |
| commit | c03f448e170e91ef00dd1846a99e2f094b5919d8 (patch) | |
| tree | 91dafaf2368c1b0f01b129a0d6a5c13b82f90283 /Tools | |
| parent | 5ab8ecba8bb7146178ad89ba27ca7a3e79419626 (diff) | |
| download | qtwebkit-c03f448e170e91ef00dd1846a99e2f094b5919d8.tar.gz | |
[Qt][Mac] Fix libxslt and libxml2 config tests https://bugs.webkit.org/show_bug.cgi?id=104164
Reviewed by Simon Hausmann.
http://trac.webkit.org/changeset/136837
Source/WebCore:
Avoid using pkg-config on Mac, instead use direct
include paths and add needed libraries to the linker.
No new tests needed.
WebCore.pri:
Tools:
We should not use pkg-config on Mac instead use direct include
paths and add needed libraries to the linker options to detect
libxslt and libxml2 provided by the system.
Previously we would always fall back to qtxmlpatterns.
qmake/config.tests/libxml2/libxml2.pro:
qmake/config.tests/libxslt/libxslt.pro:
Change-Id: I2020c7cdce1f6c6217320b06b4571705eb8af769
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/ChangeLog | 15 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libxml2/libxml2.pro | 9 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libxslt/libxslt.pro | 9 |
3 files changed, 29 insertions, 4 deletions
diff --git a/Tools/ChangeLog b/Tools/ChangeLog index fb2e127de..995a7c133 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,18 @@ +2012-12-06 Andras Becsi <andras.becsi@digia.com> + + [Qt][Mac] Fix libxslt and libxml2 config tests + https://bugs.webkit.org/show_bug.cgi?id=104164 + + Reviewed by Simon Hausmann. + + We should not use pkg-config on Mac instead use direct include + paths and add needed libraries to the linker options to detect + libxslt and libxml2 provided by the system. + Previously we would always fall back to qtxmlpatterns. + + * qmake/config.tests/libxml2/libxml2.pro: + * qmake/config.tests/libxslt/libxslt.pro: + 2013-01-08 Heikki Paajanen <heikki.paajanen@palm.com> [Qt] Fix libxml2 config test diff --git a/Tools/qmake/config.tests/libxml2/libxml2.pro b/Tools/qmake/config.tests/libxml2/libxml2.pro index d5add8f17..bd72944f0 100644 --- a/Tools/qmake/config.tests/libxml2/libxml2.pro +++ b/Tools/qmake/config.tests/libxml2/libxml2.pro @@ -1,4 +1,9 @@ CONFIG -= qt SOURCES = libxml2.cpp -CONFIG += link_pkgconfig -PKGCONFIG += libxml-2.0 +mac { + INCLUDEPATH += /usr/include/libxml2 + LIBS += -lxml2 +} else { + PKGCONFIG += libxml-2.0 + CONFIG += link_pkgconfig +} diff --git a/Tools/qmake/config.tests/libxslt/libxslt.pro b/Tools/qmake/config.tests/libxslt/libxslt.pro index 6359de3c6..1943485d0 100644 --- a/Tools/qmake/config.tests/libxslt/libxslt.pro +++ b/Tools/qmake/config.tests/libxslt/libxslt.pro @@ -1,4 +1,9 @@ CONFIG -= qt SOURCES = libxslt.cpp -CONFIG += link_pkgconfig -PKGCONFIG += libxslt +mac { + INCLUDEPATH += /usr/include/libxslt /usr/include/libxml2 + LIBS += -lxslt +} else { + PKGCONFIG += libxslt + CONFIG += link_pkgconfig +} |