diff options
| -rw-r--r-- | Tools/ChangeLog | 23 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libjpeg/libjpeg.cpp | 35 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libjpeg/libjpeg.pro | 3 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libpng/libpng.cpp | 33 | ||||
| -rw-r--r-- | Tools/qmake/config.tests/libpng/libpng.pro | 3 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 6 |
6 files changed, 27 insertions, 76 deletions
diff --git a/Tools/ChangeLog b/Tools/ChangeLog index 215aa86f7..e218e8e98 100644 --- a/Tools/ChangeLog +++ b/Tools/ChangeLog @@ -1,3 +1,26 @@ +2013-01-14 Jocelyn Turcotte <jocelyn.turcotte@digia.com> + + [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: + 2013-01-13 Jonathan Liu <net147@gmail.com> Fix CONFIG missing link_pkgconfig on Windows diff --git a/Tools/qmake/config.tests/libjpeg/libjpeg.cpp b/Tools/qmake/config.tests/libjpeg/libjpeg.cpp deleted file mode 100644 index cb44f0e73..000000000 --- a/Tools/qmake/config.tests/libjpeg/libjpeg.cpp +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) Zoltan Horvath (zoltan@webkit.org) 2012 University of Szeged. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <stdio.h> -#include <jpeglib.h> - -int main(int, char**) -{ - struct jpeg_compress_struct cinfo; - jpeg_create_compress(&cinfo); - - return 0; -} diff --git a/Tools/qmake/config.tests/libjpeg/libjpeg.pro b/Tools/qmake/config.tests/libjpeg/libjpeg.pro deleted file mode 100644 index b84c3e0c4..000000000 --- a/Tools/qmake/config.tests/libjpeg/libjpeg.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = libjpeg.cpp -OBJECTS_DIR = obj -LIBS += -ljpeg diff --git a/Tools/qmake/config.tests/libpng/libpng.cpp b/Tools/qmake/config.tests/libpng/libpng.cpp deleted file mode 100644 index 7fb5861ab..000000000 --- a/Tools/qmake/config.tests/libpng/libpng.cpp +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) Zoltan Horvath (zoltan@webkit.org) 2012 University of Szeged. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include <png.h> - -int main(int, char**) -{ - png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); - - return 0; -} diff --git a/Tools/qmake/config.tests/libpng/libpng.pro b/Tools/qmake/config.tests/libpng/libpng.pro deleted file mode 100644 index 23a39a971..000000000 --- a/Tools/qmake/config.tests/libpng/libpng.pro +++ /dev/null @@ -1,3 +0,0 @@ -SOURCES = libpng.cpp -OBJECTS_DIR = obj -LIBS += -lpng diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 2a0eb4051..6385887d2 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -42,10 +42,12 @@ defineTest(detectFeatures) { config_libzlib: WEBKIT_CONFIG += use_zlib config_libwebp: WEBKIT_CONFIG += use_webp - config_libjpeg: WEBKIT_CONFIG += use_libjpeg + # We can't use Qt's 3rdparty sources for libjpeg and libpng outside of qtbase, but if Qt + # is using the system libraries, use them to take advantage of the WebCore image decoders as well. + contains(QT_CONFIG, system-jpeg): WEBKIT_CONFIG += use_libjpeg else: CONFIGURE_WARNINGS += "JPEG library not found, QImageDecoder will decode JPEG images" - config_libpng: WEBKIT_CONFIG += use_libpng + contains(QT_CONFIG, system-png): WEBKIT_CONFIG += use_libpng else: CONFIGURE_WARNINGS += "PNG library not found, QImageDecoder will decode PNG images" linux-* { |