summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [mips] Wrong register usage in LLInt.old/5.2Balazs Kilvady2014-02-102-52/+115
| | | | | | | | | | | Fix register usage and add PIC header to all LLInt operations. This patch is taken from https://bugs.webkit.org/show_bug.cgi?id=125168. It fixes the crash of fast/js/exception-propagate-from-dfg-to-llint test on mips architecture. Change-Id: I98ad3b5766451cab48a76f7e028b210f9ebe99ed Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Fix build with QT_NO_GRAPHICSVIEWSergio Martins2014-02-092-0/+6
| | | | | Change-Id: Ia909a560db58d6cdc6ec4bbac879249eb5e286ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Update device pixel ratio on screen changeAllan Sandfeld Jensen2014-02-075-6/+40
| | | | | | | | | This patch makes QWebPage listen to QWindow::screenChangedEvent and update the device pixel ratio when it is received. Task-number: QTBUG-36190 Change-Id: Ia28571ef241a3a2f970876f6e474b01c1ac001e1 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix memory leaks in platform/image-encoders/JPEGImageEncoder.cppLiangjun Zeng2014-02-071-1/+4
| | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=118781 Reviewed by Brent Fulgham. We can find the function "jpeg_finish_compress" call the function "jpeg_abort" at the end. And the comments of "jpeg_abort" is "Abort processing of a JPEG compression operation, but don't destroy the object itself". (We can find these in the "jcapimin.c" of jpeg) So the compression object destroy need be called. No new tests because this doesn't change functionality. * platform/image-encoders/JPEGImageEncoder.cpp: (WebCore::compressRGBABigEndianToJPEG): Change-Id: Ic58b53c4e6bada7e92e09825be9e770f1c5445c1 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@158280 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* 8 bytes memory leaks in WebProcessMainQt.cpp when proxy is initializedMinju Kim2014-02-071-2/+2
| | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=118515 Patch by Minju Kim <pmuarteo@gmail.com> on 2013-09-25 Reviewed by Christophe Dumez. * WebProcess/qt/WebProcessMainQt.cpp: (WebKit::initializeProxy): Handled EnvHttpProxyFactory by using OwnPtr to avoid memory leak when it isn't handled by NetworkProxyFactory Change-Id: I51833871d8e11441ffe60d51629814e64f77d792 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@156449 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* TextureMapperGL must take hiDPI transform into accountAllan Sandfeld Jensen2014-02-061-1/+10
| | | | | | | | | | Since TextureMapperGL does its own native rendering it must itself apply the all transforms QPainter would normally do behind the scenes. Task-number: QTBUG-36508 Change-Id: Id4a0ee64ff7ac5c5cb51e45ffd2e4e25ed7fce74 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix transform of accelerated layers on hiDPI paintersAllan Sandfeld Jensen2014-02-011-3/+5
| | | | | | | | | | | A mismatch of reading combinedTransform but setting worldTransform means that the pattern of only storing and restoring the transform when temporarily overriding it, causes the hiDPI transform that combinedTransform contains to be applied multiple times. Task-number: QTBUG-36508 Change-Id: I512f0752016f55935595ef259913660b4ee78ae7 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix assert in m_stack.isEmpty() in GraphicsContext::~GraphicsContext()Allan Sandfeld Jensen2014-01-312-1/+10
| | | | | | | | | | | | | Save and restore is not balanced in GraphicsContext. This causes the log error "ERROR void GraphicsContext::restore() stack is empty" and assert in the GraphicsContext destructor. The cause is a mismatch of GraphicsContexts being saved and restored by TextureMapperImageBuffer beginClip and endClip. This patch fixes endClip to restore the currentContext beginClip saved. Change-Id: Ief0100dd26c7eded04734167e86712a81f1a7674 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix assert in BitmapTextureImageBuffer::applyFilters()Allan Sandfeld Jensen2014-01-311-2/+3
| | | | | | | | | | | While WebCore should not give a BitmapTextureImageBuffer any filters applyFilters() will still be called with an empty list of filters. We should therefore not assert that applyFilters is never called by that is only ever called with an empty list of filters to apply. Change-Id: Ic24b735f1fc92e2a57c7ef068a8c7d712f0fc31f Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Fix RenderGeometryMap.cpp ASSERT on Google PlusAllan Sandfeld Jensen2014-01-311-1/+1
| | | | | | | | | | | | | | The assert roundedIntPoint(result) == roundedIntPoint(rendererMappedResult) is triggered on Google Plus. The cause appears to be premature rounding leading a wrong result. The fix is a to remove the early rounding. This follows a similar fix in upstream WebKit r142638 where the same problem was fixed for the other mapToContainer method. Change-Id: Ifae91c204f2043b3f07682dc7bed711a6cb38c91 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Don't pollute .prl & .pc files with private dependenciesJocelyn Turcotte2014-01-312-2/+3
| | | | | | | | | | | | Also change the creating_module check in needToLink to make sure that only the main module will try to link directly with the WebCore and JavaScriptCore static libraries. Task-number: QTBUG-35774 Initial-patch-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Change-Id: Ib5992e112803679837249400e98cb8c22636096d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Apply device pixel ratio to transparency layersAllan Sandfeld Jensen2014-01-311-2/+4
| | | | | | | | | | | | The transparency layers are currently created with taking hiDPI into account. This means that any CSS opacity causes a shift in rendering quality. This patch forwards the device pixelratio for any QPaintDevice to transparency layers created for that device. Change-Id: Ie65f76771a4cc59bc714a9b89511cab1f7617abc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Forward devicePixelRatio to WebCore PageAllan Sandfeld Jensen2014-01-313-0/+7
| | | | | | | | | The device pixel ratio must be set on Page for CSS image set and CSS media queries to work correctly. Task-number: QTBUG-36190 Change-Id: I76694c1375194f35df7f62e942bc8565f065a3bc Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Do not notifyFinished on resources never loadedAllan Sandfeld Jensen2014-01-301-1/+1
| | | | | | | | | | | | If autoload images is disabled, the CachedImage element never starts loading but still needs loading. We therefore need to check both isLoading() and stillNeedsLoad() to determine if loading is complete. This fixes a serious memory leak when autoload images is disabled. Task-number: QTBUG-34494 Change-Id: I36811179d95e23651fabe484fbde08e2881d822b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Make sure the correct position for the plugin is used when showingAndy Shaw2014-01-241-3/+4
| | | | | | | | | | | | | | When the plugin was windowed then it was always being shown at 0x0 of the containing window rather than the correct position of the plugin inside the containing window. This enesures it is placed correctly in that case. Task-number: QTBUG-31730 QTBUG-33053 QTBUG-32546 Change-Id: I5ce0321924d288437d483002e9cb6dd1c98b6863 Reviewed-by: Michael Bruning <michael.bruning@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2014-01-221-6/+23
|\ | | | | | | Change-Id: I82f158687d0b5da3e85c025d720111b6b1414010
| * Reduce memory footprint when linkingv5.2.1Allan Sandfeld Jensen2014-01-161-6/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Linking QtWebKit on Linux x64 with debug symbols can use up to 11Gbyte of memory. This can make it impossible to link on many systems. This patch forces GCC 4.8+ to fully use DWARF-4 debug-types sections to eleminate duplicate symbols and makes earlier GCC versions STABS which also uses much less memory. Task-number: QTBUG-36131 Change-Id: Ib1ba3e073b5984ead3a0badb935e7b89c01b962b Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | | | | | | | | Change-Id: Ic00000a7fe9f261301096ac25aade719f2656201 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Ensure that cursor rectangle is always valid.Luca Ottaviano2014-01-151-1/+13
|/ | | | | | | | | | | | | | | | | | The cursor rectangle is given an invalid size when the user clicks on an input field; the reported size is 0 pixel wide. The cursor is then converted to a QRect, which is invalid if rectangle width is 0. This can interefere with input methods that check for cursorRect validity before reporting a cursorRect change. Make sure that a cursor rectangle with at least one valid dimension becomes a valid QRect. Task-number: QTBUG-35996 Change-Id: I4026f1136cfb006efc5d7915f0f10c1b5187c730 Signed-off-by: Luca Ottaviano <lottaviano@develer.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Check also for mingw-g++-xxx specsKai Koehne2014-01-081-1/+1
| | | | | | | | Some packagers/distributions have individual mingw-g++ mkspecs, e.g. for cross-compiling. Change-Id: I5deb2d543934b16c4df63cd8ec240e6ec9b64d9b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Reapply mouse event handling in QQuickWebViewFlickablePrivate.Michael Brüning2014-01-072-0/+6
| | | | | | | | | | | | This reapplies commit 0b789c6a785d5ef45c3f6f2fc0f8694772b3d392, which had been in Qt 5.0.x and 5.1.x, but was not upstreamed and hence overwritten when importing the new snapshot. This basically reverts http://trac.webkit.org/changeset/136119. Task-number: QTBUG-35097 Change-Id: I3e02c3feeb5193c0c06b7525469e208de1d6cafc Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [Qt] Re-enable plugins on Mac.Jocelyn Turcotte2014-01-039-15/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://bugs.webkit.org/show_bug.cgi?id=116622 Reviewed by Tor Arne Vestbø. Source/WebCore: * platform/FileSystem.h: * platform/qt/FileSystemQt.cpp: (WebCore::unloadModule): - Q_WS_* aren't defined since Qt5, use Q_OS_MACX instead. * plugins/mac/PluginPackageMac.cpp: (WebCore::PluginPackage::fetchInfo): (WebCore::PluginPackage::load): - createCFString now does the adoption itself. * plugins/mac/PluginViewMac.mm: - Add missing include. Source/WebKit/qt: * WebCoreSupport/ChromeClientQt.cpp: (WebCore::ChromeClientQt::windowResizerRect): - Add missing parenthese. Tools: Plugins on Mac were only enabled if !embedded but the later was set if QPA is enabled, which is the default since Qt 5.0. Remove references to 'embedded' and fix various build issues, PluginViewMac.mm and PluginPackageMac.cpp haven't been compiled since a few months. * DumpRenderTree/qt/TestNetscapePlugin/TestNetscapePlugin.pro: * qmake/mkspecs/features/features.prf: * qmake/mkspecs/features/unix/default_pre.prf: Task-number: QTBUG-35899 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@151109 268f45cc-cd09-0410-ab3c-d52691b4dbfc Change-Id: I49692a234a66c205099c5dde8eb24ffb6eadba0f Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Use pkg-config to build against ICUAllan Sandfeld Jensen2014-01-031-0/+1
| | | | | | | | | To get the correct combination of ICU includes and libraries we should use the system information available in pkg-config. Without this we might get build errors on some Linux distributions. Change-Id: I0e803e914467312c8ae586d41e08d1fda2b510b6 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Remove dependency v8-privateAllan Sandfeld Jensen2014-01-021-1/+1
| | | | | | | | When building the WebKit2 tests we still try to link against v8-private, which no longer exists. Change-Id: I4848cb62ce696e941947930fb099d23a7ce0b27e Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Extend disabling of whole-program-optimizations to MSVC 2013Allan Sandfeld Jensen2014-01-021-1/+1
| | | | | | | | | Building with whole-program-optimizations remains a problem with MSVC 2013, so we must continue to disable it. Task-number: QTBUG-35835 Change-Id: Ic3131495ce0ce323ad041e51332969cc01b741c5 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* ASSERTION FAILED: m_repaintRect == ↵simon.fraser@apple.com2014-01-022-15/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | renderer().clippedOverflowRectForRepaint(renderer().containerForRepaint()) after r135816 https://bugs.webkit.org/show_bug.cgi?id=103432 Reviewed by Dave Hyatt. RenderLayer caches repaint rects in m_repaintRect, and on updating layer positions after scrolling, asserts that the cached rect is correct. However, this assertion would sometimes fail if we were scrolling as a result of doing adjustViewSize() in the middle of layout, because we haven't updated layer positions post-layout yet. Fix by having the poorly named FrameView::repaintFixedElementsAfterScrolling() skip the layer updating if this FrameView is inside of adjusetViewSize() in layout. In order to know if we're inside view size adjusting, add a LayoutPhase member to FrameView, replacing two existing bools that track laying out state. Investigative work showed that there are many, many ways to re-enter FrameView::layout(), which makes it hard (but desirable) to more assertions about state changes, but indicated that saving and restoring the state (via TemporaryChange<LayoutPhase>) was a good idea. * page/FrameView.cpp: (WebCore::FrameView::FrameView): (WebCore::FrameView::reset): (WebCore::FrameView::updateCompositingLayersAfterStyleChange): (WebCore::FrameView::layout): (WebCore::FrameView::repaintFixedElementsAfterScrolling): * page/FrameView.h: Change-Id: If79914ee00b9250831c935bca8e7dcccf485ecf8 git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159218 268f45cc-cd09-0410-ab3c-d52691b4dbfc Reviewed-by: Bartosz Brachaczek <b.brachaczek@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* OS X Mavericks/Xcode5: Find libxslt and libxml2 headersEike Ziller2013-12-263-3/+3
| | | | | | | | | The development headers are no longer installed in a system location, but only in the sysroot. Change-Id: Ie9b85ff638c435e7e4d0a538f6e72d2cdbae88c8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Do not accept all touch eventsAllan Sandfeld Jensen2013-12-203-9/+15
| | | | | | | | | | | | | | | | QtWebKit currently accepts all touch events to prevent the lack of accept on a TouchBegin from preventing receiving TouchUpdate and TouchEnd. This behavior prevents QGuiApplication from converting touch events to mouse events, and makes the WebView widget impossible to interact with by touch. This patch modifies the behavior slighly so that QtWebKit only accepts touch events if they are needed for the active document. Task-number: QTBUG-31938 Change-Id: Iba80ebfaf31c93f82356e3f0622039120921172a Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* [texmap] Borders on rotating images are hidden/wrongly rendered with edge ↵José Dapena Paz2013-12-171-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | distance antialiasing https://bugs.webkit.org/show_bug.cgi?id=124653 Reviewed by Noam Rosenthal. Texture mapper edge distance antialiasing texture sampling was causing borders to be shaded (and made them almost disappear in some cases). This was because calculation of sampling happened on vertex shader, so the border of the texture would go to the border of the inflation area. What algorithm should do is sampling the border pixel for all the inflation area (it is the closest pixel to all the samples in inflation area), and then use the standard sampling for the other parts of the texture. No new test because this is already covered by test transforms/3d/point-mapping/3d-point-mapping.html * platform/graphics/texmap/TextureMapperShaderProgram.cpp: fix edge distance antialiasing texture sampling. git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160096 268f45cc-cd09-0410-ab3c-d52691b4dbfc Task-number: QTBUG-34975 Change-Id: I77654e806d6b198680cb2e6c0dbc1a6adb295222 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Fix QtWebKit build on ARM softfpAllan Sandfeld Jensen2013-12-171-0/+5
| | | | | | | | | The low level interpreter depends on hardfp, so we need to disable it when builing on ARM targets with softfp. Task-number: QTBUG-35681 Change-Id: I8aaef546b92182a87cc7116ac452d8725de6a7db Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Do not completely erase LIBS variableJürgen Hunold2013-12-171-1/+0
| | | | | | | | | | Using an empty LIBS variable prevents usage of custom library paths and libraries via configure -L <path> -l <extra_lib>. This is needed for linking with an alternative stdlib implementation. Change-Id: Ie1009bfd435436bf584b2963066535ee90f4d5d0 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* Do not try to build QtWebKit as a static libraryAllan Sandfeld Jensen2013-12-171-0/+3
| | | | | | | | | | | | QtWebKit is too large to be linked as a static library on most platforms, since static libraries are typically limited to 4Gbyte even on 64bit tool chains (http://sourceware.org/bugzilla/show_bug.cgi?id=14625). The GNU ar thin archives do not have that limitation however. Task-number: QTBUG-32309 Change-Id: Ia290ecb6f54fc0a0482f17c6d9dc2ad0c810b3b3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-12-121-2/+4
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-12-121-2/+4
| |\ | | | | | | | | | Change-Id: Ia8a8683d649f27498c77f5b1932dcf1aef46bb04
| | * Do not force SSE2 instructions on i386 buildsv5.2.0Allan Sandfeld Jensen2013-12-031-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | To have consistent rendering between x86 and x64 builds QtWebKit enables SSE2 math on x86. This however raises the minimum requirements of the x86 binaries and should be disabled in Qt builds. Change-Id: If57ff0a3c9cd0a91a508ba02fda8b596381262a8 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* | | Revert "[EFL][WK2] Never create WebCore scrollbars for EFL/WK2"Allan Sandfeld Jensen2013-12-122-21/+1
|/ / | | | | | | | | | | | | | | | | | | | | | | This reverts commit 373d3d52252ea44fdd5d17635459d18d3d4b3e94. Allow FrameViews to have hidden Scrollbars. This fixes key event scrolling in fixed layout mode. Task-number: QTBUG-34203 Change-Id: Idf157d51e01ba4d831e62d1e24f7283030c8e177 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix scroll-bar behavior in RTL layoutAllan Sandfeld Jensen2013-12-121-1/+7
| | | | | | | | | | | | | | | | | | | | Default to application layout direction when no widget is given, and reverse meaning of position for horizontal RTL scrollbars. Task-numer: QTBUG-28256 Change-Id: I09c49f5d104fd0b9a6b4b1cda5c754712fc26087 Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Andras Becsi <andras.becsi@digia.com>
* | Apply size constraints for direct compositing also to background images.Michael Brüning2013-12-121-0/+8
| | | | | | | | | | | | | | | | | | | | The fact that this was not done before led to a failed WebKit assertion in the UIProcess which caused any WebView application loading pages with large background images (e.g. flickr.com) to crash on Windows. Task-number: QTBUG-35208 Change-Id: Ieae76e19fc08483cbd038a7c14e06b4bd12dd681 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Handle PlatformPageClient not being set in Windows PluginView.Michael Brüning2013-12-111-4/+3
| | | | | | | | | | | | | | | | | | | | The helper contentsToNativeWindow assumed that the PlatformPageClient would always be set, which caused problems with plugin content in head- less client applications such as CutyCapt. Task-number: QTBUG-35224 Change-Id: Iadce5fb62bd45dd0d1b15e0d7918cfbbff1b3fae Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Doc: Update WebView code sample on Qt WebKit landing pageTopi Reinio2013-12-042-6/+10
| | | | | | | | | | | | | | | | | | | | Replace obsolete 'Page' QML type used in the sample code with 'ScrollView' from Qt Quick Controls. Task-number: QTBUG-35154 Change-Id: I0a16a6158be028bf8a7975240411841c4e8200ef Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Remove superfluous assert from WebKitQmlPlugin::initializeEngineMichael Brüning2013-12-021-1/+1
| | | | | | | | | | | | | | | | | | The uri parameter is unused in this method and the ones called by it, so it should not be asserted on. Task-number: QTBUG-34066 Change-Id: I184fbad3e6e3d4786b4cc4e9f768f1c006309295 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix crash on exit of Google MapsAllan Sandfeld Jensen2013-12-023-0/+7
| | | | | | | | | | | | | | | | | | | | | | QtWebKit may crash when exiting the new WebGL version of Google maps. The problem is that under some circumstances the PlatformLayer is destroyed before the GraphicsLayer that reference it, causing the GraphicsLayer to access it during destruction. Change-Id: Ia3d0f337dcb9b8b38e9e23f53bea669bd868f713 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
* | Fix bad if test in QQuickWebViewPrivate::didFailLoad.Michael Brüning2013-11-261-1/+1
| | | | | | | | | | | | | | | | | | It was using and for two different error codes as David Binderman pointed out. Task-number: QTBUG-39425 Change-Id: I85348d8ba07757eb33eceb447adb34cc2e4e1842 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-265-12/+22
|\| | | | | | | Change-Id: I9088052f76de19e584cd16fd039502de6b22bec2
| * Account for when the QGraphicsView is a top level widgetv5.2.0-rc1Andy Shaw2013-11-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When the QGraphicsView was a top level widget then it would not account for the transformations as it did not translate the point from the scene to the view. [ChangeLog][QtWebKitWidgets][QGraphicsWebView] Make sure that mouse events for QGraphicsWebView items in a top level QGraphicsView. Task-number: QTBUG-32179 Change-Id: I2c26580a7e7e5eaec08d71768298e961d3e9d13b Reviewed-by: Michael Bruning <michael.bruning@digia.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * WebKitQML examples does not work on MacAllan Sandfeld Jensen2013-11-251-3/+4
| | | | | | | | | | | | | | | | | | | | A combination of a flawed GCC 4.2 implementation and a compiler misdetection that meant it was also used for clang caused WebKitQML to crash on startup. Task-number: QTBUG-35040 Change-Id: I77534c0e9974a79e7487d5211b1374b250219d49 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Doc: Fix issues in Qt WebKit documentation config fileTopi Reinio2013-11-231-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | This change addresses following issues: - Replace hard-coded version strings with QT_VERSION et al. - Use the word 'Reference' in description for consistency - Add a url variable - Add a filter for Qt WebKit (usable in Qt Creator Help) - Use the correct selector for listing QML types Task-number: QTBUG-34966 Change-Id: Ic8f404720b02e022da964eadd50cbd140482809c Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Detach image data when returning an ImageFrame as a native image.Michael Brüning2013-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | With error analysis and fixing guidance by Allan Sandfeld Jensen. This caused crashes when a gif was being loaded and the data in the backing store for image frame was prematurely freed. Task-number: QTBUG-31936 Change-Id: I7f4454db00cbbcf53f18060aa986a843c7522d57 Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
| * Fix compilation on ARMSamuli Piippo2013-11-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Android fix broke ARM compilation on non-Android Linux platforms. Now correcly define Elf32_auxv_t only on Android/Qt and otherwise include asm/hwcap.h Same fix was previously applied to QtScript, which had the exact same android problem (QTBUG-30978). Task-number: QTBUG-34917 Change-Id: I29d570731754c6291f8dc0c379e6fdc8ec72b897 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
* | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
| | | | | | | | | | | | Change-Id: Ie398288908d0c2dcabe8aaf8916c8b10c73a70e1 Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 07:33:49 +0000