aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick
Commit message (Collapse)AuthorAgeFilesLines
* Fix QQuickView::grabWindow() on retina displaysMorten Johan Sørvig2014-03-205-5/+5
| | | | | | | | | Multiply by window->devicePixelRatio() at all qt_gl_read_framebuffer() call sites. Task-number: QTBUG-35962 Change-Id: If58e4f97fc5d931ba2e222f8cb1a0641d52c3257 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Implement high-dpi "@2x" image handling.Morten Johan Sørvig2014-03-204-8/+85
| | | | | | | | | | | | | | | | | | | | | | | | Make QQuickBaseImage::load() load "@2x" image files on high-dpi displays. Reload images on screen change in order to load the correct version depending on screen dpi. Modify QQuickImageBase::updatePaintNode() to work with @2x images. QQuickBaseImage::load() now looks at the target window's devicePixelRatio and checks for the presence of a "@2x" file on disk. If found the @2x version will be used. Unlike QPixmap, QQuickPixmap has no special knowledge of "@2x" files. They pixmap system will be asked to load "@2x" files and will cache them and report the (device) pixel size, like any other pixmap. Add auto-test and manual test. Task-number: QTBUG-32862, QTBUG-33069 Change-Id: I1f57a10075e499f6eee61df5421e1986521c6ab0 Reviewed-by: Andy Nichols <andy.nichols@digia.com>
* Clearly point out the distinction between GUI and Render threads.Gunnar Sletta2014-03-208-12/+49
| | | | | | | | This is something it is easy to get wrong, so try to make it as visible as possible. Change-Id: I2253ae63214cef0fb91c8b9423d7918ffc20e888 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Behavior fix when creating QML windowsFabian Bumberger2014-03-191-1/+19
| | | | | | | | | | | | | | | | | | | | When a QML window is created it is set visible after the QQuickWindowQmlImpl component is complete. This works fine for a single window, but because componentCompleted is called first for the last created windows, the behavior is not as the user might expect (and different compared to version 2.0 of the QML Window API). One of the results is e.g. that a window which is created as a child object in QML will have a lower z-Order than the parent. On some platforms (e.g. BlackBerry) an even bigger problem arises because the first created window acts as a container for the whole application and is always shown fullscreen. On other platforms (Linux) the initial window position and the window focus ares not set correctly. This patch postpones showing windows until the "transientParent" is visible. [Changelog][QtQuick] Making a QtQuick Window visible is postponed till its transient parent is visible Task-number: QTBUG-37440 Change-Id: I09a94ff038c066a5d3298c6c103dafde50bef1fa Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Cleanup: Remove last traces of QQmlScriptSimon Hausmann2014-03-191-1/+0
| | | | | | | | | | What remains is the code for removing .pragma from script source code (and replacing it with white-space to preserve line/column numbers). The previous code even returned the value of the pragmas, but for the remaining caller sites that value isn't used, so we can just return void. Change-Id: I16db15da236970660b817d6c4493005365a7a1af Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Invalidate all batches potentially affected by a change.Gunnar Sletta2014-03-192-3/+12
| | | | | | | | | | | | When two separate changes have occurred, we need to not only invalidate the batches directly overlapping those, but also any batch which has render orders between the two. So, keep track of the range of invalidated render orders and invalidate everything in between. Task-number: QTBUG-37422 Change-Id: Ie5a289d5c569b84917ec9ac52671173c566e69b3 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Dynamic GL in QuickLaszlo Agocs2014-03-189-55/+72
| | | | | | | | | | The counterpart to I716fdebb. Implements the dynamic path in scenegraph. Task-number: QTBUG-36483 Change-Id: I2dc613ba84560b7b8e36d3cd1da61c050ab08db0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Release the mouse grab from PinchArea when it's not needed anymoreUlf Hermann2014-03-181-5/+8
| | | | | | | | | If we keep the mouse grabbed no other items will receive mouse events until the next click. Task-number: QTBUG-37485 Change-Id: Id3936fbe09b262ddbefc68334ef8fe7e161fbcd4 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* Doc: Fix broken \qmlsignal linksSze Howe Koh2014-03-188-26/+25
| | | | | | | | Fix the breaks caused by the re-categorizing of \qmlsignal pages Task-number: QTBUG-35846 Change-Id: I528ae16ec522fc902133e22d8f53c87a7f0d56ad Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Document signals (not handlers) under \qmlsignalSze Howe Koh2014-03-1815-224/+408
| | | | | | | | Append the handler names to the end of the corresponding signal doc. Task-number: QTBUG-35846 Change-Id: I3d627ba7ed5be94e5c402ab092b4d582536499e8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Register animation profiler callback also from render threadUlf Hermann2014-03-183-8/+29
| | | | | | | | | | | The QUnifiedTimer in the GUI thread doesn't cover the render thread animations. We need a separate registration for those. We also need to keep track of which animation events are coming from which threads. Task-number: QTCREATORBUG-11659 Change-Id: I1fdd80a5630cc6a33e527b99be7347f3bd63510f Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Doc: Reintroduce missing sample XML file for XMLRole documentationTopi Reinio2014-03-182-2/+24
| | | | | | | | | | | | | XMLRole documentation talks about sample XML content, but erraenously quoted a QML file instead. This change brings back the sample file from Qt 4.8, and updates it to cover the use of boolean role. Change-Id: Id71550fab15c761320551f6583a138cd7cc88376 Reviewed-by: Bea Lam <bea.lam@jollamobile.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* PinchArea: zooming requires pinch distance to exceed the thresholdShawn Rutledge2014-03-181-32/+39
| | | | | | | | | | | | | | | | | | | | | | If you use a PinchArea and a Flickable together on OSX, you will be able to use two fingers on the trackpad to flick the Flickable because the OS will send scroll events which Qt turns into QWheelEvents; and at the same time you will have two touch points, which the PinchArea will grab and use. That's nice, but it means we need to be more selective about gesture recognition, so that when you mean to flick you can do it without simultaneously pinch-zooming. Therefore, iff pinch.dragAxis is Pinch.NoDrag, the startDragDistance (threshold) is treated as a pinch distance threshold rather than allowing any direction of movement to begin the pinch gesture. [Changelog][QtQuick][PinchArea] do not begin zooming until the change in distance between two touch points exceeds startDragDistance Task-number: QTBUG-37294 Change-Id: I01026364970428aae9a4c5436517db719387f8e8 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Ulf Hermann <ulf.hermann@digia.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Item views: improve initial Z-value handlingJ-P Nurmi2014-03-183-9/+32
| | | | | | | | | | Respect the initial Z-values of item, highlight, header, footer and section delegate instances. Mention also the default values in docs. Change-Id: I2ce4bb537898a0f5fdfa776b79d5747b1c080a7b Reviewed-by: Michael Brasser <michael.brasser@live.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Fix potential crash during shutdown for QQuickWindowsGunnar Sletta2014-03-178-28/+11
| | | | | | | | | | | | | The cleanup() function would deregister the render loop from all windows the render loop had seen, but the render loop doesn't see windows until the window gets a showEvent and for some implementations it was removed as a result of hideEvent. So add explicit tracking to QSGRenderLoop which is managed by QQuickWindow's constructor and destructor. With this, we no longer need the lists from the subclasses, so these functions are removed again. Change-Id: I05e5507ad57e23c80bacd99752654cc7d0890dc1 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Fix AnimatedSprite interpolation when looping and/or reversing.Michael Brasser2014-03-171-11/+47
| | | | | | | | | | Ensure we interpolate in the correct direction, and that interpolation occurs between loops. Task-number: QTBUG-36339 Task-number: QTBUG-36340 Change-Id: Iccb097e6a9af9fa6697e2ba9ee852be9eb516edc Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Fix context creation failure message.Friedemann Kleint2014-03-171-2/+2
| | | | | | | Add missing newline, fix placeholders in translator's comment. Change-Id: If80d237a97096a319a67da4c75c5e32c47576aee Reviewed-by: Robert Loehning <robert.loehning@digia.com>
* Add docs on using a query in XMLRole with the less obvious boolean()David Greaves2014-03-171-0/+3
| | | | | | | | | | | | Added to a documentation snippet since a direct boolean map is useful in QML for toggles and using "@wanted/boolean()" as the @type example does, would be wrong. Change-Id: If412ec0f4891db39fe1a219f9cb89e1f7103fd38 Signed-off-by: David Greaves <david@dgreaves.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Unset the current gl window when deletedGiulio Camuffo2014-03-171-0/+2
| | | | | | | | | | This does in the QSGGuiThreadRenderLoop what 403045a did for the QSGThreadedRenderLoop. Fix a memory corruption in Mesa's dri2 EGL when setting a window current after deleting the previous current one. Change-Id: I8df0bacdf12f71e969a9ea39842a402c9a2a303f Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Canvas: do not emit paint when resized but hiddenJ-P Nurmi2014-03-161-5/+4
| | | | | | | | | | | | | | | It turns out to be a bad idea (as in, breaks the enterprise controls) to block paint() altogether when hidden. The original bug report QTBUG-31830 only complained about paint() being emitted upon resize while _hidden_, so this change solves exactly that. User is still free to call requestPaint() even when hidden, and Canvas now doesn't recklessly ignore the request. Task-number: QTBUG-31830 Change-Id: Icd82188f65406b3ef6ae3b19b5984944576886ff Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Use stable sort when cleaning batches.Michael Brasser2014-03-151-1/+1
| | | | | | | | | Ensure valid batches do not change order. This was causing rendering issues when m_rebuild was 0, as we would not re-sort the list in correct render order after cleanup. Change-Id: I912fb313d4029f96e263fad24d68462f252003df Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Make sure QSGRenderLoop is cleaned up cleanly.Gunnar Sletta2014-03-148-17/+66
| | | | | | | | | | | | | | | | | | | | | e13547c595913c58e6bd6a5ed80fdc729fae7d47 used a global static to clean up QSGRenderLoop which is triggered very late, potentially after SG backend API plugins have been unloaded. This results in crashes when used in combination with scenegraph-playgrounds's customcontext. Partially revert the change and instead clean up at the time of QApp::aboutToQuit and make sure we also disconnect cleanly from all QQuickWindows. This change also ensures that QSGRenderLoop::windowDestroyed() gets called for all QQuickWindows registered with the render loop. This ensures that rendering stops and that scene graph nodes and resources will be cleaned up regardless of whether the application has remembered to delete the window or not. This is a good thing as it makes the scene graph shutdown a bit cleaner. Change-Id: I9cb9093979f8eac05542f118a6ff9cfe5c84f745 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Move Qt Quick Widgets example and document itTopi Reinio2014-03-141-1/+0
| | | | | | | | | | | | | | | Because QtQuickWidgets is part of Qt Quick module documentation, its examples need to also be moved under the examples/quick directory structure. This change moves the example, creates minimal documentation for it, and adds a link to it from the QQuickWidget class reference. Task-number: QTBUG-37272 Change-Id: Iffb67849f150b9aaf0edaef5852364e93f7752b8 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix rendering issue with material changes from opaque <-> alphaGunnar Sletta2014-03-132-6/+18
| | | | | | | | | | | | When I introduced the invalidation of z ranges, I forgot that we need to rebuild render lists when nodes move from opaque to alpha batches or vice versa as that sorting happens in buildRenderLists(). To remedy this, make Batch::isMaterialCompatible report blending changes separately and trigger a full rebuild in this case. Task-number: QTBUG-37422 Change-Id: I020813cb531ed58353f8340fcad58dec8d7856dd Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Ensure TextEdit's text is vertically aligned after resizing its height.Mitch Curtis2014-03-131-1/+2
| | | | | | | | | | | | | The current code only updates the alignment if the width of the TextEdit changed, but we must also check if the height has changed. Task-number: QTBUG-36069 [ChangeLog][QtQuick][TextEdit] Fixed TextEdit not vertically aligning its text after having its height changed. Change-Id: I0b2d6a7384457ca1018fc9899c82699e8ecfcbd4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Consolidate context creation failure handling in Quick.Friedemann Kleint2014-03-136-48/+76
| | | | | | | | | Add QQuickWidget::sceneGraphError() equivalent to QQuickWindow::sceneGraphError(), move message formatting code to QQuickWindowPrivate. Change-Id: I18cd4d7e0f6ee1011c29375218dc6a044b0d2cf2 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* QQuickWindow: let clearFocusObject actually clear the focus objectRichard Moe Gustavsen2014-03-131-1/+2
| | | | | | | | | | | | | | | | On iOS we clear the focus object when the virtual keyboard is hidden (to stop blinking cursors etc). The current implementation in QQuickWindow would then tell the root item to clear focus. This was wrong, since setFocus is expected to be called on the item you either want to gain, or release, focus (not the root item). This sometimes caused items to end up in an incorrect focus state. With this patch we ensure that we call setFocus on the focus object. Change-Id: I0c08fbc35f6695064b7c911466fdc62f4027385e Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Item views: avoid fixing up the position while moving/flickingJ-P Nurmi2014-03-131-4/+8
| | | | | | Task-number: QTBUG-35920 Change-Id: Id6a68400eed69d880dd1c218ec4a1beda8a8fbb9 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Doc: Re-organized Qt Quick's examples page.Jerome Pasion2014-03-121-90/+119
| | | | | | | | | | -Organized into "Demo", "Tutorials", and "Examples". -Added Controls, Dialogs, and other Qt Quick examples. -Added links to Qt Creator tutorials related to Qt Quick. Task-number: QTBUG-36838 Change-Id: I9ca000a73465217a2c42ebac9288e6462afa4cf5 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* QQuickWindow cleanup: Remove forceRendering flagPaul Olav Tvete2014-03-123-6/+4
| | | | | | | | | | | forceRendering was introduced for QQuickWidget, but QQuickWidget now has full control of when the rendering functions are called. It makes more sense to not call the QQuickRenderControl functions, than to set a flag on QQuickWidget that decides whether those functions have any effect. Change-Id: I69819b13000120c04cecd1a467c08e8df9330df8 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Remove redundant QQmlBinding members.Michael Brasser2014-03-111-1/+1
| | | | | | | | | This reduces the size of QQmlBinding by 12 bytes. Task-number: QTBUG-37134 Change-Id: Id55257edec8cee88d863374e8a96d7eebbeaf523 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Doc: Fix issues in QQuickWidget documentationTopi Reinio2014-03-111-1/+1
| | | | | | | | | | Fix qdoc warnings, do some editing and cross-link between QQuickWidget and QQuickView class references. Task-number: QTBUG-37272 Change-Id: I48d3a01e7c6315be329e24a5c5f7635697629316 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Add support for resolving translation bindings at compile timeSimon Hausmann2014-03-111-0/+3
| | | | | | | | | | Simple calls to qsTr and qsTrId are detected at type compile time and reduced to a special Translation and TranslationById binding type, which avoids allocating a QML binding at type instantiation type just to perform a translation. Change-Id: I61e4f2db2a8092b5e6870e174b832d9c20cd62b5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Doc: Adding QQuickWidget's path to the qtquick.qdocconfJerome Pasion2014-03-111-2/+5
| | | | | | | | -allows QDoc to detect and generate documentation. Task-number: QTBUG-37272 Change-Id: I83aedead99c7fccb03fe4a7fa34be45fc94ae010 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Stack size increase for x86 QNX systemsJames McDonnell2014-03-101-0/+4
| | | | | | | | | | | Increase the size of the stack for the scene graph thread on x86 QNX systems. The default stack size (132K) is too small for the MESA graphics driver shared libraries on these systems. Task-number: QTBUG-37338 Change-Id: I8b50aece98ef3f530f2202fc89a0e90b0b2e2e72 Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Fix TextEdit::lineCount to update as appropriateJ-P Nurmi2014-03-101-1/+1
| | | | | | | | | | The total line count needs to be updated when geometry, document size or wrapping mode changes. Task-number: QTBUG-37263 Change-Id: If58a2f77022475e8bcb7cca0f2a091ee837b39a5 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Remove several uses of module includesAndrew Knight2014-03-102-2/+2
| | | | | | | | | | Module includes are discouraged because they may increase compilation time. While debugging a broken core module include header, a number of module include infractions were discovered in qtdeclarative. Replace them with their more specific counterparts. Change-Id: I614e9a6aa2177f396e5289f3cdb3c35faa0202c9 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* MultiPointTouchArea: handles mouse too, unless mouseEnabled is falseShawn Rutledge2014-03-102-10/+156
| | | | | | | | | | | | | | | | | | | A new boolean property mouseEnabled is introduced (true by default). If set to true, then it will handle any non-synthetic mouse event as if it were a touch point. If set to false, the area becomes transparent for real mouse events so that a MultiPointTouchArea can be stacked on top of a MouseArea in order to separate handling of touch and mouse. In either case it continues to absorb and ignore synthesized mouse events (including touch-to-mouse synthesis in QQuickWindow). [ChangeLog][QtQuick][MultiPointTouchArea]handles mouse as a touchpoint; added mouseEnabled property to permit transparent pass-through to mouse-sensitive items Change-Id: I4af94d838f0060154494589c0f15c6858ee89ddb Task-number: QTBUG-31047 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* Use fuzzy comparison for another Flickable StopAtBounds case.Michael Brasser2014-03-071-4/+4
| | | | | | | | | | | | | Be consistent with 268f4615dcf19aad3603833af83ba28eca886aa5, and use fuzzyLessThanOrEqualTo when checking whether we are at or past the bounds when dragging. This prevents a condition where: 1. A Flickable with StopAtBounds is at one of the bounds. 2. A quick flick will sometimes (rarely) cause the Flickable to flick past the bounds. Change-Id: I4165fa133f556fb9d47cc691d11b2ecb77746b33 Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
* Remove old compiler and VMESimon Hausmann2014-03-072-74/+0
| | | | | | | | | | | | This removes the bulk of the code. A few smaller cleanups remain, to be done in smaller changes as they move code around. Additionally the "optimize" option of qqmlbundle was removed. It called QQmlScript::Parser::preparseData, which however was not implemented and always returned an empty QByteArray. Therefore "optimize" would not do anything and the class is gone now :) Change-Id: I0c265e756704cb53c5250be1f69e4a3e1b6e64d5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* MouseArea: make clear containsMouse requires the cursor to be insideShawn Rutledge2014-03-071-1/+2
| | | | | | | Task-number: QTBUG-37133 Change-Id: I5d0943963bf423c3f930365502e42b54a71d9e88 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* QSGBatchRenderer: return when a shader is not returned by the managerAndrew Knight2014-03-061-0/+4
| | | | | | | | | | If a shader can't be found from the manager (e.g., if it failed to link), return from rendering. This prevents the renderer from crashing on a null pointer. Task-number: QTBUG-37290 Change-Id: I44d0bbb721854c0bc6da681ff55f71140a5cb0bc Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Doc: Fix "Right-to-left User Interfaces"Takumi Asaki2014-03-061-8/+8
| | | | | | | | * Change from QApplication to QGuiApplication * Change from qmlviewer to qmlscene Change-Id: I6ceee763c125c4896905884f55437e3f375408d7 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix GridView flow enum docsJ-P Nurmi2014-03-061-13/+13
| | | | | | | | Task-number: QTBUG-37232 Change-Id: Ib975181e6cff9a86f642d822dfc92773528598cb Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Reset the expose cycle when polishAndSync aborts.Gunnar Sletta2014-03-052-16/+27
| | | | | | | | | | | | | | | On platforms with misbehaving expose behavior, we will get and exposure, even though the window is not renderable. This results in the renderthread being in the "wait for polish" state while the GUI thread goes back to "no state". Check for this and reset render thread's expose cycle when it is hit. Task-number: QTBUG-37201 Change-Id: I6a6c89d9016301ff19443f88a2c182012b4eb65f Reviewed-by: Ulf Hermann <ulf.hermann@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix MSVC2012 compiler warnings.Erik Verbruggen2014-03-051-4/+4
| | | | | | | | Tested on both win32 and win64. Change-Id: I47755e2da51829e61e1452eaaf84a057224b478b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Don't sort batches when there are no changes.Gunnar Sletta2014-03-051-8/+11
| | | | | | | | | | | | | On node removal we change the batch, but don't set rebuild as everything else should be drawn as is. A sort after such a removal could result on the order of batches being changed without the other nodes being updated. This would then result in incorrect ordering and nodes could be obscured. Task-number: QTBUG-37222 Change-Id: I57dd2fbc945e8c10c949743f59315b3372a4b6f4 Reviewed-by: Michael Brasser <michael.brasser@live.com>
* Remove isES() usage in scenegraphLaszlo Agocs2014-03-043-3/+3
| | | | | | | | | The error signal patch added some usages of QOpenGLFunctions::isES(). These need to be temporarily removed. Change-Id: Ibd1d8094059020708aefe4b3502ba56d624928b3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Fix some typosSergio Ahumada2014-03-034-5/+5
| | | | | Change-Id: Iea540b768232ea423ea7f04e41655198931cf36d Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Renamed Qt Quick Code Samples page.Jerome Pasion2014-03-033-3/+3
| | | | | | | | | -new name is Qt Quick Examples and Tutorials -includes tutorials, not just examples or code samples. Task-number: QTBUG-36838 Change-Id: I660770cac1cdd71cd3b34bad878b0e59a088924b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>