summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/zlib_dependency.pri
Commit message (Collapse)AuthorAgeFilesLines
* Support custom ZLIB library name(s)5.5Mike Gelfand2016-01-301-1/+4
| | | | | | | | This is already the case for qtbase and qtwebkit, while here only hard-coded "zdll.lib" was used on Windows. Change-Id: I6592ed8cfc667db58cb7ab65f97f00fc83e8e7d5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Replace win32-g++ with mingw scopeKai Koehne2014-02-071-2/+2
| | | | | | | | | | Commit 773dd01 in qtbase introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. (see 278152fff for a similar commit in qtbase). Change-Id: I90c319bdda6b710bce4d2d883736716a70760127 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* fix shadow build with -qt-zlib and pre-generated headersOswald Buddenhagen2013-07-301-1/+5
| | | | | | Task-number: QTBUG-32641 Change-Id: I4d0b4df50b652cf47e5f0b75b6d3c1f714414007 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix: include path to Qt zlibaavit2012-12-011-1/+1
| | | | | Change-Id: I8142a77d45007c69bfccc0d6d471205153e2de03 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Use the bundled zlib in QtCore, if present.aavit2012-11-291-6/+3
| | | | | | | Ref. Ie986f47e00fd0c16f2ba04d27f4258a20d61b260 Change-Id: I902cd52c2f08466cf6f42cc5e1813206e2051e95 Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix qmake syntax problem in zlib_dependency.pri.Christian Kandeler2012-09-111-1/+1
| | | | | | | | Without the double quotes, the apostrophe is considered an unmatched single quote by the pro file parser. Change-Id: Ibd1b38e2b714b0a99baf95c4e69fe87a0a962630 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Long live the qtimageformats moduleKent Hansen2012-01-251-0/+10
This module contains plugins for image formats that aren't part of the "core" (qtbase) offering, starting with mng. Task-number: QTBUG-21869 Change-Id: I85e51ed6f84c07419b1676f9def234c36f10141f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: aavit <qt_aavit@ovi.com>