qt/qtdeclarative.git/src, branch wip/animation-refactor Qt Declarative (Quick 2) Merge branch 'master' into animation-refactor 2012-01-25T04:43:07+00:00 Michael Brasser michael.brasser@nokia.com 2012-01-25T04:43:07+00:00 c3601a8db91bc777ea859d6a796dfab6a218675e Conflicts: tests/auto/declarative/declarative.pro Change-Id: Ie339be2989fac553d351f3077869f1847367b504 
Conflicts:
	tests/auto/declarative/declarative.pro

Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Animations may be deleted while changing state 2012-01-24T23:11:21+00:00 Bea Lam bea.lam@nokia.com 2012-01-24T07:15:56+00:00 4c97a8091eff18cdff92d4fc5243a88bf57146d3 Move check for deleted animation from setCurrentTime() to setState(). Change-Id: I8160c4cf68f7e7b11185d3190d42e5c375540254 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> 
Move check for deleted animation from setCurrentTime() to setState().

Change-Id: I8160c4cf68f7e7b11185d3190d42e5c375540254
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Allow JS API in modules 2012-01-24T22:18:34+00:00 Matthew Vogt matthew.vogt@nokia.com 2012-01-18T07:12:25+00:00 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b Allow modules to export verisoned javascript code into specified namespaces. Task-number: QTBUG-20857 Change-Id: Ic968c697ba36cbc4535870ed5eed2fe7f01af11d Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> 
Allow modules to export verisoned javascript code into specified
namespaces.

Task-number: QTBUG-20857
Change-Id: Ic968c697ba36cbc4535870ed5eed2fe7f01af11d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Fixed crash in QDeclarativeGridView 2012-01-24T22:18:10+00:00 Martin Jones martin.jones@nokia.com 2012-01-23T03:58:22+00:00 49212ef6d8934a023e6d0a7b778ec25605a8be7a Inserting new items used a different threshold than removing items outside the view in refill. Change-Id: I3712837820a1e1a6af280d33d29bd9e01e559691 Reviewed-by: Bea Lam <bea.lam@nokia.com> 
Inserting new items used a different threshold than removing items
outside the view in refill.

Change-Id: I3712837820a1e1a6af280d33d29bd9e01e559691
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Update for glyphMargin() migration in qtbase 2012-01-24T20:02:17+00:00 Jiang Jiang jiang.jiang@nokia.com 2012-01-23T14:17:21+00:00 7412dc96c6b7cc1a196c4afb06e8b51f7ee04f44 glyphMargin() has been moved from QTextureGlyphCache to QFontEngine in qtbase. Update private API usage for that. Change-Id: Ia74c1387eaad4cb961ca0fe36905254edb351258 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 
glyphMargin() has been moved from QTextureGlyphCache to QFontEngine
in qtbase. Update private API usage for that.

Change-Id: Ia74c1387eaad4cb961ca0fe36905254edb351258
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Adapted QQuickScreenAttached to orientation API changes in QScreen. 2012-01-24T20:01:53+00:00 Samuel Rødal samuel.rodal@nokia.com 2012-01-24T09:04:45+00:00 d2d53dffbc3ba52333e559e2c0391bd73e5b840c Change-Id: Ic2cb008b989780e297f03ddd5bdef466bb230c74 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 
Change-Id: Ic2cb008b989780e297f03ddd5bdef466bb230c74
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Add missing include. 2012-01-24T19:56:42+00:00 Stephen Kelly stephen.kelly@kdab.com 2012-01-12T17:33:43+00:00 40bbc9503b988412202836bc4d10a0a9f645a940 Fixes build after requirement for Q_DECLARE_METATYPE(T*) to be fully defined. In QtBase (4b8ceb41aed352f10d36db5284453f425dbc5f3f) Change-Id: I7ea42ec45797fafdde94ea5b58c6c71640710196 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> 
Fixes build after requirement for Q_DECLARE_METATYPE(T*) to
be fully defined.

In QtBase (4b8ceb41aed352f10d36db5284453f425dbc5f3f)

Change-Id: I7ea42ec45797fafdde94ea5b58c6c71640710196
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Console API: Add console.exception 2012-01-24T13:11:52+00:00 Aurindam Jana aurindam.jana@nokia.com 2012-01-17T13:38:06+00:00 b77ecde410ace1545ac6fdad7466e64e4fc635da console.exception writes a message to the console and prints the JavaScript stack trace at the point where it is called. Change-Id: Idd2ff5982826accae0895db44c7ecf6130338cc7 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> 
console.exception writes a message to the console
and prints the JavaScript stack trace at the point
where it is called.

Change-Id: Idd2ff5982826accae0895db44c7ecf6130338cc7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Console API: Add console.assert 2012-01-24T13:11:52+00:00 Aurindam Jana aurindam.jana@nokia.com 2012-01-17T11:37:07+00:00 b514fecbeae6a4fed9e593ea6405dbeec7fe7883 console.assert tests if an expression is true. If it is false, it writes a message to the console and prints the JavaScript stack trace at that point. Change-Id: I5487552cb8a947e1947914166834e0bdedba3354 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> 
console.assert tests if an expression is true. If it is false,
it writes a message to the console and prints the JavaScript
stack trace at that point.

Change-Id: I5487552cb8a947e1947914166834e0bdedba3354
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Add support for shared glyph cache 2012-01-24T12:03:03+00:00 Eskil Abrahamsen Blomfeldt eskil.abrahamsen-blomfeldt@nokia.com 2011-11-24T12:48:19+00:00 47a5c708bf4e555cb8febef583f32c99f7d8ea1e Use a shared graphics cache to back the distance fields if it is available. Change-Id: Id5e6e7a28e38e349d787e66016b2d0faebc791d7 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> 
Use a shared graphics cache to back the distance fields if
it is available.

Change-Id: Id5e6e7a28e38e349d787e66016b2d0faebc791d7
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>