aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Multi-line sprite files will now workAlan Alpert2011-05-268-45/+195
| |
| * Revert "uses the cached argument info"Charles Yin2011-05-252-6/+21
| | | | | | | | This reverts commit 68d18d77ebac49c2b863c425969c70c5426864cd.
| * Revert "cache the arguments in property cache data"Charles Yin2011-05-252-33/+3
| | | | | | | | This reverts commit 30327650798ba63281c7b9344c9d824d00dce82a.
| * Implement "mirror" property for BorderImage.Martin Jones2011-05-253-0/+22
| | | | | | | | | | Change-Id: Iee5b252ce1b0d39da42f553cf2ae782ad14d297f Reviewed-by: Gunnar
| * Small optimizations in distance-field cache.Yoann Lopes2011-05-242-13/+17
| |
| * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Gunnar Sletta2011-05-231-0/+9
| |\ | | | | | | | | | into qtquick2
| | * Optimize distance-field glyph recycling.Yoann Lopes2011-05-231-0/+9
| | | | | | | | | | | | | | | Unused glyphs in the cache should not be overwritten if they are immediatly reused after being unreferenced.
| * | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Gunnar Sletta2011-05-2310-54/+377
| |\| | | | | | | | | | into qtquick2
| | * Make QSGTextNode back-end for QML's TextInputEskil Abrahamsen Blomfeldt2011-05-235-47/+374
| | | | | | | | | | | | | | | | | | | | | To get the benefit of different glyph node backends, the TextInput item has now been moved over on SceneGraph's TextNode instead of QPainter, and selections and decorations are painted using QSGSimpleRects.
| | * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-05-236-19/+84
| | |\ | | | | | | | | | | | | into qtquick2
| | | * Fix typo in API: QSGContext::schdelueTextureForCleanup.Bjørn Erik Nilsen2011-05-233-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: kim
| | * | Compile on MacAlan Alpert2011-05-232-4/+0
| | | |
| * | | Set paintNode to 0 after deleting it.Gunnar Sletta2011-05-231-0/+1
| | | | | | | | | | | | | | | | | | | | Otherwise, we will get crashes if we're switching back and froth between ItemHasContent set to true and false.
| * | | Don't store texture references after the view has gone awayGunnar Sletta2011-05-236-30/+98
| | |/ | |/| | | | | | | | | | | | | | | | | | | This is a partial fix only. We will eventually need to get proper sharing of resources across multiple GL contexts, but this fixes the autotest and will work for most usecases. The task QTBUG-19455 has been created to solve it properly.
| * | Support change slots for properties starting with '_'Chris Adams2011-05-231-6/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to ECMA-262r3, property names may begin with a letter, underscore ('_'), dollar sign ('$'), or unicode escape sequence. We previously supported Change slots for properties only if the property name began with a letter; this patch adds support for properties which begin with one or more underscore. Task-number: QTBUG-17950 Reviewed-by: Aaron Kennedy Change-Id: I6f28bde18a38e32c2131e0990fe0f69bda36f90e
| * | Ensure that showDirs is respected in FolderListModelChris Adams2011-05-232-10/+55
| |/ | | | | | | | | | | | | | | | | | | | | | | Calling index() on a QDirModel can modify the filters applied. This patch to FolderListModel ensures that filtering is reset if required, so that programmatically selecting a subfolder in a folder does not cause that subfolder to become visible if showDirs is set to false. Task-number: QTBUG-17837 Reviewed-by: Martin Jones Change-Id: I449321d5170ecedf2a0cb36483d50020305a26dd
| * Remove ModelParticleAlan Alpert2011-05-234-462/+4
| | | | | | | | Nothing is using it anymore, lets keep it that way.
| * Split up ModelParticleAlan Alpert2011-05-239-3/+766
| | | | | | | | | | | | Now has DataParticle (with model and delegate) and an ItemParticle (which you just feed items manually). ModelParticle left for now for damage control - it will probably just disappear someday.
| * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Alan Alpert2011-05-237-85/+89
| |\ | | | | | | | | | into qtquick2
| | * qmltestcase.prf moved to qtbaseCharles Yin2011-05-211-25/+0
| | |
| | * Fixes wrong flipping of textures.Bjørn Erik Nilsen2011-05-201-1/+1
| | | | | | | | | | | | Reviewed-by: Gunnar
| | * Removed virtual type() from QSGNode, member variable instead.Kim Motoyoshi Kalland2011-05-202-26/+41
| | |
| | * Use QDataBuffer instead of QVector in QMLRenderer.Kim Motoyoshi Kalland2011-05-202-32/+41
| | | | | | | | | | | | | | | Using QDataBuffer instead of QVector reduces the number of memory reallocations.
| | * Support 'mirror: true' in SG Image element.Martin Jones2011-05-201-1/+6
| | | | | | | | | | | | Change-Id: Id94e5557e8ebbed4494fb342b87b8b595e01b38b
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 21:46:30 +0000