summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libpng
Commit message (Collapse)AuthorAgeFilesLines
* Update bundled libpng to version 1.6.43Eirik Aavitsland2024-03-0612-108/+133
| | | | | | | | | | [ChangeLog][Third-Party Code] libpng was updated to version 1.6.43 Pick-to: 6.7 6.6 6.5 6.2 5.15 Fixes: QTBUG-122989 Change-Id: Id439e64010bc3f6752f5589d663827a91f009173 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update bundled libpng to version 1.6.42Eirik Aavitsland2024-02-0710-99/+105
| | | | | | | | | [ChangeLog][Third-Party Code] libpng was updated to version 1.6.42 Pick-to: 6.7 6.6 6.6.2 6.5 6.2 5.15 Change-Id: Ie41c2df610fcd456af2bc4dee05dde90c426602b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update bundled libpng to version 1.6.41Eirik Aavitsland2024-01-3121-306/+427
| | | | | | | | [ChangeLog][Third-Party Code] libpng was updated to version 1.6.41 Pick-to: 6.7 6.6 6.6.2 6.5 6.2 5.15 Change-Id: I3285bfa11f61c571ffda1b365011a5c6a798ca68 Reviewed-by: Kai Köhne <kai.koehne@qt.io>
* Modify copyright format in qt_attribution.jsonLucie Gérard2023-10-231-22/+22
| | | | | | | | | Multiline copyright entries are entered via string array. Task-number: QTBUG-111873 Pick-to: 6.5 6.6 Change-Id: Ib8203163db8d5d579117f402b7a89b59ae1a5169 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Update bundled libpng to version 1.6.40Eirik Aavitsland2023-07-0414-175/+180
| | | | | | | | | [ChangeLog][Third-Party Code] libpng was updated to version 1.6.40 Pick-to: 6.6 6.5 6.2 5.15 Change-Id: Id10d61fc4c3b8cccdcca9042097d4dc470aa0067 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix license info for import shell scriptsKai Köhne2023-04-261-38/+3
| | | | | | | | | | Use SPDX-License-Identifier also for shell scripts. Also change license to LicenseRef-Qt-Commercial OR GPL-3.0-only, which makes arguably more sense than LGPL. Pick-to: 6.5 Change-Id: I3a46468f264747916aacbf206f5ccba28b6c6593 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Highlight third-party modules that are security criticalKai Köhne2023-03-311-0/+3
| | | | | | | | | | | | | | Mark any modules listed as 'processing untrusted content' in https://wiki.qt.io/Third_Party_Code_in_Qt also in the qt_attribution.json files. For reasoning, see also https://lists.qt-project.org/pipermail/development/2023-February/043667.html Pick-to: 6.5 Change-Id: Id547d4f7e77dac8c7e8e382e65169e7bd0330fcf Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* src: Remove remains of qmake conversion from CMakeLists.txt filesFriedemann Kleint2023-02-101-2/+0
| | | | | | Pick-to: 6.5 Change-Id: Id644d322a602038403bb7f46c532744575fbf6d3 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Update bundled libpng to version 1.6.39Eirik Aavitsland2022-11-2815-117/+136
| | | | | | | | [ChangeLog][Third-Party Code] libpng was updated to version 1.6.39 Pick-to: 6.4 6.2 5.15 Change-Id: I0113fb071d344049976953253adb4d898a1bb7c6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Update bundled libpng to version 1.6.38Eirik Aavitsland2022-10-1721-252/+173
| | | | | | | | | | | | | | | | | With this update, there are no longer any diffs to upstream libpng. Hence, the qtpatches.diff file is removed. Details: - #define _CRT_SECURE_NO_DEPRECATE: Done on compiler cmdline instead - #undef PNG_BUILD_DLL: For our usecase, that only caused PNG_IMPEXP to be defined to an empty string. Done on compiler cmdline instead. - #ifdef for WinCE: dead platform. - A memory leak fix: Included in upstream 1.6.38. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.38 Pick-to: 6.4 6.2 5.15 Change-Id: I229db30e1dd54c209dc93e76d11e6fdb1f7adbdb Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* CMake: Don't use AUTOMOC for third party librariesAlexandru Croitor2022-07-251-0/+1
| | | | | | | | | | | None of them have Qt sources that need moc-ing. It's also needed to circumvent an AUTOMOC + PCH issue when AUTOMOC is enabled for a target that does not have any C++ sources, but the target links to another target that does have C++ sources. Pick-to: 6.4 Change-Id: Ib1b2aa766089f093117c1ba34e156dfe8b0957e6 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Add missing install of pnglibconf.h for static buildsMichal Klocek2022-03-161-0/+1
| | | | | | | | | | Installing only pngconf.h is not enough. This commit amends be2745e4788cecb0d3122081e3328e4b66923609 Pick-to: 6.3 Change-Id: I8de1565434c315c7197d4602a8460ead794176d7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Install 3rdparty headers for static buildsMichal Klocek2022-02-191-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | For static builds we need 3rdparty headers to be installed. Leaf modules like qtwebengine needs 3rdparty libs and header for zlib, freetype, harfbuzz, png, jpeg. Without those the Chromium bundled versions are used, however it might end up badly if qt has already bundled one. Introduce new header only modules with additional arguments for qt_internal_add_module: * EXTERNAL_HEADERS to pick exactly which headers are public * EXTERNAL_HEADERS_DIR to include whole directory preserving the files directory structure Fix qtsync so it keep directory structure for all non-qt modules when syncing headers and do not generate warnings for headers files. Task-number: QTBUG-87154 Task-number: QTBUG-88614 Change-Id: If1c27bf8608791cd4e0a21839d6316a445a96e9f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Fix memory leak if eXIf has incorrect crcRobert Löhning2021-08-102-4/+19
| | | | | | | | | | | | | Change eb6767 from upstream repo. Fixes oss-fuzz issue 23376. [ChangeLog][Third-Party Code][libpng] Fix for possible memory leak in libpng was backported. Change-Id: Id0c2f8b8bd60438ae8b5a61c83b6e50d55c6eb65 Pick-to: 6.2 6.1 5.15 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* CMake: Introduce zlib find script to work around hardcoded iOS SDKAlexandru Croitor2021-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode allows building a project targeting either the device or simulator sysroot in one single build dir, but for the sysroot switching to work there should be no linker or compiler flags referencing absolute paths of a specific sysroot. During CMake configuration of a project targeting iOS, all found system libraries will be within one single sysroot, either the device one or the simulator one, whichever one was passed to CMAKE_OSX_SYSROOT. CMake will then generate the Xcode project and pass those absolute paths, which makes sysroot switching within Xcode not work. To avoid that, the CMake documentation recommends passing linker and framework flags of the form '-lfoo' and '-framework bar' instead of absolute paths. Xcode then takes care of setting the correct framework search path. Zlib is one of the libraries found in the iOS sysroot and thus passed as absolute path. To avoid that, create a new FindWrapZLIB find script. The target it creates will pass the absolute path to the library on non Apple platforms and an -lz linker flag on Apple platforms (macOS and iOS). To avoid issues with target global promotion when system PNG package is found, ensure that a found ZLIB::ZLIB target is promoted to global manually in src/gui/configure.cmake. Pick-to: 6.1 Change-Id: I8bd8649be4f680a331ad51925f27cb9d13ac5e5f Reviewed-by: Cristian Adam <cristian.adam@qt.io>
* Remove the qmake project filesJoerg Bornemann2021-01-071-34/+0
| | | | | | | | | | | | | | | | Remove the qmake project files for most of Qt. Leave the qmake project files for examples, because we still test those in the CI to ensure qmake does not regress. Also leave the qmake project files for utils and other minor parts that lack CMake project files. Task-number: QTBUG-88742 Change-Id: I6cdf059e6204816f617f9624f3ea9822703f73cc Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* CMake: Regenerate projects using pro2cmake one last timeAlexandru Croitor2020-12-101-0/+1
| | | | | | | | | And fix up some wrong qmake project files Pick-to: 6.0 Change-Id: I66cb82aeb9c1419a74df1a650fa78a511ade7443 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* Install 3rd party headers and meta for static buildsMichal Klocek2020-11-161-0/+1
| | | | | | | | | | | | | | | | | When doing static builds any project which uses same libraries as qtbase 3rd party libraries will most likely end up in broken binaries, since symbols will be included twice. Moreover, libraries can have different versions. Install 3rd party headers and meta data for: * qtlibpng * qtfreetype * qtharbuzz Pick-to: 5.15 Task-number: QTBUG-87154 Change-Id: I243dff9a12a95af20dee414f55bb762b8d579c81 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* CMake: Regenerate projects to use new qt_internal_ APIAlexandru Croitor2020-09-231-4/+4
| | | | | | | | | | | Modify special case locations to use the new API as well. Clean up some stale .prev files that are not needed anymore. Clean up some project files that are not used anymore. Task-number: QTBUG-86815 Change-Id: I9947da921f98686023c6bb053dfcc101851276b5 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Improve license information for libpngKai Koehne2020-08-261-2/+2
| | | | | | | | | | Use the official name and ID from SPDX: https://spdx.org/licenses/libpng-2.0.html Pick-to: 5.15 Change-Id: I199efd600373cdc150d48a449b122f90ff2c48ef Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Remove winrtOliver Wolff2020-06-062-8/+2
| | | | | | | | | Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* CMake: Generate information about 3rdparty libs in module .pri filesJoerg Bornemann2020-05-191-0/+1
| | | | | | | | | | | | | For modules that are not yet ported to CMake and that use QMAKE_USE += libfoo we need to provide the information about libfoo in the qt_lib_XXX.pri files. Also, we now generate qt_ext_XXX.pri files for bundled 3rdparty libs. Task-number: QTBUG-75666 Change-Id: I9e4b057a197554ecb37c294c0bf09e2a2b3aa053 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Allow building bundled 3rd party libraries in qtbaseAlexandru Croitor2020-02-251-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few things are needed to accomplish that: - the python scripts do not ignore certain system_foo features anymore (it is a hardcoded list for now just to be safe) - configurejson2cmake now outputs qt_find_package(WrapSystemFoo) calls for bundled libraries (see below) - the harfbuzz .pro file is modified to accommodate pro2cmake not being able to correctly parse some conditional scopes - the freetype .pro file is modified to make sure linking of the library succeeds without duplicate symbol errors, which qmake doesn't encounter due to magical exclusion of cpp files that are included in other cpp files (presumably for include moc_foo.cpp support) - feature evaluation for Core, Gui, Network now happens in the qtbase/src directory, so that bundled libraries can be conditionally built - for each bundled library there are now two FindWrap scripts: - FindWrapSystemFoo which finds an installed library in the system - FindWrapFoo which either uses the system installed library or the built bundled one depending on a condition - projects that intend to use bundled libraries need to link against WrapFoo::WrapFoo instead of WrapSystemFoo::WrapSystemFoo targets (this is handled by pro2cmake). Unfortunately manually added qt_find_package(WrapFoo) calls might still be needed as is the case for WrapFreetype and others. - a new cmake/QtFindWrapHelper.cmake file is added that provides a macro to simplify creation of WrapFoo targets that link against a bundled or system library. The implementation is fairly ugly due to CMake macro constraints, but it was deemed better than copy-pasting a bunch of almost identical code across all FindWrapFoo.cmake files. - a qtzlib header-only module is now created when using bundled zlib, to provide public syncqt created headers for consumers that need them. These are projects that have 'QT_PRIVATE += zlib-private' in their .pro files (e.g. qtimageformats, qtlocation, qt3d, etc.) This is unfortunately needed due to QtNetwork using zlib types in its private C++ API. The change includes support for building the following bundled libraries: - zlib - libpng - libjpeg - Freetype - Harfbuzz-ng - PCRE2 The following 3rd party libraries are still using an old implementation within the CMake build system, and should be migrated to the new one in the near future: - double-conversion - Old harfbuzz The are a few libraries that are not yet ported: - system-sqlite - systemxcb - maybe others Among other things, this change allows building qtbase on Windows without requiring vcpkg. Task-number: QTBUG-82167 Change-Id: I35ecea0d832f66c1943c82e618de4a51440971a5 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io>
* Update bundled libpng to version 1.6.37Eirik Aavitsland2019-04-2916-145/+133
| | | | | | | | | The remaining diff to clean 1.6.37 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.37 Change-Id: I589bff09beec1977be8c6ca2a60aadf05f337f38 Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update bundled libpng to version 1.6.36André Klitzing2019-01-1628-639/+634
| | | | | | | | | | The remaining diff to clean 1.6.36 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.36 Change-Id: Ia9d20c5abca115d509ed0aaf9eebfc85a88bef1d Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Merge remote-tracking branch 'origin/5.12.0' into 5.12Liang Qi2018-11-161-1/+1
|\ | | | | | | Change-Id: Ic1dd39044e19f50e1068d4ac70dacaad6440e570
| * fix configure instructions in libpng and libjpeg attributionsOswald Buddenhagen2018-11-061-1/+1
| | | | | | | | | | | | Fixes: QTBUG-71379 Change-Id: Ib1efbe0fc4407ccf6ab814229dc4a08d9d03b6b5 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Fix build with -qt-libpng on powerpcAllan Sandfeld Jensen2018-11-021-1/+1
|/ | | | | | | | | It appears we are missing some setups for SIMD optimization, and already have a workaround for that for NEON, so do the same for VSX. Fixes: QTBUG-66388 Change-Id: I1cc1d0fe9c5a9df97acb589d29dec4dceb8fc576 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* Update bundled libpng to version 1.6.35Eirik Aavitsland2018-10-1227-1168/+1218
| | | | | | | | | | The remaining diff to clean 1.6.35 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.35 Change-Id: I925b3d95f6da20e12fc3274b4713e3fea05094f7 Reviewed-by: Kai Koehne <kai.koehne@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Update bundled libpng to version 1.6.34Eirik Aavitsland2017-11-0715-153/+161
| | | | | | | | | | | | | | This fixes an upstream bug in the existing version 1.6.32 which would cause certain valid png files to be rejected. The remaining diff to clean 1.6.34 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.34 Task-number: QTBUG-63950 Change-Id: Ie6f2a09c78a93b6e5623848776b75650bb5bca66 Reviewed-by: André Klitzing <aklitzing@gmail.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* Update bundled libpng to version 1.6.32André Klitzing2017-08-2625-245/+1212
| | | | | | | | | | Also add import script. The remaining diff to clean 1.6.32 is archived in the qtpatches.diff file. [ChangeLog][Third-Party Code] libpng was updated to version 1.6.32 Change-Id: I1b4b78e39a6eb098d1b66c2528e47544bd9e6713 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update bundled libpng to version 1.6.28André Klitzing2017-01-3128-1421/+2494
| | | | | | | | | | | | | Merged in the upstream version. The remaining diff to clean 1.6.28 is archived in the qtpatches.diff file. This fixes CVE-2016-10087 but Qt was never vulnerable to that issue! [ChangeLog][Third-Party Code] libpng was updated to version 1.6.28. Change-Id: I46712103fb160f31702eb7496fdd5c492a59ba5b Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* use helper libs via QMAKE_USEOswald Buddenhagen2016-10-151-1/+3
| | | | | | | | | | | | | | | | | | | | for that, qt_help_lib.prf gains the ability to write "external module pri" files that contain suitable information for QMAKE_USE. these files have a bunch of limitations: - they are not installed, because a) they are not relocatable and b) the helper libs' headers are not installed, either - it won't work with qmake -r, which is ok, as qt5 does not build with qmake -r anyway - deps are not transitive, neither at build nor at use time the freetype, harfbuzz-ng, pcre, and png helper libs have been adjusted accordingly, and their uses replaced with QMAKE_USE instances. this also allowed inlining the now trivial {harfbuzz,pcrc,png}_dependency.pri files. freetype_dependency.pri remains due to its funkiness. Change-Id: I16890eecb122e34ec49f3d3e68380d1ea71a198a Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* Add qt_attribution.json filesKai Koehne2016-08-121-0/+15
| | | | | | | | | | | | | | The format is documented in http://wiki.qt.io/Qt_attribution.json Also add a LICENSE file in case there is none yet (usually copied from the source headers). Task-number: QTBUG-55139 Change-Id: Ib54c73d0bb9946cfd8579e86c6858035184ca516 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* install the qtpng libraryOswald Buddenhagen2016-05-301-1/+2
| | | | | | | | it's used outside qtbase (by qtimageformats), so this is needed for modular builds to work. Change-Id: I3dffa76178502894bd063af366bd9a74be3b316a Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* build qt-png as a proper helper libraryOswald Buddenhagen2016-05-241-0/+30
| | | | | | | | it ends up in QtGui via two different routes (freetype and the png handler), and we really don't want to have two copies of it in there. Change-Id: I40760bcb6c615b90ed9f402450bb657c77884613 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Update bundled libpng to version 1.6.20Eirik Aavitsland2016-03-1618-134/+146
| | | | | | | | Merged in the upstream version. The remaining diff to clean 1.6.20 is archived in the qtpatches.diff file. Change-Id: I56f557bfe04ac1aa0e2c090826bbb144ae93cbb7 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Update bundled libpng to version 1.6.19Joerg Bornemann2015-12-1725-2120/+1612
| | | | | | | | | | Merged in the upstream version, which obsoleted some local patches. The remaining diff to clean 1.6.19 is archived in the qtpatches.diff file. Change-Id: I676df2dab2c52c7fe576de284d472d70206f0a8c Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
* Update bundled libpng to version 1.6.17Eirik Aavitsland2015-04-0929-8828/+17656
| | | | | | | | | Merged in the upstream version, which obsoleted many of the local patches. The remaining diff to clean 1.6.17 is archived in the qtpatches.diff file. Change-Id: I5065435dc5a922d3f4a46eb37a23a4877dde2ee6 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* libpng: Add Windows Phone to existing WinRT defineAndrew Knight2013-10-021-1/+1
| | | | | | | Treat Windows Phone as WinRT. Change-Id: I74e45a199629df3efaafa6acb05f991044f5c884 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* libpng: Add WinRT compatibilityKamil Trzciński2013-09-201-2/+5
| | | | | | | | | A _WINRT_ macro is added for Windows Runtime and a few codepaths are changed with it. Change-Id: I99ca5636d03c39b0a05b7f75f13522d012fdec07 Done-with: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Upgrading libpng: Patches to libpng 1.5.10 for Qt usageaavit2012-04-174-5/+19
| | | | | | | | | This is the collection of those earlier patches to libpng in Qt that are still relevant, updated as required. For details, refer to the git history of the src/3rdparty/libpng directory of Qt 4 and Qt 5/qtbase. Change-Id: Ia922441024536eec9b8ced8c3c5e4dc941ae152f Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Upgrading libpng: Adding clean copy of libpng 1.5.10aavit2012-04-1738-22763/+7982
| | | | | | | | | | | | | This commit removes the previous version of the bundled libpng (1.5.4), as well as all local modifications to it. It adds an unmodified copy of the official libpng source distribution, except that various extraneous files have been removed, as usual. The patches required to build it in Qt will follow in separate commit(s). Change-Id: I90149f87fc889c44a3b60b21cdf755020f3a8e39 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Remove Symbian specific code in 3rdparty.Xizhi Zhu2012-02-011-3/+1
| | | | | | | | | | | | | Symbian specific code in libtiff was added by commit 6ddf09085f1e8a3cc83c4ee0c77c433d26819c35 in Qt4, code in libpng was added by commit 66fb4038649cfd1d660204bf7c70f99a409ede4f in Qt4, so they are removed. Symbian specific code in freetype was copied from upstream, so kept untouched. Change-Id: I74f169d9283eefd91ec2e97cbd1b8f03dc449380 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* libpng config for WEC7Janne Anttila2012-01-131-1/+3
| | | | | | | | | WEC7 is missing some time conversion related functions -> configured libpng for WinCE accordingly. Task-number: QTBUG-22506 Change-Id: Ia4038aaf44944883be8f3e25817a638118c1a73d Reviewed-by: aavit <qt_aavit@ovi.com>
* Fixes: unwanted gcc export of symbols from bundled libpngaavit2011-11-161-7/+0
| | | | | | | | | This removes a change to libpng that was only relevant for building a certain Qt 4 tool in certain environements without system libpng. This is no longer relevant, so this kludge should now be removed. Change-Id: I9a04ab0224f9e84ccab3ec27762582be439fe3ef Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2741-0/+54903
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12