- Revision
- 139609
- Author
- jocelyn.turco...@digia.com
- Date
- 2013-01-14 05:01:20 -0800 (Mon, 14 Jan 2013)
Log Message
[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:
Modified Paths
Removed Paths
Diff
Modified: trunk/Tools/ChangeLog (139608 => 139609)
--- trunk/Tools/ChangeLog 2013-01-14 12:54:33 UTC (rev 139608)
+++ trunk/Tools/ChangeLog 2013-01-14 13:01:20 UTC (rev 139609)
@@ -1,3 +1,26 @@
+2013-01-14 Jocelyn Turcotte <jocelyn.turco...@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-09 Raphael Kubo da Costa <raphael.kubo.da.co...@intel.com>
[EFL][jhbuild] Bump the EFL dependencies in jhbuild to 1.7.5.
Deleted: trunk/Tools/qmake/config.tests/libjpeg/libjpeg.cpp (139608 => 139609)
--- trunk/Tools/qmake/config.tests/libjpeg/libjpeg.cpp 2013-01-14 12:54:33 UTC (rev 139608)
+++ trunk/Tools/qmake/config.tests/libjpeg/libjpeg.cpp 2013-01-14 13:01:20 UTC (rev 139609)
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) Zoltan Horvath (zol...@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;
-}
Deleted: trunk/Tools/qmake/config.tests/libjpeg/libjpeg.pro (139608 => 139609)
--- trunk/Tools/qmake/config.tests/libjpeg/libjpeg.pro 2013-01-14 12:54:33 UTC (rev 139608)
+++ trunk/Tools/qmake/config.tests/libjpeg/libjpeg.pro 2013-01-14 13:01:20 UTC (rev 139609)
@@ -1,3 +0,0 @@
-SOURCES = libjpeg.cpp
-OBJECTS_DIR = obj
-LIBS += -ljpeg
Deleted: trunk/Tools/qmake/config.tests/libpng/libpng.cpp (139608 => 139609)
--- trunk/Tools/qmake/config.tests/libpng/libpng.cpp 2013-01-14 12:54:33 UTC (rev 139608)
+++ trunk/Tools/qmake/config.tests/libpng/libpng.cpp 2013-01-14 13:01:20 UTC (rev 139609)
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) Zoltan Horvath (zol...@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;
-}
Deleted: trunk/Tools/qmake/config.tests/libpng/libpng.pro (139608 => 139609)
--- trunk/Tools/qmake/config.tests/libpng/libpng.pro 2013-01-14 12:54:33 UTC (rev 139608)
+++ trunk/Tools/qmake/config.tests/libpng/libpng.pro 2013-01-14 13:01:20 UTC (rev 139609)
@@ -1,3 +0,0 @@
-SOURCES = libpng.cpp
-OBJECTS_DIR = obj
-LIBS += -lpng
Modified: trunk/Tools/qmake/mkspecs/features/features.prf (139608 => 139609)
--- trunk/Tools/qmake/mkspecs/features/features.prf 2013-01-14 12:54:33 UTC (rev 139608)
+++ trunk/Tools/qmake/mkspecs/features/features.prf 2013-01-14 13:01:20 UTC (rev 139609)
@@ -42,10 +42,12 @@
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-* {
