aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge master <-> api_changesMatthew Vogt2012-03-051107-4207/+51141
|\ | | | | | | Change-Id: Iad2f07b989b25349fd2d4fff010e24dcd5a1688f
| * More documentation about importing LocalStorage module from JavascriptCharles Yin2012-03-051-1/+16
| | | | | | | | | | | | Task-number:QTBUG-24478 Change-Id: Iad0fe15e8b2f1fcfa82b1654c3fd606d08563457 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Profiler: Use RAII helper structs for rangesKai Koehne2012-03-028-92/+180
| | | | | | | | | | | | | | Exclusively use RAII helper structs for ranges. Change-Id: Ief9ab25a9e49e1b2c3c091e5d9de6479e36eaa50 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
| * Fix when animating items that are already movingBea Lam2012-03-026-15/+121
| | | | | | | | | | | | | | | | | | | | The view must transition displaced/moved items that are currently transitioning to another position; check against the current transition-to position, not just the current item position. Task-number: QTBUG-24522 Change-Id: Icf1c290f76ceb8c93716f1562ae0bc5a75445b78 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Use view transitions in drag'n'drop exampleBea Lam2012-03-021-1/+5
| | | | | | | | | | Change-Id: Idc661225acf9e517d26928cafba650ac48ca880a Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Use velocity from touch events only when they are validLaszlo Agocs2012-03-023-8/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the capability flags to the extended mouse events. Otherwise it is not possible to tell if the velocity is valid. While the original version is fine if velocity is guaranteed to be available whenever QT_TRANSLATE_TOUCH_TO_MOUSE is set, some platform and driver combinations, e.g. the evdevtouch plugin that comes with Qt, do not provide velocity data in touch events. The touch-only mode of QML may be very useful in these cases too, we just need to fall back to the built-in velocity calculation. Change-Id: Iec5e7632a66380dc04c9435b09f5c173107bbe00 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Treat parentless items as focus scopesAlan Alpert2012-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | The root item of a tree is implicitly a focus scope simply because it is the root of the tree. QQuickRootItem could gain the focus scope flag in order to solve this for most cases, but there would still be a possiblity of a crash for disconnected trees. Change-Id: I6e04f11df4268fb3b96660d50707d70935a5dc5e Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Add QColor support to v4.Michael Brasser2012-03-0210-1/+151
| | | | | | | | | | | | | | | | Change-Id: I033e92007f894d45695ea48d7f954d534a2fadee Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Return correct propertyIndex for v4 bindings.Michael Brasser2012-03-022-1/+4
| | | | | | | | | | Change-Id: I4aa37491d36331889f6b30c4d4af8b56cef96225 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
| * Improved transitions for Row, Column, Grid, FlowBea Lam2012-03-029-183/+908
| | | | | | | | | | | | | | | | | | | | | | | | | | The view transitions functionality for ListView and GridView has been integrated into the positioner elements. Not all of this functionality is available for positioners, though, since they don't have models (and thus cannot identify certain model operations) and they don't manage the lifetime of their children. Task-number: QTBUG-24336 Change-Id: I71588de289555d2ef5a763af11358bc0af7b31a7 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Fix if transitioner is deleted before transition job finishesBea Lam2012-03-022-62/+111
| | | | | | | | | | | | | | | | | | Don't let TransitionJob call finishedTransition() on a deleted transitioner. Also don't use target transitions that are not enabled. Change-Id: I94d58e8c7b072f7f3d76533956cac2d63ac33ff6 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Correct QDeclarativeInspectorInterface iidMartin Jones2012-03-021-1/+1
| | | | | | | | | | Change-Id: I874c501dc1839712d2da663f13e437e3c7a0e4fe Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
| * V4 handles a maximum of 32 temporary registers.Martin Jones2012-03-022-2/+4
| | | | | | | | | | | | | | Drop back to V8 if there are more than 32 being used. Change-Id: I11f6e84746d897cd9b6789a5e9e4d2848909de00 Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Reenable value type binding auto removal tests.Michael Brasser2012-03-021-2/+2
| | | | | | | | | | Change-Id: I349017bf24f9f2f18024d1257eeaebb348cc8503 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
| * More verbose compiler stats.Michael Brasser2012-03-022-3/+26
| | | | | | | | | | | | | | Report shared and unshared v8 bindings separately. Change-Id: Iaa198dcc93035a778b13d7137742a7b308aa782f Reviewed-by: Chris Adams <christopher.adams@nokia.com>
| * Pin to a working qtbase SHA1Alan Alpert2012-03-021-1/+1
| | | | | | | | | | | | | | | | | | A bug with qmake was introduced which is impeding the compilation of modules we depend on. Use an older qtbase and qmake until this is fixed. Task-number: QTBUG-24608 Change-Id: I7f6f1f383d4c9339e5f4c699cb8900a3b1c776e3 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
| * Profiler: Avoid QString->QUrl->QString conversionKai Koehne2012-03-011-1/+1
| | | | | | | | | | Change-Id: Ib39b94bf6c76638dce96d6cc20a4a8f307e37878 Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
| * Profiler: Remove unused methodKai Koehne2012-03-012-6/+0
| | | | | | | | | | Change-Id: I74ba20b495760034bc714d92bcf016feddf87c2c Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
| * Set bind options before uploading to give hints to the driverGunnar Sletta2012-03-011-1/+2
| | | | | | | | | | | | | | | | This can prevent allocation of unused mipmap levels on some drivers. Change-Id: I2d730c04e120872367078b17a344c01b4d4aa87a Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
| * Avoid unnecessary updates when using in-process cacheEskil Abrahamsen Blomfeldt2012-03-012-5/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an in-process cache is updated, it will emit itemsAvailable() signals to all listening glyph caches. This will in turn cause each of the glyph caches to update and each of the glyph nodes to be preprocessed (the entire scene graph will be updated.) This happens even if the changes to the in-process cache are requested by an external client, due to a cross-process cache sharing mechanism. However, itemsAvailable() signals are only interesting if the items were requested by the in-process cache. We therefore add a mechanism now to check if the glyphs were actually requested by the cache before updating anything. Change-Id: I529f94b3928c2a5e06fec354014fa11d21671057 Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
| * No double click event in QML_TRANSLATE_TOUCH_TO_MOUSE modeMartin Jones2012-03-011-5/+13
| | | | | | | | | | | | | | | | Since double clicks are delivered before the click, the initial grab may not have been established. Change-Id: Id9282489f0551d421da800294e88ead0915482cc Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Fix material compare for distance field glyph nodes.Glenn Watson2012-03-011-1/+5
| | | | | | | | | | | | | | | | | | The compare function did not take into account the GL texture ID when comparing materials. This could result in a renderer merging glyph nodes into a single batch incorrectly. Change-Id: Ib62c43f93fb1bbbc231197323dced4254ffa12aa Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Allow styled text to be elided.Andrew den Exter2012-03-014-283/+314
| | | | | | | | | | | | Task-number: QTBUG-24521 Change-Id: Idd451d0a8a238a60691386726e34054c0368b658 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
| * Update item position in parent change atomically.Andrew den Exter2012-03-011-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Changing x and y individually generates two geometry changed events, the first of which has an invalid position as the x coordinate is relative to the new parent and the y relative to the old parent. This in turn causes the Drag item to send move events with incorrect positions. Task-number: QTBUG-24534 Change-Id: If2636a968acc0fffce21d1a7e51510426ace38a0 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Check item before notifying transition has finishedBea Lam2012-03-011-4/+5
| | | | | | | | | | | | | | Fixes crash when using SmoothedAnimation with view transitions Change-Id: Ib9a201e417c34d64f8144a616e75cae8b67568e2 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
| * Fix crash when transition finishes after view is deletedBea Lam2012-03-011-0/+2
| | | | | | | | | | Change-Id: I5bb525bab735536fa7ae3a7f60bf775cd93cf3c1 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-28 09:32:46 +0000