aboutsummaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-1329-167/+322
|\ | | | | | | Change-Id: Iaefec13503dadfa200539b8de7a2d80fc5bb3bcf
| * 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-131-2/+3
| | | | | | | | | | | | | | Task-number: QTBUG-24664 Change-Id: I2a2fe144835e61665b8693d58ca4fb9ba506e8a8 Reviewed-by: Bea Lam <bea.lam@nokia.com>
| * Displaced items were moving unnecessarilyBea Lam2012-03-132-28/+66
| | | | | | | | | | | | | | | | | | | | | | | | 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-132-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | 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-121-3/+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 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>
| * 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>
| * 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>
| * 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>
* | Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into api_changesMatthew Vogt2012-03-1232-2246/+558
|\| | | | | | | Change-Id: I578b1e2f1bb374da6194e6ba04a0fd459b2632fe
| * refilled items should be moved immediatelyBea Lam2012-03-106-16/+21
| | | | | | | | | | | | | | | | | | 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-107-2/+185
| | | | | | | | | | | | | | | | | | | | | | | | 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-091-11/+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>
| * 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>
| * Fix crash in listmodel when data is assigned incorrectly.Glenn Watson2012-03-091-7/+11
| | | | | | | | | | | | | | | | | | | | If a listmodel with static role types is created, it would crash if a role was assigned a value type such as string, and then subsequently assigned an array (sub list) value from a dynamic meta object (created when using get() from JS). Change-Id: Ibfd0b0b40be13b04103b49462cfae42a5c9f9fb9 Reviewed-by: Martin Jones <martin.jones@nokia.com>
| * Handle QEvent::TouchCancel in QML_TRANSLATE_TOUCH_TO_MOUSE modeMartin Jones2012-03-091-0/+8
| | | | | | | | | | | | | | | | Just remove the mouse grab. The elements will react to this and correct their state. Change-Id: I8b91295606eaface54aa95b1500e7b138d9bc82e Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Keep high-level intermediate representation for IR::BINOPs.Roberto Raggi2012-03-092-24/+17
| | | | | | | | | | | | | | | | | | That is, keep binary expressions in HIR, this will make constant folding more effective. Also, the register allocator for expression-trees used in the V4 compiler will do a better job. Change-Id: I2d5eea08ecd9c8d6f3aa21f1fd674a691ef9e1b0 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * Remove non explicitly typed IR::CONST() nodes.Roberto Raggi2012-03-093-33/+28
| | | | | | | | | | | | | | | | | | This change ensures that IR::CONST expressions created by BasicBlock::BINOP(op,left,right) have the correct types. Change-Id: Iabac3f4ee1b897cc0d0bdf7e7385d7ae6dc513e4 Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
| * QmlDebugging: Remove QQmlDebugClientAurindam Jana2012-03-095-2025/+0
| | | | | | | | | | | | | | | | Remove QQmlDebugClient and relevant classes from the library and move to client code. Change-Id: I6f526b3f0c92970dcad5e5abd8585bb9b406349e Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * QmlProfiler: Avoid overhead if profiling is not enabledKai Koehne2012-03-091-1/+2
| | | | | | | | | | Change-Id: I7ecf32fca53fdb2672760a5b0c5ae88d6bd8fe5a Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * Remove unused QTextCursor code from rewriter.Matthew Vogt2012-03-093-32/+7
| | | | | | | | | | | | | | | | | | | | The rewriter previously supported rewriting operations on either a QString or a QTextCursor. In order to remove the dependency on QtGui, remove the unused QTextCursor support. Task-number: QTBUG-24559 Change-Id: I7a4acceff8097a8bd8c022db23b6b89d356e305a Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Fix selected text highlight in TextEdit.Andrew den Exter2012-03-081-1/+1
| | | | | | | | | | | | | | | | | | The call to QQuickTextNode::addTextDocument() omitted the anchor color argument meaning every subsquent argument was off by one and the selection end was always the default of -1. Change-Id: Iac3165e7aa95a3db935a19e54144d3967a3e6e38 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* | Merge remote-tracking branch 'origin/master' into api_changesLars Knoll2012-03-0759-803/+562
|\| | | | | | | Change-Id: I121cb9c9316b5e47476dcb982bc28b6f3f358f78
| * Improve accessibility action support for Qt QuickMorten Johan Sorvig2012-03-074-19/+92
| | | | | | | | | | | | | | | | | | | | | | Add interface_cast for the action interface. Implement actions for the following roles: Button : Press CheckBox, RadioButton : Press, Check, Uncheck Slider, Spinbox, Dial, ScrollBar : Increment, Decrement Change-Id: Ic8e0d17c709ba51655f3f4b699092baf603b6f18 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| * QML Debugger: Change prefix of warningsKai Koehne2012-03-074-21/+21
| | | | | | | | | | | | | | | | | | Since we've been changing from QtDeclarativeDebugServer to QQmlDebugServer anyway, we might as well change it to the more readable "QML Debugger:" prefix. Change-Id: I852577233d7cdb1f57adc43ec1b85a14d212574d Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
| * QQuickView with the default constructor doesn't show any window decorations.Alexis Menard2012-03-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The default parameter takes a 0 which is propagated to the window platform which sets it to 0. QWidget have a method called adjustFlags which takes care of adding QWindow when necessary. There is no such check in QWindow or the platform plugin for QPA. The default flag of QWindow is Qt::Window but in that case it is overiden as QQuickView constructor calls setWindowFlags(0). Qt::Window as a default parameter is a solution. Change-Id: Iccbebc5b7e4f094c7fc6dc61b37d9f9622be0237 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * Install compat into the correct dirJørgen Lind2012-03-071-1/+1
| | | | | | | | | | Change-Id: I699a943862d6388add2e4e7c24ed416ec1bd1444 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
| * QmlDebugging: Remove deprecated classesAurindam Jana2012-03-073-156/+0
| | | | | | | | | | | | | | Remove the deprecated QQmlDebugHelper class. Change-Id: I56823774f67ee06ccf7e0a797e250178f4a141f7 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * QmlDebugging: Revert the names of servicesAurindam Jana2012-03-076-13/+13
| | | | | | | | | | | | | | | | | | Revert the names of the services changed in b855240b782395f94315f43ea3e7e182299fac48 to maintain BC. Change-Id: I79826d92fd09c41e0020541b0c7bb77b5b2ecb1f Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
| * Compile after API changes in QCoreApplicationGunnar Sletta2012-03-071-3/+1
| | | | | | | | | | Change-Id: I6bc6978a5c68503facd8085bd35e66f86af58a90 Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
| * Use StringRef::load() to initialize DefaultProperty stringKent Hansen2012-03-071-1/+1
| | | | | | | | | | | | | | | | Micro-cleanup; don't access the string data directly. load() is inline. It additionally asserts that the string length matches. Change-Id: Ie24df83ea68b96179792995d062db7872933b1a8 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * Don't needlessly create alias property names in the meta-objectKent Hansen2012-03-072-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | When aliases should not be resolved, there is no need to create the alias name StringRef, since it would occupy space in the meta-data even though the string was never actually initialized. Similarly, when aliases should be resolved, it's enough to create the StringRef once. Change-Id: I44dfe665fe8d7bd5754bc939ff62ad75efe19d5b Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * Make sure QML type "real" always maps to C++ type "double"Kent Hansen2012-03-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The type "real" was documented to be a single-precision float, but that's incorrect. It's always been double. However, signal parameters of type "real" would be mapped to the C++ type "qreal", which can be either float or double depending on the platform. Since JavaScript floating point numbers have double precision, QML should use the same, to avoid potential loss of precision. With this change, "real" behaves the same as the QML "double" type (which already guaranteed double precision). Even though it's redundant, "double" is kept to preserve compatibility. Added tests for the "double" type to the QML meta-object autotest, and a test for the "real" type that ensures there's no loss of precision. Change-Id: I1a77f1fd45082ff670684a935e17d1a46ea75d84 Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
| * Correctly place '.' when building name for call expressions.Michael Brasser2012-03-071-1/+1
| | | | | | | | | | Change-Id: Ic0119a0f4c02387ed19e2905f0b24c4ce86565cb Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
| * Don't link against QtWidgets and QtOpenGLLars Knoll2012-03-071-1/+1
| | | | | | | | | | Change-Id: I3a949dff488d200762b18a0c0a16103f8908052e Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
| * ListView can freeze if flicked beyond its bounds.Martin Jones2012-03-072-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the delegate's size changes in componentComplete and all items are flicked out of view, an incorrect jump calculation in addVisibleItems() resulted in a new delegate being created in the wrong position, and retriggering the jump calculation, which resulted in a new delegate being created in the wrong position, and retriggering the jump... Also fixed currentItem visibility. Change-Id: Iad5f211c4fc5eed9c009d51a0ce3b58181a7b36e Reviewed-by: Bea Lam <bea.lam@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 00:22:36 +0000