aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
* Verbose fatal instead of crash when the scene graph state is invalid.Gunnar Sletta2014-07-048-0/+87
| | | | | Change-Id: I9a55bcbf9e94084c0cadac561e4707d47f5f8744 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Remove old state logic for ComboBoxFrederik Gladhorn2014-07-031-4/+0
| | | | | | | | The editable state is now part of the Accessible attached property, so this hack is no longer needed. Change-Id: Id17ec508015a8b9663804123e544f6c71ff38177 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Enable QSG_RUNTIME_DESCRIPTION by default for debug builds.Gunnar Sletta2014-07-032-5/+8
| | | | | | | | | This can be quite helpful when doing scene graph debugging with QSG_RENDERER_DEBUG=dump or using qDebug() on nodes in general. Change-Id: I6328d3f2a0fad87161c386bed14408598c986dcb Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devFrederik Gladhorn2014-07-024-5/+8
|\
| * Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-024-5/+8
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quick/scenegraph/openglunderqml/squircle.h src/quick/doc/src/qmltypereference.qdoc src/quick/scenegraph/qsgthreadedrenderloop.cpp Change-Id: Ife4f4b897044a7ffcd0710493c6aed1d87cf1ef9
| | * Avoid double deletion of QQuickWindowShawn Rutledge2014-06-301-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's uncertain why 4fc0df58b8458052a818e3e970a97457882808e6 added the call to sendPostedEvents(0, QEvent::DeferredDelete) but now we can see that it easily results in the destructor calling itself, and therefore double-deleting its own d_ptr. removePostedEvents seems safer to ensure that the window cannot be doubly deleted, in spite of the qdoc warning that "You should never need to call this function." Task-number: QTBUG-33436 Change-Id: I4873ebe179dde551407eba1f6baac5f03ca7f177 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
| | * Merge remote-tracking branch 'origin/stable' into 5.3Frederik Gladhorn2014-06-252-4/+6
| | |\ | | | | | | | | | | | | Change-Id: Iafccb173a9b5569bc9fd1022abb210955519fc61
| | | * Update QtQuick import value to 2.3Samuel Gaist2014-06-231-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current documentation uses import QtQuick 2.2 which is wrong since there are new APIs like mipmap for the QML Image element. Task-number: QTBUG-39302 Change-Id: I3cc3a1522efd85090c3b4011429fa16b95e79435 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | | * Set locked state while locking for grab.Gunnar Sletta2014-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If4b8fa77e6e3a288487a011e83791ad6a189675c Reviewed-by: Manish Sharma <83.manish@gmail.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * | Initialize velocityAlbert Astals Cid2014-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes valgrind warning ==21054== Conditional jump or move depends on uninitialised value(s) ==21054== at 0x5DAE6D4: QQuickListView::viewportMoved(QFlags<Qt::Orientation>) (qquicklistview.cpp:2789) ==21054== by 0x5D9ED76: QQuickFlickablePrivate::itemGeometryChanged(QQuickItem*, QRectF const&, QRectF const&) (qquickflickable.cpp:296) ==21054== by 0x5DFC438: QQuickItemViewPrivate::itemGeometryChanged(QQuickItem*, QRectF const&, QRectF const&) (qquickitemview.cpp:1158) ==21054== by 0x5DAC6A2: QQuickListViewPrivate::itemGeometryChanged(QQuickItem*, QRectF const&, QRectF const&) (qquicklistview.cpp:1369) ==21054== by 0x5D0D5F2: QQuickItem::geometryChanged(QRectF const&, QRectF const&) (qquickitem.cpp:3365) ==21054== by 0x5D11822: QQuickItem::setY(double) (qquickitem.cpp:5858) ==21054== by 0x5C84FED: QQuickTimeLinePrivate::advance(int) (qquicktimeline.cpp:826) ==21054== by 0x5C85155: QQuickTimeLine::updateCurrentTime(int) (qquicktimeline.cpp:702) ==21054== by 0x58576FA: QAbstractAnimationJob::setCurrentTime(int) (qabstractanimationjob.cpp:497) ==21054== by 0x5857BDD: QQmlAnimationTimer::updateAnimationsTime(long long) (qabstractanimationjob.cpp:119) ==21054== by 0x640C7EC: QUnifiedTimer::updateAnimationTimers(long long) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0) ==21054== by 0x58570C8: QQmlAnimationTimer::startAnimations() (qabstractanimationjob.cpp:152) ==21054== by 0x66895B5: QObject::event(QEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0) ==21054== by 0x6659CDC: QCoreApplication::notify(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0) ==21054== by 0x66599D4: QCoreApplication::notifyInternal(QObject*, QEvent*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0) ==21054== by 0x665B826: QCoreApplicationPrivate::sendPostedEvents(QObject*, int, QThreadData*) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0) ==21054== by 0x66B1242: ??? (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0) ==21054== by 0x8EE2E43: g_main_context_dispatch (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4100.0) ==21054== by 0x8EE3087: g_main_context_iterate.isra.24 (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4100.0) ==21054== by 0x8EE312B: g_main_context_iteration (in /lib/x86_64-linux-gnu/libglib-2.0.so.0.4100.0) ==21054== by 0x66B06BB: QEventDispatcherGlib::processEvents(QFlags<QEventLoop::ProcessEventsFlag>) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0) ==21054== by 0x66578EA: QEventLoop::exec(QFlags<QEventLoop::ProcessEventsFlag>) (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0) ==21054== by 0x665EF45: QCoreApplication::exec() (in /usr/lib/x86_64-linux-gnu/libQt5Core.so.5.3.0) Change-Id: I72e101140b8bee0b6867cf92902e70660c8d21ab Reviewed-by: Martin Jones <martin.jones@jollamobile.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | | Use qNextPowerOfTwo instead of reimplementing itAllan Sandfeld Jensen2014-07-022-29/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses the new shared qNextPowerOfTwo implementation introduced in qtbase. Change-Id: I831d056f584897a99df2ceb8c1d840764464e344 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | | Fix output of swap times for basic render loopUlf Hermann2014-07-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The swap time was treated as absolute by the qCDebug output, but was actually relative. Change-Id: Ia1539b8f8305ca37430022803419eb12a05934cb Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | | Properly collect polish timings from all render loopsUlf Hermann2014-07-0210-25/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously the polish timings were collected incorrectly from the windows render loop and not at all from the basic render loop. By collecting the polish times at the right places we can get rid of the 2-argument profile macro as well. Task-number: QTBUG-39876 Change-Id: I0b4aaf87162c652b8dcea6cd4f54db053f8312fe Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | | Use the same length for all scene graph numeric dataUlf Hermann2014-07-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having one int between all the qint64 is really not worth it. Also, the clients were not picking that up correctly. Change-Id: I9a9bc1c26c7518e1b666b788fa41f83c714a6db5 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | | QQuickSystemPalette: use QGuiApplication::paletteChanged()J-P Nurmi2014-07-022-44/+15
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use the newly introduced signal instead of filtering events of the whole application. Change-Id: I876268145485ba07316e916d26a93d53c464ef3a Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | | Add grabFramebuffer() to QQuickWidget and use it in the autotestLaszlo Agocs2014-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces the need for a grab function in QQuickWidget. The render control has one already so there is no reason for not exposing this in QQuickWidget too. This also means that a relatively meaningful autotest can be now be added. [ChangeLog][QtQuick] Added QQuickWidget::grabFramebuffer() for capturing the content into a QImage. Task-number: QTBUG-37589 Change-Id: I5ca8192c0ef8dab4f076a4db27b64aebe3359bb8 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | Docs: clarify the relation between default alpha and format.Laszlo Agocs2014-07-011-64/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reformat the new API docs the get rid of the unnecessary stars. And fix some typos. Change-Id: I09dcb3bea55cfd7b9209a4e0ad43e28a47fd1fa4 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | Use categorized logging for all things scenegraph.Gunnar Sletta2014-07-0111-332/+261
| | | | | | | | | | | | | | | Change-Id: I865ee838b0fd6c257b7189f24130012b98206fd1 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Avoid deadlock during window hiding.Gunnar Sletta2014-07-011-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we do event processing in polishAndSync, hide() or handleObscurity() might have been called by the time we continue execution. We already handled that windowDestroyed() was called. Change-Id: If45bcf3fa18cef1a60ca31bc26d3830045f581d9 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | | QQuickApplication: do not filter LayoutDirectionChange eventsJ-P Nurmi2014-06-252-35/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The newly introduced QGuiApplication::layoutDirectionChanged() is much cheaper to use than filtering events of the application object. Change-Id: I356c94cc6bea806bf3644c31c2610501d90f6c35 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | | Warn at runtime about badly threaded calls to QQuickItem::update()Gunnar Sletta2014-06-251-3/+5
| | | | | | | | | | | | | | | Change-Id: Ia3fc01f11ff28441d4ef095b520297a73e3399d6 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | | Make QQuickRenderControl publicLaszlo Agocs2014-06-247-141/+299
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QQuickRenderControl allows rendering Qt Quick 2 scenes into framebuffer objects which can then be used in arbitrary ways in Qt-based or 3rd party OpenGL renderers. [ChangeLog][QtQuick] Introduced QQuickRenderControl as a public API. Task-number: QTBUG-37944 Change-Id: I84262243b261b35cefdf67ec6bba8127a0f29275 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* | | QQuickApplication: do not filter ApplicationActive/Inactive eventsJ-P Nurmi2014-06-231-19/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Listening to QGuiApplication::applicationStateChanged() is enough, no need to do expensive event filtering for listening to application state changes. Change-Id: Iba71bc8cefec236f2f7e2e25c57c5c6b9c9fb1ea Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | | Make sure program is bound before calling initialize().Gunnar Sletta2014-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some implementations will use the initialization to set constant uniforms like texture locations, so bind the program before so this will work. Task-number: QTBUG-39472 Change-Id: I677c5aeefe68535bd4805e83b93308d0bd090030 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | | Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devSergio Ahumada2014-06-179-14/+19
|\ \ \
| * | | Merge remote-tracking branch 'origin/5.3' into devSimon Hausmann2014-06-139-14/+19
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quickwidgets/qquickwidget.cpp Change-Id: Id4b080aea713df68608847bb82570231e37ce536
| | * | Initialize QSGPaintedNode with an empty size.Gunnar Sletta2014-06-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Failing to do so would cause it to not update its size when set to 1x1 which in turn would cause it to never update its texture, causing crashes later during rendering. Task-number: QTBUG-39555 Change-Id: I099d9ef2d6968ece21f7c03819abfd6685bec430 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
| | * | Add node description to painted items.Gunnar Sletta2014-06-121-0/+4
| | | | | | | | | | | | | | | | | | | | Change-Id: I47ad9df1550649131ac5379acbf7d133088c60a8 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * | Make sure shader rewriter stops immediately on an empty string.Gunnar Sletta2014-06-121-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'invalid' token didn't really serve a purpose. If a string contains 0 for any reason, it one has reached the end. Task-number: QTBUG-39505 Change-Id: I3fc9b8f28dc223386a72bbfa28f70fcca0fde223 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * | Fix forwarding of keyboard events to multiple target itemsJoni Poikelin2014-06-111-0/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix regression when multiple items are set to Keys.forwardTo attached property. QML items accept key events automatically and event should be by default in accepted state when entering handler. Task-number: QTBUG-39168 Change-Id: Ibf6c163c4059269996113634efa48ad2fe4d838d Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| | * Stop polish-and-sync timer when the window is destroyedLaszlo Agocs2014-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The threaded render loop continues to run the polish-and-sync timer for ever in case the QQuickWindow is destroyed while the timer is active. Instead of pumping the timer events on the render thread for ever, the timer has to be killed somewhere. Change-Id: I8e458624e26ebfacb6cc69a4f2fbb3da57ae5e0e Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| | * Fix opacity issue in the renderer.Gunnar Sletta2014-06-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given the following tree: OpacityNode | TransformNode (which is a batch root) | GeometryNode If both opacity and transform nodes were changed this frame, we would hit the optimized "scrolling" path while traversing the tree and abort updating that subtree. As a result the opacity change was not propegated to the geometry node and it would be rendered incorrectly. Fix this by skipping the optimized path when there are opacity changes in an ancestor. Task-number: QTBUG-39190 Change-Id: Ieaebfe3de62b961204bd3103fe9913d60e75e412 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * Doc: Removed redundant link to section in the same page.Jerome Pasion2014-06-051-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | There is no need to refer to a different section as it is understood that those instructions apply to all examples. Change-Id: I2d0d2d6cbf84790bc4ca2f3deda57ab5d3d1c6c1 Reviewed-by: Martin Smith <martin.smith@digia.com>
| | * Use the correct precision specifier in visualizer GLSL.Gunnar Sletta2014-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-39119 Change-Id: I0ec4909167f5694ce4229df8202c89742be21d0a Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| | * Make ItemViews displayMargin work correctly when set to negative valuesAlbert Astals Cid2014-06-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | We need to call forceLayoutPolish instead of refillOrLayout so that the visibility is correctly updated. Also update one line that sets visibility in GridView Change-Id: I29fa67cdd5196a744fab9507b4104cb83ad4bf5e Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* | | Introduce Accessible.ignoredFrederik Gladhorn2014-06-162-0/+46
|/ / | | | | | | | | | | Task-number: QTBUG-39163 Change-Id: Ic09573408c460c64503cf1c4d6fff3754e92a223 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* | Doc: Fix qmlclass selector used in documentation configTopi Reinio2014-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | A recent change (46959875) in qdoc raised QML types from subnodes to top-level nodes. This change modifies the documentation configuration file(s) accordingly. Change-Id: Ic457d20368979aa15b546dceaf84fa2fb2d31091 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* | Optimize the way AnimatedImage display its contentLouis du Verdier2014-06-056-2/+74
| | | | | | | | | | | | | | | | | | | | | | | | Since QtQuick2, the AnimatedImage component is less efficient than it was with QtQuick1, using more CPU and RAM. This commit makes it upload when required each animation frame as a cached texture (using QQuickPixmapCache) to speed up the component. Task-number: QTBUG-38921 Change-Id: I7ab0b5f47ecec6cb3cdded0dd219d6acc1bc4148 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Process children first when delivering drag eventsAleix Pol2014-06-051-17/+20
| | | | | | | | | | | | | | | | [ChangeLog][QtQuick][Important Behavior Changes] Drag and Drop events now propagate to child items before their parents. Change-Id: I22832d707c7cb2461eaa94d659c5cc83506def8d Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-06-0415-81/+151
|\| | | | | | | | | | | | | | | | | | | | | | | | | The merge conflict is about the removal of "d1" from the register set on ARM, but that was already done in dev in commit ddb33ee9ba9e1344caa9be5dbf4b534c3ede692e The change in src/quick/scenegraph/coreapi/qsgrenderer.cpp with commit 2414f1675eab163b22dcc4e8ded80ed04d06369b was reverted to what it was before, per Laszlo's advice. Conflicts: src/qml/jit/qv4isel_masm.cpp Change-Id: I7bce546c5cdee01e37853a476d82279d4e72948b
| * Make QQuickRenderControl usable (still private)Paul Olav Tvete2014-06-033-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | QQuickRenderControl needs a QQuickWindow in order to function. This required the use of a private QQuickWindow constructor, meaning that only friend classes of QQuickWindow could use QQuickRenderControl. This change adds a factory function, QQuickRenderControl::createOffscreenWindow(). Task-number: QTBUG-38996 Change-Id: I92f6f1f60045934f3dd33c300352247852463c73 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| * Fix crash in QSGRenderContext::invalidate().Yoann Lopes2014-06-031-0/+3
| | | | | | | | | | | | | | | | | | | | | | QSGRenderContext was holding pointers to QFontEngines without increasing the font engine's ref count, allowing them to be deleted before QSGRenderContext could make use of them. Task-number: QTBUG-36573 Task-number: QTBUG-38313 Change-Id: I0ed28bb44882c55f330c27c23b533b7999d7e04b Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| * Prevent initial clipping in Context2DUlf Hermann2014-06-033-11/+9
| | | | | | | | | | | | | | | | | | Don't set an initial clip path and only start clipping once a clip path has manually been set. Task-number: QTBUG-39114 Change-Id: Id277775d6eb0be87bead0e5d076f32a07ebdfe5c Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| * Recognize "in" keyword in vertex shadersLaszlo Agocs2014-06-031-2/+8
| | | | | | | | | | | | | | | | | | Checking only for "attribute" is not sufficient: with newer GLSL versions "in" is used. Task-number: QTBUG-39143 Change-Id: Ibdb5940f5aba1485ecaad2e2c4a3aa7150af6d99 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| * Fix QQuickWidget cleanup and invalidation sequenceLaszlo Agocs2014-06-031-2/+2
| | | | | | | | | | | | | | | | | | Make sure the context/surface are still alive and current while destroying the render control. Task-number: QTBUG-39034 Change-Id: I6ff0069985a9121a63025bfb165493b3f003391d Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| * Keep the internal state about the bound fbo up to dateLaszlo Agocs2014-06-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When binding an FBO directly via glBindFramebuffer, the QOpenGLContext's internal current_fbo, that is maintained by QOpenGLFramebufferObject, becomes out of sync. This will lead to QOpenGLFramebufferObjects thinking they are still bound. This fix prevents ShaderEffect items in QQuickWidget from complaining about "'recursive' must be set to true when rendering recursively". Ideally the entire tracking of the current fbo should be removed, since it cannot be done robustly enough, but that will likely happen in 5.4 only. Task-number: QTBUG-38994 Change-Id: I39015d90bb2e0985d2a084b79ffe2004a9bc9f07 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
| * Fix potential null pointer dereferencingFrederik Gladhorn2014-05-303-3/+3
| | | | | | | | | | | | | | | | | | These were found by http://www.viva64.com/en/b/025 most issues are rather cosmetic. Change-Id: I7cc12610aae6a43d26bedb9b480863c0695ddfa3 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| * Fix copy and paste errorFrederik Gladhorn2014-05-301-5/+0
| | | | | | | | | | | | | | | | | | Fix first error "Null pointer dereferencing" identified by static analysis from http://www.viva64.com/en/b/0251/ Change-Id: I984d6ac2c22fddfe5ccb507f5d95d3329bed0563 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fix AccessibleAttached property documentationFrederik Gladhorn2014-05-301-55/+102
| | | | | | | | | | | | Task-number: QTBUG-37908 Change-Id: Ib8cfa284c2be522628359f7585b0a96addfd5ed4 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| * Fix QSGPlainTexture object leakLiang Jian2014-05-281-0/+1
| | | | | | | | | | | | | | Delete m_texture in the destructor of QSGTextMaskMaterial class Change-Id: I0f3c59d2c5f094dcbc02eafa6ed782d16315eb44 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-30 04:17:39 +0000