aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix error in qdeclarativeecmascript autotest.Jason McDonald2012-02-091-5/+2
| | | | | | | | | | | | The test did not correctly ignore warning messages, but instead ignored too many messages for one data row and too few for another data row. This error was exposed when testlib was changed in qtbase commit d9e35e2884cc75969f0eb860082ea11f8bb95a64 to be more strict with checking that all ignored messages are correctly produced. Task-number: QTBUG-24156 Change-Id: Iae73fb26bda83317256c504a8cb3d45783444f66 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* UI improvement for TwitterFriends exampleDamian Jansen2012-02-091-8/+22
| | | | | | | | Remove need to erase pre-existing text in TextInput More likeable input field Change-Id: I253c0a871079ebedecb96a4b2e27998e82cb10c2 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Fix warnings reported by clang.Michael Brasser2012-02-094-8/+9
| | | | | Change-Id: Ifa850c2848c61319cb2465d7fcfffc7fef630923 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Don't crash if focus issues arise.Alan Alpert2012-02-091-0/+2
| | | | | | | | The test has some strict focus requirements, but if they are not met then the test should FAIL with a bit of explanation instead of crash. Change-Id: I796e8a8092833f3413b3dc98a22466575dfe241d Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Rewrite multiline strings properlyAlan Alpert2012-02-099-13/+182
| | | | | | | | | | | | | | | | Because the bindings rewriter works on code strings, it would leave multiline strings across multiple lines (which is illegal in ECMAScript. It now manually breaks them up when it sees them, by replacing a \n character with a literal \n. Since RewriteSignalHandler now likes to have the AST passed in too, the related method in QDeclarativeCompiler (and its customers) have been altered to use the QDeclarativeScript::Value instead of just a string. Task-number: QTBUG-23387 Change-Id: Id060de37e70590c9da2a902038ed02d948fdd70f Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* qmltest: Perform extra checks after each data row is executed.Jason McDonald2012-02-094-1/+11
| | | | | | | | | Add calls to the new function QTestResult::finishedCurrentTestData() to verify that expected failures and expected messages have been produced. Change-Id: Ia139a962c705a5f47be992b7f2e81775aa2e2f28 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Add missing interface declarationCharles Yin2012-02-081-0/+2
| | | | | Change-Id: I18774f01b78f160b53c3ee96f1fe3a4cc8ce4950 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update documentation on QJSEngine::newQObject to match implementation.Jamey Hicks2012-02-081-1/+1
| | | | | Change-Id: Id38244dd78b7d562dad14e08555fb55d2e0815fa Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Use a singleton for the plugin.Gunnar Sletta2012-02-081-8/+8
| | | | | | | | | | The factory is created from the QQuickCanvas constructor before any alternative threads are started and doesn't need this kind of protected. In addition this caused problems on shutdown if multiple custom contexts where created. Change-Id: Ifdd9bde0c65aa7c399722aea33af78087a2465b4 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* CodeCoverage: Fix wrong type passed to saveCoverageTool.Caroline Chao2012-02-081-1/+1
| | | | | | | Passing a bool as appropriate. Change-Id: I0dcca8d30c6d75e7fcddcf7047e1dd1c572ec6ea Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Switch to QMetaType::TypeAlan Alpert2012-02-081-12/+15
| | | | | | | | Looks like this change was made to QVariant for Qt5, slight behavioural difference because floats are now a separate case. Change-Id: Ia9d420b03454c13c97515ab9c89b743a668b37e2 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Provide determinant accessor in render state structure.Glenn Watson2012-02-086-1/+28
| | | | | | | | | | | This allows custom renderers to set the determinant to a value different than the actual model view transform matrix. This is useful when parts of the scene node transformation are done on the CPU rather than in the vertex shader. Change-Id: Icf26a5922b0933275a61af4656cf842bf61e70d5 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Disable broken testGunnar Sletta2012-02-081-0/+2
| | | | | Change-Id: I3588153c37ef3d2ced43dba308502dd06428e0a6 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Added QQuickCanvas::setRenderTarget(uint fbo, const QSize &size)Gunnar Sletta2012-02-087-7/+85
| | | | | | | This allows to hook in non-QOpenGLFrameBufferObject FBO's also Change-Id: I8a2f8f7f15d5a92262bdbb0507b232d7c11fdf25 Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
* Accept default targets for transitionsBea Lam2012-02-088-39/+76
| | | | | | | | | | | | QDeclarativeAbstractAnimation::transition(), QDeclarativeTransition::prepare() and QDeclarativeTransitionManager now accept a QObject* to specify a default target for a transition. For view transitions, this will allow the view to pass a view item as the default target for a view transition so that the Transition does not have to explicitly set the target for every animation. Change-Id: I2c8d5535283335e139d98ef56f399f338627fb3e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Don't hide virtual method.Michael Brasser2012-02-084-16/+16
| | | | | | Task-number: QTBUG-20994 Change-Id: Iaeeb23ed758ef52e0a3a61c4310aafec383e8a28 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Let Item.layer.samplerName be a QByteArray instead of QString.Kim Motoyoshi Kalland2012-02-072-10/+10
| | | | | | | | Both Qt's property system and OpenGL shaders use 8-bit characters, so there is no need to use a QString for samplerName. Change-Id: I8cc29c74adb5d71a34cc99d9ecebbbba8b554cdf Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Allow Item components to be assigned to Item.layer.effect.Kim Motoyoshi Kalland2012-02-076-5/+81
| | | | | | | | | Some complex effects are easier to implement as Items using ShaderEffects internally rather than with a top-level ShaderEffect. Auto-tests added. Change-Id: I4b99811b87e7ca5054bf119b99207b7f5a7c666e Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Initialize value.Michael Brasser2012-02-071-1/+1
| | | | | Change-Id: Ibfb045827a38021fcfa43e735823ad346c5c066c Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Resolve StyledText img tags relative to baseUrl.Andrew den Exter2012-02-075-9/+106
| | | | | Change-Id: I954195d52330c65e851b7c0fcdb6c8dabf29335d Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Fixed some Item.layer bugs and added auto-tests.Kim Motoyoshi Kalland2012-02-079-45/+362
| | | | | Change-Id: I3f66f911d1c499c37a66904f8ddab6951ba85e60 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Mark constructor of QJSValue as deletable.Jędrzej Nowacki2012-02-072-11/+2
| | | | | | | This constructor is there only to force compile time error. Change-Id: Ia2e059e0c7fa516949a166da8856543a5608d217 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Separate out some of the common test codeBea Lam2012-02-0725-1205/+858
| | | | | | | | | Moves findItem, findItems() etc. into shared/visualtestutil.h and moves duplicate list model test classes and other common view-specific code into shared/viewtestutil.h. Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add additional animation autotests.Michael Brasser2012-02-074-1/+279
| | | | | Change-Id: I11894325e73b8bb5b6ece4c626b15bd1d099f229 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Avoid recursive parent chains in QQuickItemGunnar Sletta2012-02-071-0/+11
| | | | | Change-Id: I47b666cfacd804c4302236f0a4b371ca7b382c3d Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Fix example to clear rect before painting.Michael Brasser2012-02-071-0/+1
| | | | | Change-Id: Iecefc9bb38957ec463edb575f4495275aae7c57e Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Add contentWidth and contentHeight properties to Text elements.Andrew den Exter2012-02-0711-145/+289
| | | | | | | | | | | For Text and TextEdit this is a rename of paintedWidth and paintedHeight both of which remain as synonyms of the content properties for compatability. For TextInput this is a new property. Task-number: QTBUG-23691 Task-number: QTBUG-15160 Change-Id: Idbdc72fad34922be21b649ca45fc39b5e533ed1a Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Add and use new animation backend.Michael Brasser2012-02-0765-802/+7407
| | | | | | | | | The new backend improves performance, and allows us to create multiple running animation jobs from a single Transition. It is based off of the existing Qt animation framework. Change-Id: Id1d0162f6e5c65bf31267f3f9f2042c354375d57 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Remove warnings with clangYann Bodson2012-02-0712-16/+22
| | | | | Change-Id: I924f0adc036b47e2342bf383d308c6a5269c2de6 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update test files to API changesAlan Alpert2012-02-073-4/+4
| | | | | | | | API changes are being managed, but the test files shouldn't be triggering the warning. Change-Id: Ifd6c0c08be9979d72f98eb6a1df07daf9302772e Reviewed-by: Martin Jones <martin.jones@nokia.com>
* More fixes for QDeclarativeListModelWorkerAgent cleanupCharles Yin2012-02-071-1/+2
| | | | | | | | | 1) Use deleteLater() instead of delete to avoid crashing with any pending events 2) During event processing, return earlier if possible Change-Id: Ia7d6c95acf1175a16b80e952b95909bb5bbc9433 Reviewed-by: Glenn Watson <glenn.watson@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix symbol clashAlan Alpert2012-02-072-16/+15
| | | | | | | | SpriteImage and ImageParticle are now in the same library, need different internal class names. Change-Id: Ic32fafb729818a6114fe454e7288fbf00fd6a1e7 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Ensure Flickable moving and flicking properties are correct.Martin Jones2012-02-072-7/+58
| | | | | | | | | Flicking, then touching to stop the flick should set flicking property to false. Moving or flicking vertically should not set flickingHorizontally, and vise-versa. Change-Id: Iee42a92ffff2707f0691ffa285dec514b47c9986 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Section header is not made visible when changing currentIndex.Martin Jones2012-02-072-3/+12
| | | | | | | | | Make section header visible when setting currentIndex to an item on a section boundary. Could also affect initial position if view size started at 0. Change-Id: Ie65f91826311d34a290d369d8956f1c88f7efb70 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Remove pixmap text caching in QML text elementYann Bodson2012-02-073-333/+35
| | | | | | Task-number: QTBUG-24033 Change-Id: Ifa24482b98536300c2f4c643a86517a019de8a84 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix truncation and incorrect formatting of RichText.Andrew den Exter2012-02-071-1/+1
| | | | | | | | | Update the text position when adding text. Task-number: QTBUG-23981 Change-Id: I4a10916559745e8df805b1f8563522341bc6f69b Reviewed-by: Yann Bodson <yann.bodson@nokia.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* Homogenize examplesAlan Alpert2012-02-0627-5/+431
| | | | | | | | Several groups of examples are now organized like the other Qt examples, with a project file, doc entry, and single launch point. Change-Id: I2fd957c00e0d1121ebe47c806e54e6999425d1d3 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix acceptance of unhandled mouse events.Simon Hausmann2012-02-062-1/+44
| | | | | | | | | | | | Mouse events not handled by the canvas need to be ignored, in order for features like touch synthetization to work. In case of the initially delivered mouse press event, the canvas did not ignore the event if it was not handled. This patch corrects that and adds an auto-test to verify the new behaviour. Change-Id: I8499701f5a161ce1e90a70303aa7ca4ccf2f0b6f Reviewed-by: Andras Becsi <andras.becsi@nokia.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Warnings in the before/afterRender docsGunnar Sletta2012-02-061-4/+11
| | | | | Change-Id: I2311e574b45d518893ef868fdcf51053dc43bb13 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Don't start timers in the QDeclarativePixmapStore destructorTor Arne Vestbø2012-02-061-0/+5
| | | | | | | | | | Timers use global static data, which might have been torn down at the point where we start the timer. Change-Id: Id11de05ae92b9a3652f9b1d7c3d5ca4947ffe065 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Fix updating text color in Text elementEskil Abrahamsen Blomfeldt2012-02-061-1/+3
| | | | | | | | | | The setColor() function in QQuickText calls markDirty() which did not specify that the whole paint node should be updated, so color updates would have no effect until something else changed. Change-Id: I93741b6c697f2dd6ad5a315250502a7a6e3ce1d7 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com> Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix vertical offset of TextInput.positionToRectangle.Andrew den Exter2012-02-062-4/+58
| | | | | | | | | Offset the y value of the rectangle by the vertical scroll and line offset. Task-number: QTBUG-23934 Change-Id: I43815b480f43a089a9a03b0aec32dfc0598b6154 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix TextEdit vertical alignment.Andrew den Exter2012-02-063-3/+28
| | | | | | | | | | Don't ignore the position of a QTextDocument when contructing a text node, and translate the rectangle returned by positionToRectangle by the y offset. Task-number: QTBUG-23935 Change-Id: I55a2b69a32a8b623be7e36de54ad083c2f8591e5 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add support for resizing fonts to fit Text dimensions.Andrew den Exter2012-02-066-166/+1000
| | | | | | | | | | | This adds a mode where if the content of a Text item doesn't fit within its bounds the font size is reduced during layout until it does or a minimum font size is reached. Task-number: QTBUG-22832 Change-Id: I6198ef03899e2f21b32e313548966ef4b0e3bff1 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Fix some QJSValue test failures.Glenn Watson2012-02-061-2/+10
| | | | | | | | | | | Fix precision issues causing test failures on platforms where qreal is defined as single precision. Also use explicit casts to ensure well defined behaviour when converting a negative double value to an unsigned integer. Change-Id: Ia0048bf83169d3b617f70828f86368c23f4f3786 Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix incorrect ref count with dynamic roles on worker thread.Glenn Watson2012-02-061-0/+3
| | | | | | | | | | When using the dynamic roles mode from a worker script thread, the reference count for the list model worker agent was not being incremented correctly, causing the final release of the agent to be reading from memory that had already been freed. Change-Id: I06d8e363c95133c1c162f32e1efb2d4020ed96be Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add a grouping examples launcher for animation examplesAlan Alpert2012-02-066-0/+286
| | | | | | | | | | | Components are designed to be reusable, so that other categories might use them to create grouping launchers. Single grouped launchers fit better into the Qt examples style that QtCreator and qdoc are expecting. Change-Id: Ia6935394caa1856aa8cc105746dd3d30fd0b8c7c Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove SVG use from exampleAlan Alpert2012-02-064-136/+2
| | | | | | | | With the SVG module now an optional dependency, examples that don't need SVG shouldn't use them. Change-Id: I17ad57dec6982e78090904d1514e28233c354b5b Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Update BearWhack spritesAlan Alpert2012-02-061-3/+3
| | | | | | | Missed the API change on duration Change-Id: I64abcdad3f0e9554f797868761a06b9ed8662762 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Teach build system tst_qdeclarativepixmapcache needs QtConcurrentAlan Alpert2012-02-061-0/+3
| | | | | | | So if QtConcurrent is disabled, this test should be too. Change-Id: Ib4c6a952f73fc21bb201cf6017cd3e73732fbe7b Reviewed-by: Glenn Watson <glenn.watson@nokia.com>