aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Crash fix after QMetaType change.Jędrzej Nowacki2012-03-136-10/+23
| | | | | | | | QMetaType::UnknownType was added so we can distinguish between "void" and an unregistered type. Change-Id: If8cee21b3f84bf129343dc457d10ab31a9bfc8b8 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Make QFastMetaBuilder generate revision 7 meta-objectsKent Hansen2012-03-137-251/+300
| | | | | | | | | | | | | | | | Support for revision <= 6 will go away in Qt5. This commit updates QFMB to match the latest format generated by moc: - Store string table as an array of QByteArrayData (literals) - Store only the meta-method name, not the full signature - Don't store parameter names as a comma-delimited string - Store explicit information about parameters (count, types, names) Since the meta-data can now hold type ids > 256, there is no need to store the names of property/parameter types at all anymore. Change-Id: I487b14d22b2a92d9e6a9aa4e348f4bab181daff4 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* Adapt to Qt5 meta-object changesKent Hansen2012-03-1315-109/+82
| | | | | | | | | | | | | | | | | | | QMetaMethod::signature() has been renamed to methodSignature(), and it now returns a QByteArray. Also, the new function QMetaMethod::isValid() should be used to determine whether a method is valid, instead of relying on signature() returning a 0 pointer. Where it makes sense, the existing code that was using signature() and parameterTypes() has been changed to use the new API QMetaMethod::name(), parameterCount(), and parameterType(int). Also, in the new meta-object revision (7), the QMetaObject stringdata member is now of type QByteArrayData*. QFastMetaBuilder will be ported to generate the new format, but for now it's sufficient to reinterpret_cast the stringdata assignment to keep it compiling. Change-Id: Ie340ef17bcebc3afa4aae6450dfe2d06e4d881a4 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
* api_changes branch should track qtbase/api_changesKent Hansen2012-03-131-1/+1
| | | | | Change-Id: Ic41027db127bd3cb84a1e8734c016668ec328215 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Declare QQmlError and QQmlProperty as movable types.Andrew den Exter2012-03-132-0/+4
| | | | | | | | | Allows QList among others to use a more optimal allocation strategy for these types. Change-Id: I0a27291cae6d79d9dfc3548da7b3d4e5bc84cce8 Reviewed-by: Michael Brasser <michael.brasser@nokia.com> Reviewed-by: Chris Adams <christopher.adams@nokia.com>
* Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into merge-masterMatthew Vogt2012-03-13106-309/+1016
|\ | | | | | | Change-Id: Iaefec13503dadfa200539b8de7a2d80fc5bb3bcf
| * Speed up view flick tests.Martin Jones2012-03-135-29/+26
| | | | | | | | | | Change-Id: I98b0a45b5afd0150bfacef2c1c1e814f70ae042f Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * testlib: Improve verbose and XPASS outputJason McDonald2012-03-131-12/+6
| | | | | | | | | | | | | | | | Call only the eight-argument version of QTestResult::compare(), as the four-argument version will soon be removed from the API. Change-Id: I9e7b95a30b01fb5e084f2954aeb380b492760484 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * ListView.contentHeight does not include header and footer item heightsMartin Jones2012-03-133-2/+23
| | | | | | | | | | | | | | Task-number: QTBUG-24664 Change-Id: I2a2fe144835e61665b8693d58ca4fb9ba506e8a8 Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Fix leak in tst_qquicklistmodel unit testChris Adams2012-03-131-0/+2
| | | | | | | | | | Change-Id: I6883f263648d425240503f6abbd358b744d68506 Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
| * Displaced items were moving unnecessarilyBea Lam2012-03-136-28/+326
| | | | | | | | | | | | | | | | | | | | | | | | They should only move if they actually change from the last set position, and not if they are simply changing from their current item position, as that is wrong during an animation. This also cleans up some code for resetting the transition data. Task-number: QTBUG-24586 Change-Id: I0a6635903975ebc40d5cf8398b943a9de92d4493 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Improve interaction of nested Flickables and PathViewMartin Jones2012-03-135-18/+43
| | | | | | | | | | | | | | | | | | Don't require a flick to come to a complete stop before allowing another flickable element to begin its gesture. Change-Id: I74c1998e01e04c70c76253cd09edc02f593123d0 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Declare change set and compositor structs as movable primative types.Andrew den Exter2012-03-132-0/+9
| | | | | | | | | | | | | | | | Allows QVector to avoid invoking contructors for these types unnecessarily. Change-Id: Icc8670e4a033c943666f907c7e1b006a3d205597 Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Change repeater item to handle model being deleted.Glenn Watson2012-03-134-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | The repeater item previously stored a raw QObject pointer in a variant. When this pointer was a dynamic list model element that was deleted, the variant would continue to hold a stale pointer. Change repeater to use a guard object to hold the model when it is a QObject. Continue to use a variant to hold models that are not based on QObject to maintain same semantics. Change-Id: Ie100947132923803263c725e86efa68206382f12 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Fix SignalSpy disconnect issueCharles Yin2012-03-131-1/+3
| | | | | | | | | | | | Task-number:QTBUG-21083 Change-Id: Ic61472d886bf7c46eb37dc44b5e5ceb401917087 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Remove the rest of qtquick 1.0 code from qmltestCharles Yin2012-03-133-90/+43
| | | | | | | | | | | | Change-Id: I0d20583faf1a75f287dcd866b11457254d250354 Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * include header correctlyCharles Yin2012-03-131-1/+1
| | | | | | | | | | Change-Id: I462fbcdd2954979fbff92965cc813551773b4118 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Fix for QTBUG-22777. Removed unnecessary check.Gatis Paeglis2012-03-121-1/+1
| | | | | | | | | | Change-Id: I82de9e1d6eb4b8bdb8c90c69e686b700a02f40aa Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Fix v4 nested object access bug.Michael Brasser2012-03-122-4/+4
| | | | | | | | | | | | | | | | | | Use the correct type to look up the sub property. Task-number: QTBUG-24606 Change-Id: Iab372ca7440249241bf855d2875a947ad8fe4527 Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Add additional v4 tests.Michael Brasser2012-03-125-0/+254
| | | | | | | | | | Change-Id: Id33eb50e4a01f3450515f6e666e18cb018f1706e Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Add two argument Math.min and Math.max support to v4.Michael Brasser2012-03-126-0/+70
| | | | | | | | | | Change-Id: I26a4812b76571bf0ae6a0b4bd5d1e2afd64051df Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Add Math.ceil and Math.abs support to v4.Michael Brasser2012-03-126-0/+46
| | | | | | | | | | Change-Id: I23e7c8294abf80914d4529740af6e9124f66c5bf Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Check that canvas is valid.Frederik Gladhorn2012-03-121-1/+1
| | | | | | | | | | | | | | During creation the canvas might not have been set. Change-Id: I7ea8922413e3b6fb4ffd2ed9758c57eea1de02db Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
| * Prefer \b word boundary markersMatthew Vogt2012-03-121-10/+11
| | | | | | | | | | | | | | | | /usr/bin/sed on mac does not process '\<' and '\>' boundary markers correctly. Change-Id: I750f7c69579ddcbe39a6246a3d3321cab714fc27 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
| * tests: enable headersclean also for cross_compile buildsRohan McGovern2012-03-122-7/+1
| | | | | | | | | | | | | | | | This test is no longer a host-only test. Enable it everywhere. Change-Id: Id7e65ad4d6f468b6b65d0f6035934fbd20fcb5e0 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
| * Accessibility: childAt_helper descends too far.Morten Johan Sorvig2012-03-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recursive hit-testing using childAt_helper must stop when it hits a leaf accessibility item. This leaf item might not be a leaf item in Qt Quick - a button contains text and mouse area items not visible to the accessibility system for example. Get the accessible interface and check if it has children before recursing to the child items. Change-Id: I2cc286cde4bce6b4ca340e8a1819edc5f84006a5 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| * Remove unneeded dependencies to QtWidgets and QtOpenGLLars Knoll2012-03-1254-61/+47
| | | | | | | | | | Change-Id: I43bb54524f5786a838073df8812107dda7b0d56e Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| * Fix MouseArea autotest.Laszlo Agocs2012-03-121-4/+9
| | | | | | | | | | | | | | | | | | The hover test seems to be simply wrong. The double click tests worked before due to the obscure handling of double click but were somewhat incorrect in any case. Change-Id: Ie5690e26eb5921fe149e128d24d331f52a5a9075 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| * Fix tst_qquicktextedit.Michael Brasser2012-03-121-0/+4
| | | | | | | | | | | | | | | | | | Recent changes to mouse double-click handling mean that two calls to QTest::mouseClick with the same position will result in a double click, which was causing this test to fail. Change-Id: I21e6aa7ab2221b6ea82b1afd13e36b7ba0aef8dc Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| * Fix double click handler in QQuickItem.Laszlo Agocs2012-03-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | The legacy, desktop-oriented way of calling mousePressed from the default handlers for mouseDoubleClick is not working properly with QWindow and QGuiApplication: In Qt 5 a double click will never suppress any lower level events (like press or release) and therefore simulating a mouse press in the double click handlers is wrong. Change-Id: Ic0ad97a5efbcd3deb1717229010dcb84681d7ed4 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| * Remove pin of qtbase for qtdeclarative.Sergio Ahumada2012-03-121-1/+1
| | | | | | | | | | Change-Id: Ib70a3438d085adbed3a1ca7df81d593c7a512ae0 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| * Skip test that accesses deleted QML engineKent Hansen2012-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | The test is blocking the CI because it crashes on linux/x64. By "luck" it doesn't crash on the other test machines -- valgrind still complains, though. Task-number: QTBUG-24734 Change-Id: I6bc12ca72f8900339bc9139b40cf828aff8e47ba Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Fix flakiness in qquicklistmodel autotestKent Hansen2012-03-121-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | The worker_remove_element test calls processEvents() before calling waitForWorker(). It's possible that the worker actually finishes during the processEvents() call. In such a situation, waitForWorker() should return right away; otherwise it would wait for 10000ms for a signal that had already emitted, and the test would fail. Change-Id: I8e98a3297cf5f360c1c405b1baa7524cc6593d81 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Mark presumed unstable test as insignificant.Lars Knoll2012-03-121-0/+1
| | | | | | | | | | Change-Id: Iea22ae6596c04ba95d59bcb3957bdc3cf9263ae2 Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| * Return early if animationjob was deleted in all callback methods.Charles Yin2012-03-121-6/+9
| | | | | | | | | | Change-Id: I703c8a8904ffd760683de4ee74544dff9eb53144 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Remove undefined method.Stephen Kelly2012-03-121-1/+0
| | | | | | | | | | Change-Id: Id95aebcfc5beac0154db4b1137fc08d5172f3428 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * Make headersclean in qtdeclarative enforce correct header conventions.Rohan McGovern2012-03-113-29/+17
| | | | | | | | | | | | | | | | | | | | | | This test wasn't testing much before. Refactor it to reuse headersclean from qtbase. It will now fail to compile if the headers from this module don't follow the rules. Change-Id: I2816b85543da74f66b993b7ee705cdb9e1c0f1c8 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* | Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into api_changesMatthew Vogt2012-03-12101-1178/+2398
|\| | | | | | | Change-Id: I578b1e2f1bb374da6194e6ba04a0fd459b2632fe
| * refilled items should be moved immediatelyBea Lam2012-03-1010-26/+97
| | | | | | | | | | | | | | | | | | refill() functionality should reposition items immediately, else removeNonVisibleItems() sees different positions from those added in addVisibleItems() if an item is animating. Change-Id: Ib9904e08bf92b18fd4b712270c0ab69e9a113e04 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Clean up transition objects for positionersBea Lam2012-03-103-4/+29
| | | | | | | | | | | | | | | | These must be cleaned up whenever items are removed from the internal PositionedItem lists. Change-Id: I56f64a29bd98c603b00faaead514fd43780c18de Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Add mouse wheel events handler to MouseAreaLuis Gabriel Lima2012-03-1010-2/+314
| | | | | | | | | | | | | | | | | | | | | | | | This patch was based on the attached patch in QTBUG-7369. It basically exposes the wheel events to MouseArea via the onWheel signal. The current API is based on the new QWheelEvent API introduced by this patch: http://codereview.qt-project.org/#change,12532 Task-number: QTBUG-7369 Change-Id: Id58513715c2d0ae81e3a69e9e1ed400bbae07507 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Avoid using QQuickViewItem as base classBea Lam2012-03-108-92/+225
| | | | | | | | | | | | | | | | | | | | This patch renames it to QQuickItemViewTransitionableItem, and FxViewItem and PositionedItem now create instances of this instead of subclassing it, to reduce the memory used when transitions are not required. Change-Id: Ie050cda5a121bff9542c7ba7356f6eacf37d241a Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
| * Don't grow container when desired size is knownJoão Abecasis2012-03-093-29/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QList<Type>::reserve() is used upfront to allocate necessary memory in a one go. This tells us straight away whether allocation is possible at all and reduces re-allocations and consequent memory copies. This also has the side effect that no spare memory is allocated, also allowing up to (and including) INT_MAX elements to actually be stored in the underlying QList, as long as enough memory is available to satisfy the allocation request and subsequent fill. The qqmlecmascript::sequenceConversionIndexes was changed to not attempt INT_MAX allocations as, given enough memory and virtual address space, that might succeed but take a really long time. Change-Id: I4b0c965e9c23be78874343a70d7c155933c80903 Reviewed-by: Chris Adams <christopher.adams@nokia.com> Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| * Fix typo.Michael Brasser2012-03-091-1/+1
| | | | | | | | | | Change-Id: Ibbfcc787e463a3a9d1a154d1986c3969f11e60d8 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
| * Add autotest for v4 nested object bug.Michael Brasser2012-03-093-7/+32
| | | | | | | | | | | | Task-number: QTBUG-24606 Change-Id: I0909d60316f7213b21fc315e8a3d0a6124e84409 Reviewed-by: Chris Adams <christopher.adams@nokia.com>
| * Reset transitioner pointer when transition job finishesBea Lam2012-03-091-1/+13
| | | | | | | | | | | | | | | | | | A transition job should only keep a reference to the transitioner for the lifetime of the transition. Change-Id: I22564d7b6587fed58ef53fd50ad4a700340dc7a4 Reviewed-by: Martin Jones Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Update righttoleft examples to new form factorAlan Alpert2012-03-097-181/+229
| | | | | | | | | | Change-Id: I2591f45a91da8bad90c5f3b9c963199c57bcf74d Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
| * Update text examples to new guidelinesAlan Alpert2012-03-0911-85/+96
| | | | | | | | | | Change-Id: I6bbf414f3734bc2f29a7182746c5df158a5924da Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
| * Update shadereffects example to new guidelinesAlan Alpert2012-03-094-241/+308
| | | | | | | | | | Change-Id: Ifa4f06cbf990a2f3fd1c46a3c4fda02b5c42d15b Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
| * Update positioners examples to new guidelinesAlan Alpert2012-03-098-266/+326
| | | | | | | | | | Change-Id: I197a94bca26adbb79f1822b693fa73109db5a4ac Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 19:59:32 +0000