[Qt] The Qt's configuration isn't honoured regarding the use of the system libpng...
authorjocelyn.turcotte@digia.com <jocelyn.turcotte@digia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Jan 2013 13:01:20 +0000 (13:01 +0000)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 21 Jan 2013 13:46:45 +0000 (14:46 +0100)
commit3fd5921116281201f0c8a5d01039dc6ed64fca31
tree52a63fb1b76d6cf97cf935215d081f1f2351734e
parent75aed8fafb6eb2e4228e10b8895465271b595752
[Qt] The Qt's configuration isn't honoured regarding the use of the system libpng and libjpeg
https://bugs.webkit.org/show_bug.cgi?id=104909

Reviewed by Simon Hausmann.

To be able to build redistribuable binary packages, Qt's configure switches
-qt-libpng and -qt-libjpeg are used to avoid having the binaries trying to
dynamically link to optional system libraries.
QtWebKit is doing its own configure checks for those libraries, thus adding a
runtime dependency that might not be fulfilled if the packager's machine had
those libraries while the user's machine won't.

Since in most cases where WebKit will want to use those system libraries, Qt will
also be using them, remove these configure tests from WebKit.

* qmake/config.tests/libjpeg/libjpeg.cpp: Removed.
* qmake/config.tests/libjpeg/libjpeg.pro: Removed.
* qmake/config.tests/libpng/libpng.cpp: Removed.
* qmake/config.tests/libpng/libpng.pro: Removed.
* qmake/mkspecs/features/features.prf:

Change-Id: I986fd77e6b54d3553015512548ac24776febc982
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139609 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Tools/ChangeLog
Tools/qmake/config.tests/libjpeg/libjpeg.cpp [deleted file]
Tools/qmake/config.tests/libjpeg/libjpeg.pro [deleted file]
Tools/qmake/config.tests/libpng/libpng.cpp [deleted file]
Tools/qmake/config.tests/libpng/libpng.pro [deleted file]
Tools/qmake/mkspecs/features/features.prf