diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2013-01-08 15:44:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-08 15:50:39 +0100 |
| commit | 9b144019dd99d696f1a9eb9cde6afa0f04d7dc05 (patch) | |
| tree | 250ca2b8e3973804e668cd55184574a77d1769ae /Tools | |
| parent | a65d837c40c5a6f19cf983e6614b10030d81dc67 (diff) | |
| download | qtwebkit-9b144019dd99d696f1a9eb9cde6afa0f04d7dc05.tar.gz | |
[Qt] Fix libxml2 config test https://bugs.webkit.org/show_bug.cgi?id=106317
Patch by Heikki Paajanen <heikki.paajanen@palm.com> on 2013-01-08
Reviewed by Simon Hausmann.
Don't assume standard include/libxml2, libxml-2.0.pc should know
where it's headers are.
Change-Id: I6cc8278ccb916258ed40ad169be7281f7cd573f5
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/ChangeLog | 12 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libxml2/libxml2.cpp | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 83ad9f5cb..fb2e127de 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,15 @@ +2013-01-08 Heikki Paajanen <heikki.paajanen@palm.com> + + [Qt] Fix libxml2 config test + https://bugs.webkit.org/show_bug.cgi?id=106317 + + Reviewed by Simon Hausmann. + + Don't assume standard include/libxml2, libxml-2.0.pc should know + where it's headers are. + + * qmake/config.tests/libxml2/libxml2.cpp: Fix include + 2013-01-03 Jonathan Liu <net147@gmail.com> [Qt] Fix library linking order diff --git a/Tools/qmake/config.tests/libxml2/libxml2.cpp b/Tools/qmake/config.tests/libxml2/libxml2.cpp index dfde5a38b..2117b5b41 100644 --- a/Tools/qmake/config.tests/libxml2/libxml2.cpp +++ b/Tools/qmake/config.tests/libxml2/libxml2.cpp @@ -23,7 +23,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include <libxml2/libxml/xmlreader.h> +#include <libxml/xmlreader.h> int main(int, char**) { |