aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Collapse)AuthorAgeFilesLines
* PathAnimation updates.Michael Brasser2011-09-193-22/+30
| | | | | | | | | | Allow smooth orientation changes, smooth interruptions, and implicit "from" in PathAnimation. Change-Id: I2191f6df89ec25d78b1d498827281803a07129c9 Reviewed-on: http://codereview.qt-project.org/4378 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove some unused includes.Jędrzej Nowacki2011-09-151-1/+0
| | | | | | | Change-Id: I5090b0d3c88f3c972b1f1d2a56a954138f8d02ca Reviewed-on: http://codereview.qt-project.org/4283 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-1211-87/+2015
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * Only fast-foward states when there is a transition.Michael Brasser2011-09-091-2/+5
| | | | | | | | | | | | | | | | | | | | Fast-forwarding is only required when we are animating a state change. Task-number: QTBUG-16662 Change-Id: I20e1a056cb3268b92b606be34809bcd0e2bfb898 Reviewed-on: http://codereview.qt-project.org/4390 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Add new path functionality.Michael Brasser2011-09-088-70/+1708
| | | | | | | | | | | | | | | | | | Introduces new elements PathCurve, PathArc, PathSvg, PathAnimation, and PathInterpolator. Change-Id: I0f5b6284511f332e826ed373018418d2e2a8c07e Reviewed-on: http://codereview.qt-project.org/4220 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * more fixes for QTBUG-17868Charles Yin2011-09-061-7/+21
| | | | | | | | | | | | | | | | | | | | | | QDeclarativePropertyCache bypasses the previous fix, need to check the property name when property cache try to create property. Change-Id: Ibccc02df568a8ded3626bb914150ba9ee87d238f Task-number:QTBUG-17868 Reviewed-on: http://codereview.qt.nokia.com/4230 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Improvements to textFormat: Text.StyledTextYann Bodson2011-09-061-8/+281
| | | | | | | | | | | | | | | | | | | | | | | | | | Add support for: - <h1> to <h6> headers - <p> paragraph - <u> underlined text - <a> anchor - <ol> <ul> <li> ordered and unordered lists (including type attribute) Change-Id: I187e740caf19aedc46f2ab15565190ef9c40acd0 Reviewed-on: http://codereview.qt.nokia.com/3840 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* | Remove the remaining dependencies onto QtWidgetsLars Knoll2011-09-014-10/+8
| | | | | | | | | | | | Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8 Reviewed-on: http://codereview.qt.nokia.com/3992 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Fix export symbols for QtDeclarative and QtQuick1.Friedemann Kleint2011-08-311-8/+8
| | | | | | | | | | | | | | | | | | | | | | Fix build on Windows and compiler warnings. Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase. Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019 Reviewed-on: http://codereview.qt.nokia.com/3988 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-317-41/+31
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/v8 src/declarative/declarative.pro src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgshadereffectsource_p.h src/declarative/items/qsgview.cpp src/declarative/particles/qsgcustomparticle.cpp src/imports/gestures/gestures.pro src/imports/particles/particles.pro src/plugins/qmltooling/qmldbg_inspector/qmldbg_inspector.pro src/qtquick1/qtquick1.pro tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsglistview/qsglistview.pro tests/auto/qtquick1/qdeclarativeviewer/qdeclarativeviewer.pro Change-Id: I423344f83e1835116cad531b877fde6e68a8849a
| * Support QT_TRID_NOOP in ListElement.Michael Brasser2011-08-311-2/+2
| | | | | | | | | | | | | | | | Task-number: QTBUG-21070 Change-Id: I91f68467ed96c89fe18726372348ebe809099f60 Reviewed-on: http://codereview.qt.nokia.com/3906 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Move all QML file parsing into the QDeclarativeScript namespaceAaron Kennedy2011-08-303-19/+19
| | | | | | | | | | | | Change-Id: I5969686a796cbfb2eeb3729014df7f01e51b0620 Reviewed-on: http://codereview.qt.nokia.com/3797 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Compile.Roberto Raggi2011-08-301-3/+3
| | | | | | | | | | | | | | Change-Id: Id8af2a65e54317a9300289a034c042d59b2c69bd Reviewed-on: http://codereview.qt.nokia.com/3776 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Don't unnecessarily construct QMetaPropertysAaron Kennedy2011-08-301-1/+1
| | | | | | | | | | | | | | | | | | As we store everything as a QDeclarativePropertyCache::Data internally anyway, operate exclusively against this structure. Change-Id: Id963bc001ce56ebf07b9b13082bb082d5d93ddd2 Reviewed-on: http://codereview.qt.nokia.com/3753 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Use the optimized QDeclarativeExpression constructor where possible.Michael Brasser2011-08-292-12/+4
| | | | | | | | | | | | | | | | | | | | | | Pass in the QDeclarativeScriptString directly, to make use of the precompiled binding. Also does some minor cleanup of the related internal implementation. Change-Id: I4b199298c9da3ee11c51c9c98b384c8324f62c26 Reviewed-on: http://codereview.qt.nokia.com/3696 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Remove unnecessary code.Michael Brasser2011-08-291-5/+2
| | | | | | | | | | | | | | | | | | | | QT_NO_LOCALFILE_OPTIMIZED_QML should never be defined, and we don't need to manually resolve urls coming from QML. Change-Id: I7cdeb2814385bcb9d6004ab43686f65d388620eb Reviewed-on: http://codereview.qt.nokia.com/3684 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Fix memory leak in ListModel custom parserBea Lam2011-08-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | ModelNodes created by the parser for ListElement definitions were not deleted. (cherry picked from commit c1491c356f3cca92a359468ce37f38bc1873eec4) Task-number: QTBUG-21084 Change-Id: Ic55a054bb8e30cdabd11080e4f827df5deb1a014 Reviewed-on: http://codereview.qt.nokia.com/3567 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | Get declarative running on new gui/opengl stack.Samuel Rødal2011-08-291-1/+2
| | | | | | | | | | | | | | | | | | Rename QGuiGLContext -> QOpenGLContext, QGL* -> QOpenGL*, etc. Change-Id: I08379029d756e28b20ae141ca30ed801626b513d Reviewed-on: http://codereview.qt.nokia.com/3711 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-2529-710/+909
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgitem.cpp src/declarative/items/qsgtextnode.cpp tests/auto/declarative/examples/examples.pro tools/qmlviewer/qmlviewer.pro Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
| * Always disconnect signals on aborted reply objectsBea Lam2011-08-221-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reload() did not disconnect the model from an aborted reply's signals, and if it received a finished() signal from the aborted reply it crashed when trying to access the deleted d->reply. Task-number: QTBUG-20842 (cherry-picked from commit d3599ab224f00915045562562c7fd4d6b9b9aeb4 in 4.8) Change-Id: I09a4b04ccdcf04d0ad19052475376e4d1910b7b9 Reviewed-on: http://codereview.qt.nokia.com/3282 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Internal state class refactoring.Michael Brasser2011-08-197-19/+31
| | | | | | | | | | | | | | Change-Id: I6e5fe3fa4459f99a50e3aa79c3a87106600f083a Reviewed-on: http://codereview.qt.nokia.com/3231 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Add module qualifier to \qmlattachedproperty docsAlan Alpert2011-08-171-1/+1
| | | | | | | | | | | | | | | | | | Was missed by initial script. Change-Id: Ib5e6482f53bda25b516075b52eb71f87b9279655 Reviewed-on: http://codereview.qt.nokia.com/3057 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Fix race condition in processJobs()Bea Lam2011-08-131-19/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't modify list of running jobs when a job is aborted since the job may have just started. Wait till the next time processJobs() is invoked for a new job and discard the aborted job at that time. (cherry picked from commit f55ecc080d0c5eca4e65a235c63ab13867c86874 in 4.8) Task-number: QTBUG-20841 Change-Id: Icb4cd089505c0634d3fec023b52c61bbc878404f Reviewed-on: http://codereview.qt.nokia.com/2837 Reviewed-by: Bea Lam <bea.lam@nokia.com> Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
| * Add documentationAlan Alpert2011-08-0920-180/+180
| | | | | | | | | | | | | | | | | | Copy the documentation back to the scenegraph items, and update it to the new module syntax. Change-Id: I5d030a231f991a209a8593ddb069e1b6cd03580e Reviewed-on: http://codereview.qt.nokia.com/2735 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Revise QDeclarativeChangeSet.Andrew den Exter2011-08-082-398/+413
| | | | | | | | | | | | | | | | | | | | Represent moves as associated Removes and Inserts instead of discrete actions. Add API for applying a set of changes to another change set. Change-Id: Id97c1648c7480023dbfef325150bb81c2fea95c0 Reviewed-on: http://codereview.qt.nokia.com/2720 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Fix outdated license headers.Jason McDonald2011-08-051-2/+2
| | | | | | | | | | | | | | Change-Id: I81fd41433b03b13befe0b5c68ec248ea71e8c235 Reviewed-on: http://codereview.qt.nokia.com/2596 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Improved support for multiple to/from values in Transition.Michael Brasser2011-08-042-0/+6
| | | | | | | | | | | | | | | | | | | | | | Trim the strings (previously "state1,state2" would work, but not "state1, state2", and document the feature. Task-number: QTBUG-14713 Change-Id: Ie0c5f803754751008c3e1bf766f08914f743338f Reviewed-on: http://codereview.qt.nokia.com/2592 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-041-91/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-20629 reports a crash on destruction of XmlListModel when cleaning up the global static for the QDeclarativeXmlQuery object. The fix restructures the internals to be like the threading structure used for QDeclarativePixmapReader which doesn't use a global static. Task-number: QTBUG-20629 Reviewed-by: Martin Jones (cherry picked from commit 422f4e8ec53b917fad09a3e671fd93048dde72ed in qt-qml-staging:master) Change-Id: Ic26164947abab67ec9d8f1ae68c20961e7af8a2b Reviewed-on: http://codereview.qt.nokia.com/2595 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Add enabled property to Transition.Michael Brasser2011-08-043-1/+52
| | | | | | | | | | | | | | | | Task-number: QTBUG-14488 Change-Id: I3619a0d26e99e2c19f50a63013dedc151b07154c Reviewed-on: http://codereview.qt.nokia.com/2591 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Prevent Binding from crashing when its target object is deleted.Michael Brasser2011-08-031-7/+14
| | | | | | | | | | | | | | | | Task-number: QTBUG-20692 Change-Id: Ia9a3d532c45baf01b8c20c7aac9ef373942a75d8 Reviewed-on: http://codereview.qt.nokia.com/2531 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Allow custom parser types to still get signal handlers generatedAlan Alpert2011-08-021-0/+1
| | | | | | | | | | | | | | | | | | Specifically, QDeclarativeListModelParser ought to have this behaviour. Task-number: QTBUG-19763 Change-Id: I9d6ee07d1e17a027b254b87d20d1a93795c55744 Reviewed-on: http://codereview.qt.nokia.com/2431 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-113-9/+16
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/declarative.pro src/imports/gestures/gestures.pro src/imports/inputcontext/inputcontext.pro src/qtquick1/graphicsitems/qdeclarativeitem.cpp src/qtquick1/qtquick1.pro Change-Id: I782be7090d8b6da9c890bc8e778722da93da8037
| * Fix Binding to correctly restore bindings even when a binding loop is involved.Michael Brasser2011-08-011-3/+3
| | | | | | | | | | | | Change-Id: Ie8f9731d9f4834d8b94272ef792dc7ad0235ce78 Reviewed-on: http://codereview.qt.nokia.com/2409 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Correctly pause animation when paused in starting ScriptAction.Michael Brasser2011-08-011-1/+1
| | | | | | | | | | | | | | Task-number: QTBUG-13598 Change-Id: Ibd54f4e014eff301b57451081b7f7b35d1bed740 Reviewed-on: http://codereview.qt.nokia.com/2408 Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Merge the QJSEngine and QJSValue development branch into master.Simon Hausmann2011-07-292-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | This replaces the dependency to QtScript with two new builtin classes QJSValue and QJSEngine. This is still work in progress, development continues now in the master branch. Change-Id: I7f5487feb45c972f25a22b10cc81b9218b9805de Reviewed-on: http://codereview.qt.nokia.com/2299 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * Ensure bindings on pause work correctly.Michael Brasser2011-07-291-0/+8
| | | | | | | | | | | | | | | | | | | | Defer the actual pause, in the same way we defer the actual start. Task-number: QTBUG-19080 Change-Id: I500e5aa6678cbb5321979fda31f60d6d6e19a61e Reviewed-on: http://codereview.qt.nokia.com/2366 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 17:09:43 +0000