summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Blacklist vlc plugin5.4Allan Sandfeld Jensen2015-06-011-1/+2
| | | | | | | | The VLC plugin may load a plugins of its own that uses Qt4. Change-Id: I5229a360f7d08d024fb93df1a2993fd7c0176848 Task-number: QTBUG-45431 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Support MSVC 2015Allan Sandfeld Jensen2015-05-296-5/+9
| | | | | | | | | Fixes building qtwebkit with MSVC 2015 Change-Id: I94b085ab822b3cdfa911814467e051c11c93d79e Task-number: QTBUG-46344 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4.2' into 5.4Liang Qi2015-05-252-2/+39
|\ | | | | | | Change-Id: Iafbf406788fa3b89d01bc11c45c56727f058b189
| * Fix drawing of oversized accelerated layersv5.4.2Allan Sandfeld Jensen2015-05-212-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | Adds a special content layer that can used when we drop the backing store due to size, but still need to draw the content that would have been in the backing store. This fixes a regression introduced with the recent patch to prevent large backing stores. Change-Id: I9a61b3cc978bccdaa423c0d076e3aeaa7d9ebc99 Task-number: QTBUG-46178 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4.2' into 5.4Liang Qi2015-05-183-2/+63
|\| | | | | | | Change-Id: I5bacbd4ac254149e45003fea759855df598a2f36
| * Changes fileAllan Sandfeld Jensen2015-04-241-0/+54
| | | | | | | | | | | | Change-Id: Ic049b5a411c151b316f20e5528a8b46f82ba83e2 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Fix assertion on qt.ioAllan Sandfeld Jensen2015-04-241-0/+5
| | | | | | | | | | | | | | | | Our webkit examples all assert on resize due to qt.io trying to do an animation from an undefined value. Change-Id: I95aaee7834b2caba37e55f2cc09160af638a8d39 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
| * Fix crash when loading new doc after a single image docEirik Aavitsland2015-04-211-2/+4
| | | | | | | | | | | | | | | | Added a couple of nullpointer checks in image document cleanup. Task-number: QTBUG-42890 Change-Id: I533a517ed7402428afc3ae470398a64ed0b6a2a8 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Enforce no remote access from local URLs for XHRAllan Sandfeld Jensen2015-04-289-10/+48
| | | | | | | | | | | | | | | | | | | | Add a specific setting to disable remote access for local URLs and also enforce that on data-URLs loaded owned by local URLs. Change-Id: Ied8ec141eb1c28775644fce184a4759a79e1d177 Task-number: QTBUG-45556 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | SVG loaded through html <img> can't request to load any external resources.Said Abou-Hallawa2015-04-271-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=137762. Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2014-10-22 Reviewed by Daniel Bates. Source/WebCore: SVG images have unique security rules that prevent them from loading any external resources. This patch enforces these rules in CachedResourceLoader::canRequest for all non-data-uri resources. The fix and the tests are ported but modified a little from the chromium fix: http://src.chromium.org/viewvc/blink?view=rev&rev=176084 Test: http/tests/security/svg-image-with-cached-remote-image.html http/tests/security/svg-image-with-css-cross-domain.html For the SVG image, prevent loading any external sub-resource except for data urls. * loader/cache/CachedResourceLoader.cpp: (WebCore::CachedResourceLoader::canRequest): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@175074 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: Iec5014e81e25c37cc6754d7cc73645b17994974f Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Bump versionOswald Buddenhagen2015-04-201-1/+1
|/ | | | Change-Id: I1145f955b341ab5f64d72630a51d49bbf1b542aa
* Fix crash when exiting browser with WebGL or accelerated canvas.Yohan Chuzeville2015-04-131-0/+20
| | | | | | | | | | | | | | | Issue is that the TextureMapperGL creates a GraphicsContext3D using the current OpenGL context. This is done by storing a reference on QOpenGLContext::currentContext() inside GraphicsContext3DPrivate::GraphicsContext3DPrivate(). When exiting the browser, Qt releases QOpenGLContext before the release of the GraphicsContext3D in webkit which leads to a crash when destoying GraphicsContext3DPrivate. Task-number: QTBUG-45481 Change-Id: I2b9d7b1a96fbbe8517ea323d45ef3922ada208a3 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* DFG optimizes out strict mode arguments tear offFilip Pizlo2015-04-101-6/+11
| | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=119504 Source/JavaScriptCore: Reviewed by Mark Hahnenberg and Oliver Hunt. Don't do the optimization for strict mode. * dfg/DFGArgumentsSimplificationPhase.cpp: (JSC::DFG::ArgumentsSimplificationPhase::run): (JSC::DFG::ArgumentsSimplificationPhase::pruneObviousArgumentCreations): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154217 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I68037df21deaa964ff18c4f168f465c2600627f7 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix crash in JIT::DFG::prepareOSREntryJulien Brianceau2015-04-011-1/+1
| | | | | | | | | | While verifying predictions in prepareOSREntry, locals could lay outside the stack in some cases. So we shouldn't retrieve jsValue from locals when we don't have to. Task-number: QTBUG-45299 Change-Id: I70003170348887128e11360fb501b69647194172 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Avoid backing store for texturemapper layers over 8192x8192Allan Sandfeld Jensen2015-03-191-1/+1
| | | | | | | | | | | | | | We already block too large elements from getting a composited layer with backing store, but in the case where an already composited layer is resized above the size limit, it may have bad size until relayed out. This patch blocks the backing store of such a graphics layer from being instantiated. Change-Id: I03c1688c00c1f96fdaf7ef251ee285c05c072730 Task-number: QTBUG-44523 Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix URLs visited during private browsing showing up in WebpageIcons.db.Florian Bruhin2015-03-181-4/+4
| | | | | | | | | | | | | | Ported from http://trac.webkit.org/changeset/181565 by beidson@apple.com. Upstream patch by Sam Weinig, reviewed by Brady Eidson. * loader/icon/IconController.cpp: (WebCore::IconController::startLoader): Bail early here if the page is using an ephemeral session. (WebCore::IconController::continueLoadWithDecision): Instead of here. Change-Id: I263bb6122606caa3488d641b127dd377012ee424 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Set minimum DOMTimer interval to 4msAllan Sandfeld Jensen2015-03-181-0/+2
| | | | | | | | | | This changes the QtWebKitWidgets minimum DOMTimer precision to match that of QtWebKitQML (WebKit2) and other WebKit1 APIs. See also https://bugs.webkit.org/show_bug.cgi?id=61214 Change-Id: Id8ce7d217ed27396c8b14584f8c0c22a5df888cd Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix crash on exit in OpenGL accelerated modeAllan Sandfeld Jensen2015-03-171-15/+16
| | | | | | | Do not try to cleanup on an already destroyed OpenGL context. Change-Id: I56d2a07700b1f69100be7fc9537dd0bc69449a0c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Incorrect type speculation reported by ToPrimitiveOliver Hunt2015-03-111-4/+2
| | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=119458 Reviewed by Mark Hahnenberg. Make sure that we report the correct type possibilities for the output from ToPrimitive * dfg/DFGAbstractInterpreterInlines.h: (JSC::DFG::::executeEffects): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@153674 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I85d91598088ead350c89c4a9cc28a2bd866a2d22 Task-number: QTBUG-44912 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix g++ 5.0 buildAllan Sandfeld Jensen2015-03-061-0/+5
| | | | | | | | | | | A non-inline template needs to be explicitly instantiated if used outside the object where it is declared. Patch suggested by Khem Raj. Task-number: QTBUG-44829 Change-Id: Ib0adbd9273bd1cef01e5863bc8aaa9c373022792 Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Doc: Link issues Qt WebKitNico Vertriest2015-03-052-2/+2
| | | | | | | | Removed obsolete references QInputContext and QtDeclarative Task-number: QTBUG-43775 Change-Id: I308931beaec5ef2067350649135c26df1fe3817b Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix unsafe memory load/store from the argument encoder/decoder affecting ARMBenjamin Poulain2015-03-032-39/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=125674 Patch by Benjamin Poulain <bpoulain@apple.com> on 2013-12-12 Reviewed by Darin Adler. Depending on the CPU and CPU config, load and store may have to be aligned. The argument buffer has no particular alignment which can cause problems. In this case, on ARMv7, strd and ldrd can have alignment restriction on 16 bytes. The code encoding double and 64 bits integers was causing bugs. To avoid problems, the encoders/decoders are modified to just use memcpy. The compiler optimizes it away for the right instructions (clang uses two ldr/str in the case of 64bits values on ARMv7). * Platform/CoreIPC/ArgumentDecoder.cpp: (CoreIPC::decodeValueFromBuffer): (CoreIPC::ArgumentDecoder::decode): * Platform/CoreIPC/ArgumentEncoder.cpp: (CoreIPC::copyValueToBuffer): (CoreIPC::ArgumentEncoder::encode): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160529 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-44740 Change-Id: I9bd448cbfc524c62bdf4bfaad52fa194d8159726 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix build on x32 systemsDmitry Shachnev2015-03-021-1/+1
| | | | | | | | | | | | | On Linux x32 ABI, pointer size is different than on classic x86_64 systems, so the current assembly is wrong. To fix this, drop the quad qualifier and let the compiler infer the argument size. This way it will work on both x86_64 and x32. Done-with: Adam Borowski <kilobyte@angband.pl> Change-Id: I7a5f9edbba08705397ce7e771b1567f2a140fb1b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com>
* Fix building with glib 2.43+Allan Sandfeld Jensen2015-03-021-24/+24
| | | | | | | | | The newest version of glib have introduced their own GMutexLocker conflicting with the one defined in WebCore. Task-number: QTBUG-44714 Change-Id: Ibdd1646e129eaed84c65dc0d96bebe80f2a61f4b Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Fix JavaScript on ARMv7 in ARM-modeAllan Sandfeld Jensen2015-03-021-0/+3
| | | | | | | | | | | The gold linker does something wrong with the symbol looks that is used to generate assembler trampolines. Using the classic linker instead solves the issue. Task-number: QTBUG-44700 Change-Id: Ie3c1a903fb7facb31eeb9e0f75b70089dce27081 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
* Forward show and hide events to PluginViewsMichael Bruning2015-02-2611-6/+71
| | | | | | | | | | | | This was causing issues with windows plugins on windows, which were always visible on top of all other widgets and not hidden correctly when the owning web view was hidden. Task-number: QTBUG-44401 Task-number: QTBUG-42588 Task-number: QTBUG-43024 Change-Id: Ie0307fa2f7b2bf59f51a76db5feef2e8446c359d Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Initialize label vector lazilyAllan Sandfeld Jensen2015-02-251-1/+4
| | | | | | | | | | | | | | When parsing JSON temporary JIT objects are created when resolving each id. Each of these get a list of labels initialized to the size of the codeblock being operated on, which can be very long in some cases. This patch delays the initialization of the label vector, until it is actually used which is easy to figure out since the vector is not exported outside the class. Task-number: QTBUG-44475 Change-Id: I4fdbb7de7e7d953fffed39e38feed066edb6742b Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Don't do high-quality scaling on individual video framesAllan Sandfeld Jensen2015-02-241-1/+1
| | | | | | | | | Each frame of a video needs to be scaled fast, there is not time for high-quality scaling, and doing so will also blow our image scaling cache. Change-Id: Ibdd38ccffa273d0848aedcef19ffb2b4861c08a0 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix build with -no-rttiCorentin Jabot2015-02-241-0/+2
| | | | | | | WebCore was unable to build with -no-rtti since 82d8a5c8 Change-Id: I52dbd9b8db6c3b44ebad9e2518d89bdbe1430c3a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix crash on html5video.org by detecting inconsistent frame dataAllan Sandfeld Jensen2015-02-242-1/+5
| | | | | | | | | | | GStreamer is on this particular video sending us invalid dimensions that would leave us to operate on invalid addresses. We ignore that frame and print a warning to the log so the user might know their gstreamer plugin is dangerously broken. Task-number: QTBUG-44245 Change-Id: I476ec9822ff2f8210161a8642e16bbafb6786357 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Fix compile issue as it was missing the multimedia moduleAndy Shaw2015-02-191-0/+1
| | | | | Change-Id: I24f89215897b366fc7f21bf4a43e61337a17b596 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-181-0/+42
|\ | | | | | | Change-Id: I66595b1175fb4001524e79d63d8ca52c56010e4a
| * Add changes filev5.4.1Allan Sandfeld Jensen2015-02-161-0/+42
| | | | | | | | | | Change-Id: I3c4a11c22bbc451d27701e7c6321eb5a66fb3b23 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Merge remote-tracking branch 'origin/5.4.1' into 5.4Frederik Gladhorn2015-02-101-1/+1
|\| | | | | | | Change-Id: I39ebf7fb2c12b6afa986a20380cea309f0a1bbee
| * Fix memory leak in ImageDocumentAllan Sandfeld Jensen2015-01-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | An ImageLoader may hold a reference to its image element, and any element holds a guard on the document. To make the ImageLoader release the reference it needs to receive the notifyFinished() call, but that doesn't happen if the CachedResource is in the wrong state. The solution is to ensure we set the finish state on the resource before calling the method signifying loading is finished. Task-number: QTBUG-44023 Change-Id: I694483f6201b7ea4656016731e431f2806c3ab1c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* | Add documentation for feature permission related APIs.Florian Bruhin2015-01-221-0/+49
| | | | | | | | | | | | | | | | Those are mostly taken from QWebEnginePage's documentation with some slight adjustments. Change-Id: Ifbde5252cc46505c117a9d75ffa2af6e3b6eec11 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Editor actions should only be checked when page is editableAllan Sandfeld Jensen2015-01-201-5/+6
| | | | | | | | | | | | | | | | | | | | In the split of qt4 QWebPage the check for GUI level editor actions was incorrectly moved to being checked when the page is not editable instead of when it is editable Task-number: QTBUG-44019 Change-Id: I3776cec6ee05f27e43139e40cc18480905300888 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | Bump versionOswald Buddenhagen2015-01-161-1/+1
| | | | | | | | Change-Id: Id87a33dd022a42054d228f68e63d72cbb564d4eb
* | Avoid crash on root elements with display:noneAllan Sandfeld Jensen2015-01-161-1/+1
|/ | | | | | | | | | | We expect elements returned by hit-testing to have actual renderObjects, but that may not be the case if the root element is declared display:none, since the root element is always considered hit if nothing else is, and display: none elements have no renderObjects. Task-number: QTBUG-43882 Change-Id: I526615d401bf09b30e2b6994dcdad3b2373cef5a Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Check if OpenGL context is supportedAllan Sandfeld Jensen2015-01-151-6/+9
| | | | | | | | | | | Before the support for dynamic GL builds, the WebCore initialize OpenGL shims would check if the OpenGL version had all the necessary methods. After we removed this we now risk continuing with an OpenGL version that is not supported by WebCore and can cause crashes. Task-number: QTBUG-43831 Change-Id: I19caffc645ea5dede8b98408cbe0cae5fae8c22f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Allow 3D transforms without composited layersAllan Sandfeld Jensen2015-01-122-0/+16
| | | | | | | | | | | Qt has no problems doing static 3D transforms without composited layers, since the performance is not optimal we want to still trigger composited layers when available, but allowing this without can fix the rendering in the screenshot and printing API. Task-number: QTBUG-43106 Change-Id: I30869d0f86704b84369273d7c2b875ee22badf22 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Optimize HTML5 video painting on LinuxAllan Sandfeld Jensen2015-01-092-22/+15
| | | | | | | | | | | We were doing a needless inversion of image data, that gstreamer somehow detected and corrected for. The inversion can be safely removed and we can also avoid copying the image data by releasing the gstreamer buffer later like the cairo implementation does. Task-number: QTBUG-43520 Change-Id: I5910d5358d049abe3570dd5468e9e0bb56517639 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix build without OpenGLAllan Sandfeld Jensen2015-01-088-17/+25
| | | | | | | | | | The accelerated 2D canvas feature broke building without OpenGL due to missing feature checks. Task-number: QTBUG-43549 Change-Id: I7e62751d5237e1c600bc784539c70db50bccfa22 Reviewed-by: Ashish Kulkarni <kulkarni.ashish@gmail.com> Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* enable static compilation for WindowsAshish Kulkarni2015-01-081-1/+1
| | | | | | | | This is enabled only for MinGW and MSVC 2013, which have been tested for both 32 and 64-bit builds. Change-Id: Idced2887b4608bed4c086a4f8912251384eef5be Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix linker errors for the static Windows buildMilian Wolff2015-01-081-1/+1
| | | | | | | | | | | When creating a static QtWebKit on Windows, the define for STATICALLY_LINKED_WITH_$$library should always be set as otherwise there will be an attempt to import symbols, which should never be done and result in errors when linking the final output. Change-Id: I734e749f5da82de47a1d4b16563978496a0e72ee Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix build on MSVC with system libraries for zlib, libpng and libjpegAshish Kulkarni2015-01-081-3/+13
| | | | | | | | | | | | The definitions in qtbase were used as a source. zlib => qtbase/src/3rdparty/zlib_dependency.pri libpng => qtbase/src/gui/image/qpnghandler.pri libjpeg => qtbase/src/gui/image/qjpeghandler.pri Change-Id: I41529493d382d693311f3a2c1a2590bf1406baff Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix build on MSVC with --system-libpng or --system-libjpegAshish Kulkarni2015-01-082-8/+2
| | | | | | | | | | | | | | | | This was introduced in WebKit r108792, as in the related bug https://bugs.webkit.org/show_bug.cgi?id=32410#c26 it was confirmed as broken for Windows MSVC (for Chromium). The final merge made it conditional for PLATFORM(QT) but did not fix the underlying issue, which was the wrong placement of NO_RETURN as MSVC does not allow __declspec(noreturn) to be put after the declaration but GCC allows __attribute((__noreturn__)) at either location. This is similar with the usage of NO_RETURN in other places. Change-Id: I95ae3727553093b84b3645eb6dad63779f08e09d Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* WTF: fix build on Windows for static ICUAshish Kulkarni2015-01-081-1/+11
| | | | | | | | | The logic used was changed to be in sync with that used for the configuration tests. Change-Id: I8ba654c85487c19144431a94c2337caebac60447 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix detection of ICU when configuring for WindowsAshish Kulkarni2015-01-081-0/+1
| | | | | | | | | | When linking to the static ICU libraries, you need to link to advapi32.lib. This is not required in qtbase because the library is automatically added to QMAKE_LIBS_CORE, so we do the same here. Change-Id: I6d548790de4feae4b1d05ff27fb814e933f71839 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* fix detection of zlib when configuring for WindowsAshish Kulkarni2015-01-081-1/+8
| | | | | | | | | | This was synced with qtbase/src/3rdparty/zlib_dependency.pri which uses correct library name on Windows and allows it to be overridden via ZLIB_LIBS. Change-Id: Iec86caf202a0da51f9bb5a5e3d0c62eaed4050b7 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>