aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Cut off blocked sub-trees one node earlier.Kim Motoyoshi Kalland2011-06-102-9/+8
| | | | Do not even enter the blocked node.
* Removed QSGNodeVisitor inheritance from QSGNodeUpdater.Kim Motoyoshi Kalland2011-06-102-14/+54
| | | | This reduces the number of virtual function calls.
* Added QSGNode::removeAllChildNodes().Kim Motoyoshi Kalland2011-06-103-9/+20
|
* Keep track of the number of geometry nodes in a sub-graph.Kim Motoyoshi Kalland2011-06-102-4/+18
| | | | | If there are no geometry nodes in a sub-graph, there's no need to update it.
* Doc: Cleaned up the scene graph documentation a little.David Boddie2011-06-0935-38/+8
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtdeclarative-stagingGunnar Sletta2011-06-092-36/+23
|\
| * Notify when the TextInput cursorRectangle property changes within pre-editAndrew den Exter2011-06-092-36/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | Anything that updates the horizontal scroll is also likely to change the position of the cursor rectangle and the micro focus. So group these actions together and ensure they're done before emitting cursorPositionChanged() so positionToRectangle() returns a valid value from that handler. Change-Id: I5fadc58efb148a8dabe88a94381c86cd64dba3bd Task-number: QTBUG-19089 Reviewed-by: Martin Jones (cherry picked from commit a0b2fc44ff8752193cacde52276b1822741f5374)
* | Use the Qt 4 function for updatesEnabled()Gunnar Sletta2011-06-091-1/+1
|/ | | | Change-Id: I78bf3b8acff54b83493aebc480e7f9b4f32c1c70
* Support calling update while syncing scenegraph.Gunnar Sletta2011-06-092-1/+12
| | | | | | | The variable inSync is written from the scene graph thread and read from the GUI thread, but this is safe as it is only written to during the sync phase, during which the GUI thread is already blocked.
* Merge branch 'threaded3'Gunnar Sletta2011-06-096-241/+568
|\
| * Wake render thread when doing paint() and grab() as in resize()Gunnar Sletta2011-06-081-4/+5
| |
| * A better threaded rendererGunnar Sletta2011-06-063-228/+548
| |
| * Removed warningGunnar Sletta2011-06-061-8/+8
| |
| * Don't fetch a context that is never to be usedGunnar Sletta2011-06-061-3/+0
| |
| * Fixed up command line options a bitGunnar Sletta2011-06-061-2/+11
| |
* | Introduced simple materialGunnar Sletta2011-06-092-0/+223
| |
* | Remove clock_gettime() library dependency.Michael Brasser2011-06-091-5/+0
| | | | | | | | Should have been removed as part of cd6ebb4912a5d96c788ea0c838d8a1a06ff4029e.
* | Optimized QDeclarativeScriptString constructor for QDeclarativeExpression.Michael Brasser2011-06-0910-15/+135
| | | | | | | | | | | | | | | | | | When the compiler sees a script string, it will attempt to rewrite it and store the id for the rewrite in the script string. We can then create a QDeclarativeExpression using the id, which saves us a rewrite at runtime. Reviewed-by: Aaron Kennedy
* | Fix missing include->load conversion of qbase.priMarius Storm-Olsen2011-06-071-1/+1
| |
* | Use feature profile loading instead of direct inclusion.axis2011-06-075-6/+6
| |
* | Fixed clock_gettime() library dependency.axis2011-06-071-2/+4
| | | | | | | | | | | | The old construct doesn't work if the QtBase source is unavailable. Reviewed-by: Marius Storm-Olsen
* | Fix docs on caching for images loaded by image providersBea Lam2011-06-073-4/+39
| | | | | | | | | | | | | | | | | | | | Also add docs for 'source' and 'asynchronous' properties for AnimatedImage. Task-number: QTBUG-19504 Change-Id: Iec72dc7630308a94c37d00c6b008b5949c6fccd4 Reviewed-by: Martin Jones (cherry picked from commit 7602be09663d37f01cfd640a7f1be959ce4317b7)
* | Fix crash for prematurely deleted QSGItemPrivate::itemNodeInstanceGabriel de Dietrich2011-06-061-0/+1
|/ | | | | | | The OwnedByParent flag was set whereas it should had been cleared right after creating QSGItemPrivate::itemNodeInstance. Reviewed-by: Kim
* Revert some of "Make QMLViewer startup animation stop after a while"Alan Alpert2011-06-033-36/+0
| | | | | | | | | This reverts most of commit c6e6a35aeb8794d68a3ca0c4e27a3a1181c066b5. Only the startup.qml changes were meant to go in. The other stuff is an experimental feature that was not supposed to be merged in. Reviewed-by: Michael Brasser
* Replace QPerformanceTimer with QElapsedTimer.Michael Brasser2011-06-035-318/+11
| | | | | | | QElapsedTimer has added a nsecsElapsed() function, so QPerformanceTimer is no longer needed. Reviewed-by: Charles Yin
* Add docs and test for Binding changes.Michael Brasser2011-06-021-0/+43
| | | | | Change-Id: I6bce140bf80c3e0defd7603aecfb7f658520f4d3 Reviewed-by: Martin Jones
* Restore original binding when Binding's when clause becomes false.Michael Brasser2011-06-021-6/+43
| | | | | Change-Id: I7e2ba1f6e3cd1e049ec2666ab8191cb91acbfe50 Reviewed-by: Martin Jones
* Make Binding a value source.Michael Brasser2011-06-022-7/+21
| | | | | Change-Id: I1a9003f1e506c53e172bfae418f536ad0da2bf47 Reviewed-by: Martin Jones
* QDeclarative: fixed clean animation listsChristiaan Janssen2011-05-313-7/+39
| | | | Change-Id: I9dd8b4fcd3f04193410710981a511b9f69e5dc19
* DeclarativeObserver: Don't fade in the highlight edgeThorbjørn Lindeijer2011-05-312-58/+10
| | | | | | | | It feels more responsive when the highlight is immediately visible. Change-Id: Ie3dd0693ecc38f33b001c86970b220b45b37fdfc Reviewed-by: Kai Koehne (cherry picked from commit 0b4e028ec294992df01430bdf978982835c7df5c)
* Renamed declarativeobserver plugin to qmldbg_inspectorThorbjørn Lindeijer2011-05-3162-303/+303
| | | | | | | | | | | | Mainly since it's a good idea to prefix the plugin on Symbian, and at the same time it's now consistency called 'inspector' rather than 'observer'. Symbian .def files will need to be updated. Change-Id: I43071331c8002f8844efd14105d01c730d97e946 Reviewed-by: Kai Koehne (cherry picked from commit 206ebd5af21d94c3f3b49d2cb645105a63e6f5fb)
* Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarativeMartin Jones2011-05-313-43/+41
|\ | | | | | | | | | | | | Conflicts: src/declarative/debugger/qpacketprotocol.cpp Change-Id: I61f500a08ce73def34c093344bfdad44a6c9a6f1
| * QmlDebugger: adding slots to items in Live PreviewChristiaan Janssen2011-05-302-3/+5
| | | | | | | | | | | | Reviewed-by: Kai Koehne (reapplied commit 89d9b83aa26db4f528250c3fe4716b81955c6929 from qtcreator)
| * QmlDebugger: parsing packets iteratively in the communication protocolChristiaan Janssen2011-05-301-37/+35
| | | | | | | | | | | | Reviewed-by: Kai Koehne (reapplied commit fea13a449c59690ae7b7f43aa64f50c0a290a2cf from qtcreator)
* | Merge branch 'qtquick2'Martin Jones2011-05-31425-8193/+91438
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/flickr/common/Progress.qml demos/declarative/flickr/common/RssModel.qml demos/declarative/flickr/common/ScrollBar.qml demos/declarative/flickr/common/Slider.qml demos/declarative/flickr/mobile/Button.qml demos/declarative/flickr/mobile/GridDelegate.qml demos/declarative/flickr/mobile/ImageDetails.qml demos/declarative/flickr/mobile/ListDelegate.qml demos/declarative/flickr/mobile/TitleBar.qml demos/declarative/flickr/mobile/ToolBar.qml demos/declarative/webbrowser/content/Button.qml demos/declarative/webbrowser/content/FlickableWebView.qml demos/declarative/webbrowser/content/Header.qml demos/declarative/webbrowser/content/ScrollBar.qml demos/declarative/webbrowser/content/UrlInput.qml demos/declarative/webbrowser/webbrowser.qml doc/src/snippets/declarative/mousearea/mousearea-snippet.qml examples/declarative/modelviews/webview/newwindows/qml/alerts.html examples/declarative/modelviews/webview/newwindows/qml/content/Mapping/map.html examples/declarative/modelviews/webview/newwindows/qml/content/pics/cancel.png examples/declarative/modelviews/webview/newwindows/qml/content/pics/ok.png examples/declarative/modelviews/webview/newwindows/qml/newwindows.html src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/qml/qdeclarativecompiledbindings.cpp src/declarative/qml/qdeclarativecompiledbindings_p.h src/declarative/qml/qdeclarativedom.cpp src/declarative/qml/qdeclarativedom_p.h src/declarative/qml/qdeclarativedom_p_p.h src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativetypeloader.cpp src/imports/particles/particles.cpp tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp tests/auto/declarative/qmlvisual/qdeclarativeflickable/data/flickable-horizontal.4.png tests/auto/declarative/qmlvisual/qdeclarativepathview/data/test-pathview.6.png tests/auto/declarative/qmlvisual/qdeclarativepositioners/data/usingRepeater.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.0.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.1.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.2.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.3.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.4.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.5.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.6.png tests/auto/declarative/qmlvisual/qdeclarativespringanimation/data/follow.7.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-MAC/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/align/data-X11/multilineAlign.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/baseline/data-X11/parentanchor.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-MAC/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/data-X11/qtbug_14865.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/elide2.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.1.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.2.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.3.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.4.png tests/auto/declarative/qmlvisual/qdeclarativetext/elide/data-X11/multilength.5.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-MAC/plaintext3.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/plaintext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext.0.png tests/auto/declarative/qmlvisual/qdeclarativetext/font/data-X11/richtext2.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.8.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.5.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-MAC/wrap.6.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.0.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.1.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.2.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.3.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/qt-669.4.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.10.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.11.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.12.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.7.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/usingMultilineEdit.9.png tests/auto/declarative/qmlvisual/qdeclarativetextedit/data-X11/wrap.7.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.0.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.1.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-MAC/echoMode.2.png tests/auto/declarative/qmlvisual/qdeclarativetextinput/data-X11/usingLineEdit.11.png tests/auto/declarative/qmlvisual/tst_qmlvisual.cpp Change-Id: I40df8a9403a58a6c03a0f1734f16a5cbed6c85ff
| * Export more VisualModel symbolsAlan Alpert2011-05-311-2/+2
| |
| * fix shadow build errorCharles Yin2011-05-301-0/+4
| | | | | | | | Change-Id: I68c8edac98389c487c1ac09bb74d43fdeb85cdc3
| * Compile fix.Kim Motoyoshi Kalland2011-05-301-4/+0
| |
| * Compile.Kim Motoyoshi Kalland2011-05-301-2/+2
| |
| * Update SG items with recent GV item changes.Martin Jones2011-05-304-11/+31
| | | | | | | | Change-Id: Ib9cadea91ab3717bee0caf2071102a100e81969d
| * ListView segmentation fault when setting highlight to nullMartin Jones2011-05-303-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Setting view highlight to null due to focus change caused a crash since graphicsview accessed the highlight item after it had been deleted. Remove highlight item from scene and deleteLater(), as is done for delegates. Change-Id: I5bfd59095aca90d3adca805bc4f61c92c192ee1b Task-number: QTBUG-19509 Reviewed-by: Bea Lam (cherry picked from commit b9d5cb9334e7d9da71af169802a01f8d344151a7)
| * QDeclarativeMouseArea: block context menu eventsCaio Marcelo de Oliveira Filho2011-05-302-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the MouseArea accepts the same button used to trigger a context menu event, it should not let the event to be delivered to item behind. This is important for items that do implement contextMenuEvent(), like QDeclarativeWebView. When there's a mouse area on top of this item and that accepts the right click (in Linux), the event was still being delivered and the WebView menu was incorrectly appearing. QtWebKit bug https://bugs.webkit.org/show_bug.cgi?id=56526 documents this problem. Change-Id: I386fac6c96f47b8616e2eeb7e5f97043ba418980 Merge-request: 1185 Reviewed-by: Martin Jones <martin.jones@nokia.com> (cherry picked from commit 80db0a1e59658f9e445219fc48d9236a79edca72)
| * ListViews loses items if all visible items are removed.Martin Jones2011-05-301-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Occurs when at end of list and all visible items are removed in multiple steps, without entering the event loop. We were not updating visibleIndex if there were no visible items when handling itemsRemoved(). Also avoid skipping items in refill if there are no valid visible items for reference. Change-Id: I2ff58fb191f6b053f33d5446220d597eb15b66d4 Task-number: QTBUG-19198 Reviewed-by: Bea Lam (cherry picked from commit 576d577438f1193bbc934e904b809d5b23b8d54e)
| * Views do not notify count changes properlyMartin Jones2011-05-303-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | The views don't have a valid count until both a model and a delegate are provided. But, countChanged() is not called when a delegate is set after the model, so bindings to count were not evaluated. Also test that count is updated for insertion/removal Change-Id: Ic82039a624c02f0bdb2862ac7a6e215df75bb314 Task-number: QTBUG-19037 Reviewed-by: Bea Lam (cherry picked from commit 4fbcb6a531bf424a8dbbbd0ca2947d9e15118885)
| * Uninitialized memory is compared.Martin Jones2011-05-302-0/+4
| | | | | | | | | | | | | | | | | | | | | | Memory is allocated and used without first clearing it. At the least this annoys valgrind, but also has potential for real problems. Change-Id: Icf3fd39f44ee0481dd732510e7f8b3ad6cef477d Task-number: QTBUG-15187 Reviewed-by: Aaron Kennedy (cherry picked from commit 95aa4e4f9b82c3652ffc93310b190db869d491df)
| * Clear the root index when the model is reset.Girish Ramakrishnan2011-05-301-0/+5
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-18839 Change-Id: I46608d7481d820fa74a9be60df1e018e70a761c6 Merge-request: 2598 Reviewed-by: Martin Jones <martin.jones@nokia.com> (cherry picked from commit f6b7ce204ee88be0fedb4cfcff382f208fa4ed33)
| * copy other .qml .js files during build timeCharles Yin2011-05-301-4/+21
| | | | | | | | Change-Id: I08db54c7cd5d2ae7bbad28440cc36f6332a190c9
| * Export QSGVisualItemModelAlan Alpert2011-05-301-1/+1
| | | | | | | | Necessary for DataParticles.
| * Revert "Make QSGTextNode back-end for QML's TextInput"Martin Jones2011-05-275-374/+47
| | | | | | | | This reverts commit e430f1336881850a73a54a291e0276160d568212.
| * Textures not scheduled for deletion while scrolling QML view.Bjørn Erik Nilsen2011-05-261-0/+4
| | | | | | | | | | | | | | | | | | | | This happened when scrolling a view using an Image delegate (containing QSGTexture). All textures were deleted at exit, but it is important to immediately schedule the texture for deletion whenever the delegate is destroyed to avoid unnecessary high memory consumption. Task-number: QTBUG-19511 Reviewed-by: gunnar
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 14:43:51 +0000