summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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.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>
* | Do not send focus event to missing plugins on OS XAllan Sandfeld Jensen2014-10-301-0/+3
| | | | | | | | | | | | | | | | | | Fix a crash when trying to focus a pluginview that doesn't have a loaded plugin. Task-number: QTBUG-40273 Change-Id: I0875cab81a3484094fc705d59df80b87ca83a9ff Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | Do not use unaligned access when disabledAllan Sandfeld Jensen2014-10-303-9/+13
| | | | | | | | | | | | | | | | | | | | Use the GCC feature defines to check for support for ARMv6 style unaligned access support. This fixes configurations where it was disabled and the ARMv6-M processors where it is not supported. Change-Id: I00c9bb19ba582b64ecb9eaa6da9887ba0df8fd3c Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix preloading of video when using QtMultimedia backend.Michael Brüning2014-10-302-5/+15
| | | | | | | | | | | | | | | | Based on a patch by Yoann Lopes (yoann.lopes@theqtcompany.com). Task-number: QTBUG-37381 Change-Id: I8647c578399a592f8feef0d4028187afd3726b2d Reviewed-by: Yoann Lopes <yoann.lopes@theqtcompany.com>
* | LLInt is not built with ARM softfp ABIAllan Sandfeld Jensen2014-10-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | In fixing QTBUG-35681 we disabled LLInt when hard fp is not set. This is however too strong a condition as we only need to be allowed to use floating point instructions, not use the hard floating point ABI. LLInt is also disabled on Android because it currently doesn't build. Task-number: QTBUG-35681 Change-Id: Ibe109b0f8fe6acaec90d42305c6151a440141ea9 Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | Use INLINE_ARM_FUNCTION in OFFLINE_ASM_GLOBAL_LABELAllan Sandfeld Jensen2014-10-241-9/+1
| | | | | | | | | | | | | | | | | | | | We can get rid of an ifdef in LowLevelInterpreter by reusing logic from InlineAsm.h. This also fixes ARM_TRADITIONAL when forced on when thumb2 is available to the compiler. Change-Id: Iac5ad22a4a41757fa03c3cbc2e8f68e44d085bae Reviewed-by: Julien Brianceau <jbriance@cisco.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | Do not use floating point instructions in float-abi=softAllan Sandfeld Jensen2014-10-231-0/+4
| | | | | | | | | | | | | | | | | | Pretend VFP doesn't exist when the ABI forbids floating point instructions. Task-number: QTBUG-38371 Change-Id: Id0552201e6bf98812198c0028e2c85107e967a81 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | Do not enumerate plugins when plugins are disabledJan Kundrát2014-10-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even if plugins were disabled through QWebSettings::PluginsEnabled, WebKit would still enumerate the on-disk NPAPI plugins and attempt to load them. This caused all sorts of havoc especially when loading plugins linked to Qt4. Even if that wasn't the case, plugins should *not* be loaded unless there's a compelling reason to do so. Loading plugins needlessly takes time and it might even have security implications -- it sounds like a good practice to not execute random code, even though it comes from trusted locations, when that code is not needed. After this change, the code still passes the tst_qwebpage tests which are related to plugin loading. As it turns out, the "QtWebKit application plugins" (application/x-qt-plugin and application/x-qt-styled-widget) do not use this code path at all, they instead go through a path like this one: #0 PluginPage::createPlugin ... #1 QWebPagePrivate::createPlugin ... #2 WebCore::FrameLoaderClientQt::createPlugin ... #3 WebCore::SubframeLoader::loadPlugin ... #4 WebCore::SubframeLoader::requestPlugin ... #5 WebCore::SubframeLoader::requestObject ... #6 WebCore::HTMLObjectElement::updateWidget ... #7 WebCore::HTMLPlugInImageElement::updateWidgetIfNecessary ... #8 WebCore::HTMLPlugInImageElement::updateWidgetCallback ... #9 WebCore::ContainerNode::dispatchPostAttachCallbacks ... #10 WebCore::ContainerNode::resumePostAttachCallbacks ... #11 WebCore::PostAttachCallbackDisabler::~PostAttachCallbackDisabler ... #12 WebCore::Document::recalcStyle ... #13 WebCore::Document::updateStyleIfNeeded ... #14 WebCore::Document::finishedParsing ... #15 WebCore::HTMLConstructionSite::finishedParsing ... #16 WebCore::HTMLTreeBuilder::finished ... #17 WebCore::HTMLDocumentParser::end ... #18 WebCore::HTMLDocumentParser::attemptToRunDeferredScriptsAndEnd ... #19 WebCore::HTMLDocumentParser::prepareToStopParsing ... #20 WebCore::HTMLDocumentParser::attemptToEnd ... #21 WebCore::HTMLDocumentParser::finish ... #22 WebCore::DocumentWriter::end ... #23 WebCore::DocumentLoader::finishedLoading ... Task-number: QTBUG-36349 Change-Id: Id8f37fb16bb295781c22f439fd54a65486deef8e Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Disable the build on Windows RT / Windows PhoneSimon Hausmann2014-10-231-0/+1
| | | | | | | | | | | | Change-Id: I594737c60ed2d4c08de662b8ca534e5abbbffd60 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com> Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | Do not schedule navigation to invalid URLAllan Sandfeld Jensen2014-10-221-1/+1
| | | | | | | | | | | | | | | | | | | | Fix an assert triggered by navigation to a fragment URL of an unset URL. The code was assuming the string given was a valid encoded URL, so we shouldn't continue if the completed URL is invalid. Task-number: QTBUG-38546 Change-Id: I377b09814150ae9926de95efe3f3e2e750145c4a Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | [Windows] Also check for QApplication::style when animating buttons.Michael Brüning2014-10-211-1/+1
| | | | | | | | | | | | | | | | | | | | The fallback style for a custom style sheet is QApplication::style(), which defaults to QWindowsVistaStyle on most (if not all) windows systems. Task-number: QTBUG-39400 Change-Id: Ib05571033730ed26a39f89d8e9fe948c4b280e64 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Pop pack pragma on x86 QNXAllan Sandfeld Jensen2014-10-211-3/+3
| | | | | | | | | | | | | | A recent patch fixing QNX on x86 forgot to also pop the pragma it set. Change-Id: I9834c0b57a4409e8e80c29899e6f3989607fe22f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Remove QtScript includesAllan Sandfeld Jensen2014-10-161-2/+1
| | | | | | | | | | | | | | Remove QtScript includes that haven't been usedin years. Change-Id: Iea2b61a6ad2ea187055daff783ce9f0280477767 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* | Fix Qt 5.3 backward compatible buildAllan Sandfeld Jensen2014-10-164-6/+29
| | | | | | | | | | | | | | | | | | | | The accelerated canvas and dynamic GL support used Qt 5.4 specific features. These can be avoided by disabling one webgl extension and being less efficient in accelerated canvas, thereby making it possible to still build QtWebKit with Qt 5.3. Change-Id: Ic64f7f5ac6b836b314331c4d509e4d64cb0dcb7c Reviewed-by: Michael Bruning <michael.bruning@digia.com>