aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update ImageElement examplesAlan Alpert2012-03-0110-46/+214
| | | | | | | | | Now more consistently formed. Required a UI redesign for border image, you now view one at a time, with a selector control. Change-Id: Idf64119b644c1a79779ea0a46412247d6d013cb1 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Reduce size of QQuickTextPrivateYann Bodson2012-03-013-106/+137
| | | | | | | Move less used members to an extra struct lazily allocated Change-Id: I87e464af4b9d29303705dd7e766f734309ed7763 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Fix QQuickDropArea test compilation.Andrew den Exter2012-03-012-37/+40
| | | | | Change-Id: I5feaabe235201af842ca6bc4f3496b1861b06fb9 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Add autotest for QML meta-objectsKent Hansen2012-02-2927-0/+506
| | | | | | | | | This autotest checks that the QMetaObject generated from a QML type can be introspected from C++ (properties, class info, signals and slots). Change-Id: I9a50f138f911690f5c55cd28e5b49f0682450d07 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* FolderListModel: remove widget and QDirModel useMartin Petersson2012-02-297-193/+855
| | | | | | | | | FolderListModel used the obsolete QDirModel internally. Because of this it needed widgets to work. I have made a threaded model instead that use QDir internally. Change-Id: Ibd1267a135ee3c6df7bcde420073866b7a76d0d1 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* QFastMetaBuilder: Generate revision 6 meta-objectsKent Hansen2012-02-291-60/+4
| | | | | | | | | | | Support for old meta-object revisions (<= 6) will be dropped in Qt5. The first, simple step towards revision 7 is to move from rev 4 to 6. Also avoid copy/paste of the flags/types defined in qmetaobject_p.h (in preparation of porting to revision 7). Change-Id: I8ec3ad0811295528303abb5cce86011fc869ec30 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix particle system on windowsAlan Alpert2012-02-291-0/+4
| | | | | | | | To preserve correctness, just use a non-point-sprite performance level on windows until QTBUG-24540 is resolved. Change-Id: I7608fbe21233534fb22c9d352aafae759e68c143 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Make sure positioners remove change listeners for invisible items.Martin Jones2012-02-291-0/+5
| | | | | | | | Children that are invisble weren't having their change listeners removed, which showed illegal accesses on destruction in valgrind. Change-Id: Icae798e773168323781e9ab88b3dae6a5aea0952 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Don't round Text dimensions.Andrew den Exter2012-02-295-29/+26
| | | | | | | | | Painting issues in QtQuick1 meant drawing had to be aligned to pixel boundaries, since this is no longer a problem we should use qreal everywhere. Change-Id: I58e88e10270fa603170f1cedf471bfb53bd89b73 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Avoid unneccessary duplication of string data.Andrew den Exter2012-02-291-3/+11
| | | | | | | | | Check for the existence of new line characters before trying to replace them. There's some redundancy if the characters are found but for single line strings we avoid the detach in replace. Change-Id: I48ccc614601a6f356b3d2e68f617e112c100bbdd Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Add and use a method for querying whether a property is revisioned.Michael Brasser2012-02-293-5/+6
| | | | | | | | Accessor data and the revision are now unioned, so querying the value directly can give incorrect results. Change-Id: I0ba6c53d8bd6b012507bfb32d33dc414348379b0 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Add generic "displaced" transition propertyBea Lam2012-02-2918-72/+887
| | | | | | | | This is the default displaced transition that will be applied if addDisplaced, removeDisplaced or moveDisplaced are not specified (or are disabled). Change-Id: I9356036dc93bd9cb26e64e0b1769228113b74273 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Add missing includeStephen Kelly2012-02-281-0/+2
| | | | | Change-Id: Ifb4b489bb87b7ee8fb2f758da0e00af1e95e410f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Properly cleanup cancelled incubation.Martin Jones2012-02-281-2/+22
| | | | | | | Not all allocations were being destroyed. Change-Id: I2134bb224c58b947cfb990b0af2f6eedfd36da4a Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Separate view transition functionality into new fileBea Lam2012-02-289-921/+1159
| | | | | | | | | | | | | | | | | | Move most of the view transition functionality from qquickitemview* into qquickitemviewtransition*. - Move QQuickViewTransitionAttached - Move QQuickItemViewTransitionManager, rename to QQuickItemViewTransitionJob - Move FxViewItem transition-specific features into new QQuickViewItem - Move transition-specific functions like transitionNextReposition() and canTransition() into QQuickItemViewTransitioner which holds all the transition objects now Also mention in docs that there's no defined order for choosing between multiple matching displaced transitions. Change-Id: I8701c0d40d2af152c5d432a4c8de646854c76ea2 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Examples guidelines have changes slightlyAlan Alpert2012-02-281-3/+3
| | | | | | | Update docs to current thinking. Change-Id: Ide00240f4d779549eebdc81592f3f2104dfd759a Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Move some toys back to examplesAlan Alpert2012-02-2822-1/+4
| | | | | | | | | tvtennis, corkboards and dynamicscene are more examples than demos. clocks and tic-tac-toe are remaining demos for now. Change-Id: I3d9501a4742349a9eb7efdad0d06aa6e7cb02c14 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Update drag and drop examples to new guidelinesAlan Alpert2012-02-289-27/+157
| | | | | Change-Id: Ib09a50015eaf7e79f21ade5df3cbd3b58b89c83d Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
* Rename SpriteImage to SpriteSequenceAlan Alpert2012-02-2824-104/+118
| | | | | | | Also rename Sprite::frames->Sprite::frameCount Change-Id: I2e7a71adc37044fd696ffda2a5da4835725ba3a8 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add AnimatedSpriteAlan Alpert2012-02-2811-7/+1170
| | | | | | | | A simpler sprite image element for the simple usecase. Because sometimes an engine with stochastic capabilities is overkill. Change-Id: I2b76c5d417719e92a548f6266bffd563dc016983 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Move distance field util functions to QtGuiJiang Jiang2012-02-287-2481/+2
| | | | | | | These distance field generation functions have been moved to QtGui. Change-Id: I78d9015c8776717ede2d1299c2ef3787d165e0b9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Fix crash in QDeclarativePixmapStore global static dtorChris Adams2012-02-282-5/+7
| | | | | | | | | | Due to the undefined ordering of global static dtors, the QDPS dtor could run after the texture factories were deleted. Thus, the QDPS dtor cannot call the cost() method of the pixmap data during its destructor, as this could cause a crash. Change-Id: I5d23066dc57e1992cf9d1c13d514f06c431bc752 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Incubators are not async with the threaded renderer.Martin Jones2012-02-2810-28/+66
| | | | | | | | | | | | | The threaded incubator relies on the event loop spinning to signal item updates. This change ensures that the event loop is processed while items are being created and that the render loop is woken if it is sleeping. Also cancel delegate incubation correctly during destruction. Change-Id: Ib5bb55c788411490e0959c75933da587fdfd4b8c Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Correctly set duration and easing for AnchorAnimation.Michael Brasser2012-02-282-0/+17
| | | | | | Task-number: QTBUG-24532 Change-Id: I3aad9cd8281b954896c2c1d44b2dcae68f913928 Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
* Don't create unnecessary shadow dataAlan Alpert2012-02-281-0/+3
| | | | | | | | Shadow data was being made by accident for uninitialized datums, because they had not yet had the ImageParticle set as the datum owner. Change-Id: Ia1d55610d845627cdb9c83bfda1d7ed4c024f703 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Examples refactor rebaseAlan Alpert2012-02-285-1/+0
| | | | | | | | Automatic rebase did not move some new files to where they should have gone. Change-Id: I25515d29d8992acde15db0df1bb5972e35573e60 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Skip c++ examples in sgexamples testAlan Alpert2012-02-271-8/+9
| | | | | | | | They should be tested separately, QTBUG-24516 has been raised to implement this. Change-Id: Ic90bc8327e6c07164ed34b3d02f2612561491ec0 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* QmlProfiler: send v8 profiling started signalChristiaan Janssen2012-02-273-0/+29
| | | | | Change-Id: Ie26bd47c9b79a7f524b9c5bc59146be1ea93761d Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Skip test case for nowBea Lam2012-02-272-0/+4
| | | | | Change-Id: I06128c544c1ee03d4528f6f86fc776e09be87316 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Force to send defer deletion events before deleting QQuickCanvasCharles Yin2012-02-272-1/+3
| | | | | | | | Also change the assert in QDeclarativeEnginePrivate::~QDeclarativeEnginePrivate() to a warning message. Change-Id: Ic1fb7e0b7ffe4a54458a0f3a65127b1afd6dda53 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Don't create a separate section header for currentItemMartin Jones2012-02-276-66/+217
| | | | | | | | | | The currentItem FxViewItem contained it's own section item, which when created would cause the current item delegate to be repositioned. This change associates the section item with the delegate item, via the attached object. Change-Id: Ie675d545539b56d0f1cf5a9b4ea26668978a5e72 Reviewed-by: Bea Lam <bea.lam@nokia.com>
* Check engine equality condition inside null ptr checkChris Adams2012-02-273-2/+27
| | | | | | | | | | | Previously, we asserted if the engine associated with the two external resources from the arguments to the object comparison callback were not equal, prior to checking that the external resources were non-null. Task-number: QTBUG-24489 Change-Id: I4b2bd2377fcf38163d1341e43e056b1405ab72ac Reviewed-by: Yunqiao Yin <charles.yin@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Ensure importing module API in js import worksChris Adams2012-02-273-0/+22
| | | | | | | | This commit adds a unit test to ensure that a property of a module api can be accessed in a JavaScript import. Change-Id: Iecba76a9db0400ece1777256f19803d4bad53438 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Improve test coverage for anchors.Michael Brasser2012-02-272-0/+80
| | | | | Change-Id: I2705407b16ef678ed5b3cbfa7116ae6b18366688 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Stabilise testsBea Lam2012-02-272-14/+14
| | | | | Change-Id: I2227fede52f5b0d59bd0dd9b10ab0151318d61dd Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove unused member.Michael Brasser2012-02-273-6/+3
| | | | | Change-Id: Ibfcc7a78e442c2be5bab6933e2e85ed39344e6c2 Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* Get script benchmark compiling and running.Michael Brasser2012-02-274-107/+262
| | | | | Change-Id: Ifc433f6c430d430bfb8b2d8b47a84ad2688e4cb2 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Build fix when use '-no-stl' optionYuchen Deng2012-02-247-0/+8
| | | | | | | | | | | error C3861: 'toupper': identifier not found error C2065: 'RAND_MAX' : undeclared identifier error C3861: 'rand': identifier not found error C2065: 'RAND_MAX' : undeclared identifier error C3861: 'rand': identifier not found Change-Id: Iaa0daf516c3d9f90d9119f958d79187ee2bb959c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Update license headersAaron Kennedy2012-02-2415-150/+420
| | | | | Change-Id: Id47c6b26ee2ac2b3d30c464adaa55b7a7c3e4442 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* The plugin is cleaned up by the plugin loader so don't double-deleteGunnar Sletta2012-02-241-8/+7
| | | | | Change-Id: I8bac5b6e1960cbc38575c76f02aa6c6c90700331 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Revert resource releasing logic inside window managers.Gunnar Sletta2012-02-242-117/+39
| | | | | | | | | | | | | This was based on the assumption that exposure and visibility would take similar code paths, but this is not the case and the fallout of this change (like not releasing resources at all) is not worth it. This reverts ef6318ae38322b5a4a0619b581924290f114fa74 and most of 5f0013ee76605b9c7ceab168702b57e797b698e0 Change-Id: Ib2e29972502a8ec956cd6bd294a2a2bb50d8e76e Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Start of examples refactorAlan Alpert2012-02-24896-1314/+1302
| | | | | | | | | | | | This is the general reorg of the examples directory structure, plus additional guidelines. calculator, animations and accessibility have been updated to the new standards and tested, as an example. Task-number: QTBUG-24133 Change-Id: I76c3b86751d3195ba2a5474ff23afb875765e9a4 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Add additional autotests for signal handlers.Michael Brasser2012-02-248-1/+44
| | | | | Change-Id: Ie94ce8b536347981310abeb077a88acedf44c7e6 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Allow V8 bindings to assign to value type sub propertiesAaron Kennedy2012-02-241-1/+1
| | | | | | | | This was an overly defensive change because it wasn't clear if the isAlias check would catch aliased value type sub properties. Change-Id: Iee2805d22f281c1fd188b14e265687fd8e7042db Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Use floating point types for position offsets and cursorRectangle.Andrew den Exter2012-02-248-108/+102
| | | | | | | | | Rounding to align painting to pixel boundaries is no longer necessary are largely removed. Correct the few instances remaining in TextEdit and TextInput. Change-Id: Ic6ec57092d74ec43b23d85cd8868e0190acc3e09 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Remove use of QT_ASCII_CAST_WARN_CONSTRUCTOR.Stephen Kelly2012-02-241-1/+1
| | | | | | | Fixes build after I0b4df4c99600cacbaafbf0bc4270cd4978600956 Change-Id: I9cf326b52e0e7e267b8fbc422175713cee9352f5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
* Fix rewrite of multiline string literals.Roberto Raggi2012-02-235-80/+85
| | | | | | | | | | This commits ensures that we don't rewrite `\'-terminated multiline string literals. Also, it fixes the processing of \r characters inside the string literals. Change-Id: If3d7c1b83c7306b9ccb1be31412b6f8e76434c41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Fix crash in instruction dumpAaron Kennedy2012-02-232-4/+4
| | | | | | Change-Id: I2cfa9da120a602b52f401dd304b44cd17c47b220 Reviewed-by: Alan Alpert <alan.alpert@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Use new plugin system in QtDeclarative.Friedemann Kleint2012-02-2355-55/+101
| | | | | | | | - Use prefix "org.qt-project" for interfaces. - Use new macros, add json files. Change-Id: I53df83f95153c5c9c462098584606284470a5ae0 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Remove warning produced by 'parent' reference.Matthew Vogt2012-02-233-9/+54
| | | | | | | | | | | When Qt.createQmlObject is invoked from QML, any contained references to parent produce a warning from V8. To prevent this, move the assignment of the parent object to before the initial execution of the bindings. Task-number: QTBUG-24464 Change-Id: Ib330822f1ca46ec5a6af648a56197da09669c3f2 Reviewed-by: Martin Jones <martin.jones@nokia.com>