diff options
| author | commit-queue@webkit.org <commit-queue@webkit.org> | 2013-01-13 17:18:00 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-17 14:06:03 +0100 |
| commit | 9cf93e3805aee0647510e0f3d243c7b8869b1348 (patch) | |
| tree | d2b1034af20c00cbc6d40fe790660034540fa220 | |
| parent | c10f01da1e92328959cd6cf7c8951888c86ad5dc (diff) | |
| download | qtwebkit-9cf93e3805aee0647510e0f3d243c7b8869b1348.tar.gz | |
Fix CONFIG missing link_pkgconfig on Windows
https://bugs.webkit.org/show_bug.cgi?id=106647
Some libraries (e.g. libxslt, libxml2 and sqlite3) fail to link
properly on Windows because they are added to PKGCONFIG but
CONFIG does not contain link_pkgconfig.
This is because link_pkgconfig is added in unix/default_pre.prf
which is only used for UNIX platforms. To fix this, move it to
the general default_pre.prf.
Patch by Jonathan Liu <net147@gmail.com> on 2013-01-13
Reviewed by Simon Hausmann.
* qmake/mkspecs/features/default_pre.prf:
* qmake/mkspecs/features/unix/default_pre.prf:
Change-Id: Idf08d5f0c9ca531605da5d1474cff09c2bc1c042
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139570 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | Tools/ChangeLog | 18 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/default_pre.prf | 3 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/unix/default_pre.prf | 3 |
3 files changed, 21 insertions, 3 deletions
diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 995a7c133..215aa86f7 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,21 @@ +2013-01-13 Jonathan Liu <net147@gmail.com> + + Fix CONFIG missing link_pkgconfig on Windows + https://bugs.webkit.org/show_bug.cgi?id=106647 + + Some libraries (e.g. libxslt, libxml2 and sqlite3) fail to link + properly on Windows because they are added to PKGCONFIG but + CONFIG does not contain link_pkgconfig. + + This is because link_pkgconfig is added in unix/default_pre.prf + which is only used for UNIX platforms. To fix this, move it to + the general default_pre.prf. + + Reviewed by Simon Hausmann. + + * qmake/mkspecs/features/default_pre.prf: + * qmake/mkspecs/features/unix/default_pre.prf: + 2012-12-06 Andras Becsi <andras.becsi@digia.com> [Qt][Mac] Fix libxslt and libxml2 config tests diff --git a/Tools/qmake/mkspecs/features/default_pre.prf b/Tools/qmake/mkspecs/features/default_pre.prf index 6b19a67b9..75acbc3a4 100644 --- a/Tools/qmake/mkspecs/features/default_pre.prf +++ b/Tools/qmake/mkspecs/features/default_pre.prf @@ -85,6 +85,9 @@ contains(QT_CONFIG, private_tests): CONFIG += qt_developer_build # Set some defaults for specific platforms CONFIG += include_webinspector +# Make sure we process the PKGCONFIG variable if applicable +!mac: CONFIG += link_pkgconfig + # By default we enable "production build", and build-webkit, which is # used by bots and developers, will disable it, to enable warnings etc. CONFIG += production_build diff --git a/Tools/qmake/mkspecs/features/unix/default_pre.prf b/Tools/qmake/mkspecs/features/unix/default_pre.prf index 83b7cc4a9..aafc48ceb 100644 --- a/Tools/qmake/mkspecs/features/unix/default_pre.prf +++ b/Tools/qmake/mkspecs/features/unix/default_pre.prf @@ -16,9 +16,6 @@ SBOX_CHECK = $$(_SBOX_DIR) # flag that can be used to test for either of these situations. contains(QT_CONFIG, qpa)|contains(QT_CONFIG, embedded): CONFIG += embedded -# Make sure we process the PKGCONFIG variable if applicable -!mac: CONFIG += link_pkgconfig - # Reduce linking memory pressure on 32-bit debug builds on Linux linux-g++*:CONFIG(debug, debug|release):isEqual(QT_ARCH,i386): CONFIG += use_all_in_one_files |