aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Collapse)AuthorAgeFilesLines
* Build against refactor.Samuel Rødal2011-07-292-2/+2
| | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* Fix alias warnings in QDeclarativeGuardAaron Kennedy2011-07-291-1/+3
| | | | | | | | Task-number: QTBUG-19736 QTBUG-19693 Change-Id: Id3aefe56bc1e33757b8c407f2022b49cc136f00b Reviewed-on: http://codereview.qt.nokia.com/2359 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Correctly set ending path percent if none is provided.Michael Brasser2011-07-291-5/+14
| | | | | | | | Task-number: QTBUG-19818 Change-Id: I5377551d041b593864d56e4449c133deb47d3b45 Reviewed-on: http://codereview.qt.nokia.com/2358 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* XmlListModel.status is Ready right after creation (should be Null)Charles Yin2011-07-291-1/+4
| | | | | | | | | | | And whenever both the source the xml properties are empty, the status should be Null as well. Change-Id: I62936d9389b524833422a871b596b99cc93cc734 Task-number:QTBUG-18724 Reviewed-by:Michael Brasser Reviewed-on: http://codereview.qt.nokia.com/2231 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Support QT_TRANSLATE_NOOP in ListElement.Michael Brasser2011-07-281-2/+27
| | | | | | | | Task-number: QTBUG-16289 Change-Id: I13e6859de185478e2c6c9486d8deeda103dd7b90 Reviewed-on: http://codereview.qt.nokia.com/2238 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Don't jump around when maximumEasingTime is specifiedAaron Kennedy2011-07-282-15/+18
| | | | | | | | | Task-number: QTBUG-20436 Change-Id: I477c42d55e712e141403b3a95d1c9b0685df5f0d Reviewed-on: http://codereview.qt.nokia.com/2240 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Delete scene if you aren't going to use it.Alan Alpert2011-07-282-2/+8
| | | | | | | | | | Also make QDeclarativeOpenMetaObjectType zero its engine when the engine dies, because this was leading to problems when the scene wasn't deleted. Also fixes a few other potential deletion problems. Change-Id: I37fa2d1a0b438a6ea7d8cf4c5c9d0bd869faa959 Reviewed-on: http://codereview.qt.nokia.com/2250 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Update ListModel's internal indexes when items are inserted/removed.Andrew den Exter2011-07-281-0/+15
| | | | | | | | | | | | The changed signals of cached items were being emitted with incorrect indexes if a previous item in the list was inserted or removed, resulting in changes not being reflected in views. Task-number: QTBUG-20286 Change-Id: Id2fb8e2875c6cbd4f2e4d14ef859b7a7a4bac8d9 Reviewed-on: http://codereview.qt.nokia.com/2252 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Fix crash when assigning a list property to transitions.Michael Brasser2011-07-261-1/+34
| | | | | | | | | | | | | | This fixes the crash, but doesn't actually assign any Transitions (the transitions list will now be empty, rather than contain a null Transition object). Correct assignment is a general language issue, and will be fixed separately. Task-number: QTBUG-20227 Change-Id: Ie224d06b1d8bb82d03c5eba378affb7167f08724 Reviewed-by: Alan Alpert Reviewed-on: http://codereview.qt.nokia.com/2152 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add isEmpty() methodBea Lam2011-07-201-0/+4
| | | | | | | Change-Id: Ia0eadcd20b2f14433a7e3a89d97d7a21ec353aa5 Reviewed-on: http://codereview.qt.nokia.com/1628 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-1213-3220/+1274
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove references to demos.Casper van Donderen2011-07-111-1/+1
| | | | | | | Change-Id: I21f935b6de8bdf6a5205f6048cdabf97e16b613a Reviewed-on: http://codereview.qt.nokia.com/1060 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Merge branch 'v8'Aaron Kennedy2011-07-087-263/+318
|\ | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
| * Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Aaron Kennedy2011-06-223-0/+602
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | into v8 Conflicts: src/declarative/items/qsgcontext2d.cpp src/declarative/qml/qdeclarativexmlhttprequest.cpp tests/auto/declarative/declarative.pro tests/auto/declarative/qdeclarativeinstruction/tst_qdeclarativeinstruction.cpp
| * \ Merge branch 'qtquick2' into v8Aaron Kennedy2011-06-101-0/+1
| |\ \
| * | | Remove QtScript code from XmlListModelAaron Kennedy2011-06-092-9/+13
| | | |
| * | | Remove leftover QtScript code from ListModelAaron Kennedy2011-06-094-107/+1
| | | |
| * | | Implement global handle trackingAaron Kennedy2011-06-081-2/+2
| | | | | | | | | | | | | | | | | | | | This makes it easier to track down handles that have been double Dispose()'d. See qv8engine_p.h for details.
| * | | Implement ListModel in V8Aaron Kennedy2011-06-075-154/+309
| | | |
| * | | Merge branch 'master' into v8Michael Brasser2011-06-0763-1092/+1221
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp src/declarative/qml/qdeclarativecontextscriptclass.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/qml/qdeclarativeengine_p.h src/declarative/qml/qdeclarativeglobalscriptclass.cpp src/declarative/qml/qdeclarativeinclude.cpp src/declarative/qml/qdeclarativelistscriptclass.cpp src/declarative/qml/qdeclarativeobjectscriptclass.cpp src/declarative/qml/qdeclarativeobjectscriptclass_p.h src/declarative/qml/qdeclarativetypenamescriptclass.cpp src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
| * | | | Initial V8 integrationAaron Kennedy2011-06-061-0/+2
| | | | |
* | | | | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-082-34/+34
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* | | | Add QDeclarativeChangeSet.Andrew den Exter2011-06-203-0/+602
| |_|/ |/| | | | | | | | | | | | | | Takes a sequence of model changes and reorders and compresses them so that like changes are grouped together and are ordered from start to end. The order is Removed, Inserted, Moved then Changed.
* | | Fix memory leak with AnimatedImage elements.Gunnar Sletta2011-06-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When textures are constructed from pixmaps, we need to store the context they were constructed in so that they may also be cleaned up later. Change-Id: Ibdf5f60b598914d630c622341fae206f46cb9629
* | | Merge branch 'master' into qtquick2Aaron Kennedy2011-06-0963-1094/+1220
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/declarative/qml/qdeclarativeengine.cpp
| * | 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
| * | Renamed declarativeobserver plugin to qmldbg_inspectorThorbjørn Lindeijer2011-05-311-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'qtquick2'Martin Jones2011-05-313-33/+249
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-05-2463-1072/+1072
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* | | | Merge branch 'master' into qtquick2Alan Alpert2011-06-061-1/+4
|\| | | | |_|/ |/| | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativetextinput.cpp src/declarative/qml/qdeclarativeengine.cpp
| * | Moved the QML Observer Service and related functionality into QtThorbjørn Lindeijer2011-05-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This code was previously developed as part of Qt Creator in share/qtcreator/qml/qmljsdebugger/ Moving it into Qt will allow us to simplify the setup required before you can debug QML applications. To avoid adding too much weight to the QtDeclarative module, a declarativeobserver plugin was introduced that contains the QDeclarativeViewObserver and related classes. The QDeclarativeObserverService is just a stub service that loads this plugin once a QML debugging client connects. The plugin implements the QDeclarativeObserverInterface A QJSDebugService was separated out of QJSDebuggerAgent, so that the service can be active while the agent is instantiated lazily. Each QDeclarativeEngine adds itself to the QJSDebugService. Currently only the first one is used when instantiating the agent. QDeclarativeObserverService is hooked into QDeclarativeView, with the view registering itself to the service, allowing the QDeclarativeViewObserver to be created for the view once somebody connects to the service. Again, only the first view is used at the moment. Change-Id: Ib50579c6d24361c2b39528e5556410d3446c2e90 Reviewed-by: Martin Jones Reviewed-by: Michael Brasser (cherry picked from commit 35faeb205843c4f0b921d2b878d2d24962c64664) Fixups squashed into this one: (cherry picked from commit 0abf1dd99eeb252ae10c9f3cd99b64ee0b4d6e72) (cherry picked from commit 894515429397be20670806825099b4b9896d50d6) (cherry picked from commit 7d9f03c87e0e096934583a36340de5446e1d0520) Conflicts: src/plugins/qmltooling/qmltooling.pro src/plugins/qmltooling/tcpserver/qtcpserverconnection.cpp
* | | Fix QDeclarativePixmap not setting its QPixmap.Yoann Lopes2011-06-011-2/+2
| |/ |/| | | | | | | When used with the scenegraph, it was only setting the texture but not the pixmap.
* | 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
* | Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging ↵Gunnar Sletta2011-05-231-1/+1
|\ \ | | | | | | | | | into qtquick2
| * | Fix typo in API: QSGContext::schdelueTextureForCleanup.Bjørn Erik Nilsen2011-05-231-1/+1
| | | | | | | | | | | | Reviewed-by: kim
* | | Don't store texture references after the view has gone awayGunnar Sletta2011-05-232-20/+75
|/ / | | | | | | | | | | | | | | 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.
* | Some of the QML C++ methods should be slots.Martin Jones2011-05-201-1/+3
| | | | | | | | Change-Id: Ib9465cf2a7638d013ce831f49ed0177741c22ab0
* | Improve error message for invalid image provider name.Martin Jones2011-05-121-3/+17
| | | | | | | | Also fix broken qdeclarativeimageprovider test.
* | Merge branch 'master' into qtquick2Gunnar Sletta2011-05-041-0/+2
|\| | | | | | | | | Conflicts: src/imports/particles/particles.pro
| * Define the QT_NO_.... when the module is absant from QT_CONFIGOlivier Goffart2011-05-021-0/+2
| | | | | | | | Task-number: QTMODULARIZATION-38
* | Fix crashing QtQuick 1 Image elements.Martin Jones2011-05-041-2/+2
| |
* | Initial import from qtquick2.Qt by Nokia2011-04-272-30/+171
|/ | | | | Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469
* Initial import from the monolithic Qt.Qt by Nokia2011-04-2764-0/+22426
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-12 19:06:37 +0000