summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes filev5.4.15.4.1Allan Sandfeld Jensen2015-02-161-0/+42
| | | | | Change-Id: I3c4a11c22bbc451d27701e7c6321eb5a66fb3b23 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* 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>
* 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>
* Calling WebCore::Page::setMediaVolume(0) does not mute videos as expected.Ada Chan2015-01-061-2/+1
| | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=137305 Reviewed by Darin Adler. This was broken in http://trac.webkit.org/changeset/154970. To fix this (but not break GStreamer), remove the "if (m_volumeInitialized)" check before updating the MediaPlayer's volume to the value multiplied with the Page's mediaVolume. This should not affect GStreamer's behavior because MediaPlayerPrivateGStreamerBase::setStreamVolumeElement does nothing unless m_volumeInitialized is true. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::updateVolume): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@175003 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-43479 Change-Id: I7f40dfc2535e2874d8c396051c488b7d92046919 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* [GStreamer] Video player sets system volume to 100%Xabier Rodriguez Calvar2015-01-064-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=118974 Reviewed by Philippe Normand. In order to preserve the system volume we need to keep track of the volume being initialized in the HTMLMediaElement and then just setting the volume to the sink when initializing the pipeline if that volume was changed before. * html/HTMLMediaElement.cpp: (WebCore::HTMLMediaElement::HTMLMediaElement): Initialized attribute to false. (WebCore::HTMLMediaElement::setVolume): Set the attribute to true when volume is changed. (WebCore::HTMLMediaElement::updateVolume): Set the volume only if volume was initialized. (WebCore::HTMLMediaElement::mediaPlayerPlatformVolumeConfigurationRequired): Platform volume configuration is required only if volume was not initialized before. * html/HTMLMediaElement.h: Added attribute and interface method. * platform/graphics/MediaPlayer.h: (WebCore::MediaPlayerClient::mediaPlayerPlatformVolumeConfigurationRequired): Declared and added default implementation for the interface method. (WebCore::MediaPlayer::platformVolumeConfigurationRequired): Asked the client, meaning the HTMLMediaElement if the platform volume configuration is required. * platform/graphics/gstreamer/MediaPlayerPrivateGStreamerBase.cpp: (WebCore::mediaPlayerPrivateVolumeChangedCallback): Added log. (WebCore::MediaPlayerPrivateGStreamerBase::setVolume): Added log. (WebCore::MediaPlayerPrivateGStreamerBase::setStreamVolumeElement): Set the volume only if not platform volume is required and added log. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154970 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-43479 Task-number: QTBUG-34896 Change-Id: I4031b33e52e2299b03a5844770dc17c69822059c Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>
* Support MSIE compatible pasteboard typesAllan Sandfeld Jensen2015-01-061-6/+23
| | | | | | | | | | Treat 'Text' pasteboard type as 'text/plain' matching Apple and GTK webkit ports and the whatwg spec. Task-number: QTBUG-43149 Change-Id: Iac491fd15f1e9e8539daabf30a61e64921c82222 Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-12-172-1/+58
|\ | | | | | | Change-Id: I59ea5b32871dba99276a7e3d9fe5ae8c8487a0d3
| * Added changes filev5.4.05.4.0Allan Sandfeld Jensen2014-12-021-0/+56
| | | | | | | | | | | | Change-Id: Ia8e0ad300b4651746a7741d0482587cbcd2f891c Reviewed-by: Florian Bruhin <qt-project.org@the-compiler.org> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Fix disabling of aliasing for all gcc alike compilersSimon Hausmann2014-11-291-1/+2
| | | | | | | | | | | | | | | | | | | | Don't rely on the makespec to contain g++ in its name, instead use QMAKE_COMPILER, which gets added to CONFIG. Fixes crashes on QNX. Change-Id: If8d2a6a7aa9998b311b2ca137af2fa236adecb00 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Bump versionOswald Buddenhagen2014-12-121-1/+1
| | | | | | | | Change-Id: I211ab7d1aa8361bc225c010c515a65607e1dfd8c
* | Remove double quotation from $preprocessorStephan Binner2014-12-121-0/+3
| | | | | | | | | | Change-Id: I975dda0df62b61ae82d0a0f58f8446c7513b507e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Do not set the mainframe graphicslayer to being opaque when it isn'tAllan Sandfeld Jensen2014-12-081-1/+2
| | | | | | | | | | | | | | | | | | | | If the frameview has a transparent background we need to tell the GraphicsLayer that it is not opaque otherwise the TextureMapperGL might choose not to use blend. Task-number: QTBUG-40063 Change-Id: If129305fed8620cd3c28cec5357625d8892ad063 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Remove unnecessary \inqmlmodule parameterAlejandro Exojo2014-12-081-1/+1
| | | | | | | | | | Change-Id: Ib63865b4205ffc6bb8dbfb1f8c8e607cc29c1364 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Make QtWebKit configure report the right configurationAllan Sandfeld Jensen2014-12-041-4/+3
| | | | | | | | | | | | | | | | | | | | Debug and release configurations are mutually exclusive, so only the last one defines the configuration. QtWebKit was however reporting both if both were set producing confusion output. Change-Id: If26e4ee02c922fbb880197379c6967c85746b482 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Disable the animation so the style renders buttons correctlyAndy Shaw2014-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | Previously just the style was checked to see if it was one that supported animations on buttons. However when a stylesheet is used then it would not correctly be picked up. Therefore the animations are disabled directly using the property available on the styleObject. Task-number: QTBUG-39400 Change-Id: I99c205bf61d98f9bfefc8c9c6f9806d3d068abc4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Do not use gold linker with stabs debug formatAllan Sandfeld Jensen2014-12-031-0/+2
| | | | | | | | | | | | | | | | | | The gold linker and stabs format interact badly, negating not only the memory pressure savings intended with stabs but producing much larger debug binaries. Change-Id: Ic2af8dbcc274ae84e4d5fbe474138e4dc5f96f56 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix documentation for QWebPage::scrollRequested signal.Florian Bruhin2014-12-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | The documentation says the scrollRequested signal will be emitted if no view was set, however the signal gets emitted unconditionally. This behavior was changed in https://bugs.webkit.org/show_bug.cgi?id=21790 Change-Id: I3d6df9935fc5d6efb14bc956c43c03b655f9a2ad Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | Fix build failure with python3Samuel Martin2014-11-261-1/+1
| | | | | | | | | | | | Task-number: QTBUG-33692 Change-Id: I9f0bd6411e42b7ca06710dd47e3bcae4d2605c81 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | 100% cpu usage for "transition: opacity" animationLuciano Wolf2014-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=120012 Reviewed by Noam Rosenthal. Schedule animation timer after scheduling a layer flush. This way it won't overwrite animation timer with "0", thus avoiding 100% cpu usage. * WebProcess/WebPage/CoordinatedGraphics/CoordinatedLayerTreeHost.cpp: (WebKit::CoordinatedLayerTreeHost::scheduleAnimation): Change-Id: Ia423bb1a8cb5da8f29aaa489c8023744d43119f2 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@154711 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Merge remote-tracking branch 'origin/5.4.0' into 5.4Frederik Gladhorn2014-11-212-7/+13
|\ \ | |/ | | | | Change-Id: I3df74c8b47ff6e3d668f8b2126e6145670327d73
| * Clear a stray ref on layers when purging GL resourcesv5.4.0-rc1Jocelyn Turcotte2014-11-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix a regression of 3df57f7e550a19cb4450ed3896aa51ddb38c2ed2 where a reference to TextureMapperBackingStore would be kept in the TextureMapperLayers after purgeGLResources(). This would crash later on if the window would get destroyed before the CoordinatedGraphicsScene that own those layers. Task-number: QTBUG-40734 Change-Id: Id1a596c0f0ba9afd1e163f83c38dda939f521314 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| * Do not force a direction before we know itAllan Sandfeld Jensen2014-11-131-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore does not calculate the text direction when calculating widths the best we can do here is let the shaper guess the direction. Forcing it to the default LTR breaks HarfbuzzNG on Arabic scripts. Since the default HarfBuzz engine changed in 5.4, this was a regression from 5.3. See also https://bugs.webkit.org/show_bug.cgi?id=101440 Task-number: QTBUG-41450 Change-Id: Ia324c8e5ebd1744ce2dfaea94d5046ef1f77b483 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | Avoid crashing when applying CSS to disconnected scrollbarsAllan Sandfeld Jensen2014-11-191-1/+1
| | | | | | | | | | | | | | | | | | Assume the scrollbar has no scroll corner if it isn't attached to any scrollable area. Task-number: QTBUG-37679 Change-Id: Ib1bd2a4b1aa504885d52932b6c0fbd76daa356a5 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Support DELETE requests with a bodyAllan Sandfeld Jensen2014-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | While non-standard, other browsers allow DELETE requests to send a body in the HTTP request. Since there is no specific API for delete requests with a body in QNetworkAccessManager, we use custom HTTP request for this. Task-number: QTBUG-42456 Change-Id: I01a055ea173b5a65086f97d0c6ef14a9e01141b3 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix build of WebKitTestRunner with Qt 5.4Allan Sandfeld Jensen2014-11-181-4/+0
| | | | | | | | | | | | | | | | We don't need the include prefix and its inclusion doesn't work with our build model, it is unclear how this ever worked. Change-Id: Ia56715254761e2c86a167cee70e42e076b128674 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix race-condition crash on leaving pages using Indexed DBAllan Sandfeld Jensen2014-11-182-1/+16
| | | | | | | | | | | | | | | | | | | | ScriptExecutionContext does not allow the list of active DOM objects to change while it is iterating over it. Since the IDB transaction backend implementations holds several active DOM objects it should not delete itself while aborting. Change-Id: Icd2f5b5a3f1957461b9a253d1005896bb2461466 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Don't fill with invalid fill colorAllan Sandfeld Jensen2014-11-181-0/+6
| | | | | | | | | | | | | | | | WebInspector may set a default invalid fill color to disable fill, we shouldn't fill with black in this case. Change-Id: Ida1eaf187aca7fbca27449a9829c452f99634558 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Avoid using a separate QOpenGLContext for 2D canvas if possibleSamuel Rødal2014-11-142-22/+30
|/ | | | | | | | | | | | | | | | | | | | | When using a QGLWidget or QOpenGLWidget as a QGraphicsView viewport, we can share the context used there. The OpenGL paint engines already keep track of which engine is currently active on a context, and if necessary do a state sync to give control to a different paint engine. The TextureMapperGL does not interfere with the canvas rendering, as canvas rendering happens entirely separate from the compositing step. TextureMapperGL's compositing code is also wrapped inside a QPainter::beginNativePainting() and QPainter::endNativePainting() block, which means that the paint engine gets a chance to ensure the correct paint device is the active target, if there have been framebuffer objects bound for canvas rendering since the last frame. This can result in significant performance improvements on graphics drivers where context switching is expensive. Change-Id: I00ac4e26c026e10549b18bef1fdf4322dd17eeee Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Use fixed executable allocator on x64Allan Sandfeld Jensen2014-11-072-10/+2
| | | | | | | | | | | Since the x86-64 assembler generator depends on jumps being expressable as 32bit offsets we need to use the fixed size executable allocator and not the on demand allocator. This patch removes its exclusion from being used on Windows. Task-number: QTBUG-42417 Change-Id: Ie6b127e9b4291869566fd99cc7efe05b566c8e66 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix selections after leave eventAllan Sandfeld Jensen2014-11-063-1/+12
| | | | | | | | | | | | We were sending a bad fake mouse event on leave events that caused WebCore to stop tracking mousepresses correctly. Since we continue to receive mouse-events after leave if a mouse button is down, we don't need the fake mouse event to unset hover states and can skip, and can skip sending it. Task-number: QTBUG-41419 Change-Id: I8d50c440f7556f7e34bb0c05248577583c2550b4 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fixed upside down drawing of accelerated 2d canvasSamuel Rødal2014-11-041-2/+10
| | | | | | | | | | | The convention used by the Qt OpenGL paint engine's internal drawTexture() function didn't match the texture layout of the accelerated 2D canvas. We need to adjust the coordinates according to whether flipped painting is in effect. Task-number: QTBUG-42376 Change-Id: I787a2deb5f26df532f2e7c475754f0fd2189132c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fixed self-drawing of 2D canvas with accelerated 2D canvas enabled.Samuel Rødal2014-11-043-7/+34
| | | | | | | | | | | | | | | The canvas 2D API allows drawing the canvas onto itself, however with accelerated 2D canvas enabled the canvas is implemented in terms of rendering to a texture using framebuffer objects. OpenGL does not allow having the same texture be both a source and a destination in the same rendering operation, so the results are undefined. Instead, we need to blit the texture into a temporary framebuffer object, before using that as the source of the final drawing operation. Task-number: QTBUG-42275 Change-Id: I8114814dab2c8c6ca90b8d35a37b383b79923cb3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fixed crash in QGraphicsWebView when clicking on linksSamuel Rødal2014-11-031-3/+1
| | | | | | | | | | | The mouse event passed to this function is allocated on the stack, so we can't delete it. Also, it doesn't make sense to allocate a new one which immediately gets leaked. The intent must have been to use the ev parameter as a return parameter - that's what it looks like on the caller side. Change-Id: I023cd7895a278eada4ad4acd233741aff837fed6 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* Fix build of leveldb with old Qt versionsAllan Sandfeld Jensen2014-11-032-4/+10
| | | | | | | | Applies a missing patch to leveldb that fixed building with older Qt versions. Change-Id: Ie894127d265140cbb8524e271e5779c92ab8e393 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix merge errorAllan Sandfeld Jensen2014-11-031-2/+2
| | | | | | | | | | The change 4a39158368f6184c8d56e1d65866ba99f83297e0 merged a part of the diff for prepend to append. This patch moves the wrongly merged line. Task-number: QTBUG-40284 Change-Id: I32d1b2f8e730aca38964d3675d3dec94512e0026 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into 5.4" into refs/staging/5.4Allan Sandfeld Jensen2014-10-311-0/+1
|\
| * Merge remote-tracking branch 'origin/5.3' into 5.4Oswald Buddenhagen2014-10-311-0/+1
| |\ | | | | | | | | | Change-Id: I11f35f205d2ded597d54650a948bec3e1e52b419
| | * Fix assert after makerope boundary check5.3Lucas Forschler2014-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The browser demo asserts on qt-project.org after the makerope security fix. Port of http://trac.webkit.org/changeset/169397 Change-Id: I19c98737735d9b17133742752928d4ce6349de13 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | | avoid creation of empty qmltypes for qtquick1Fawzi Mohamed2014-10-311-7/+8
| | | | | | | | | | | | | | | | | | Change-Id: Ic28043a94151d3878219e5808075ce6ae663c316 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
* | | Add mappings from new Qt key values to key identifiersAllan Sandfeld Jensen2014-10-311-4/+14
|/ / | | | | | | | | Change-Id: Iab57bbe15c6fd4d33dfe6e36cd0bd01ca6644841 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
View Lorry Controller Status