Gunnar Sletta [Wed, 14 Mar 2012 11:31:27 +0000 (12:31 +0100)]
fix gl under example to work also on trivial render loop
Change-Id: Ieb6c9c9646b557a7cca952472325c33d265c9262
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Kai Koehne [Wed, 14 Mar 2012 11:37:09 +0000 (12:37 +0100)]
Debugger: Fix autotests on Windows
Remove export macro logic for internal classes.
Change-Id: I4dfa7f8e7bc9b5086e01e40342bd00812d5966bd
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Frederik Gladhorn [Thu, 8 Mar 2012 15:32:05 +0000 (16:32 +0100)]
Remove all accessibility updates to allow changes in qtbase.
In order to integrate pending api changes these are temporarily
removed and will return fixed as soon as qtbase is up to date.
Change-Id: I558b6049ac3342d41d67441ddfba6821fc370533
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Caroline Chao [Wed, 14 Mar 2012 08:05:17 +0000 (09:05 +0100)]
CodeCoverage: Skip headersclean test.
The code coverage tool adds #line when instrumenting the code using the gcc
syntax.
tst_headersclean uses the -pedantic-errors flag which causes a fatal error
when the code is instrumented with the coverage tool.
Similar change was done for qtbase (
4ee14d6f87688492).
Change-Id: I525879ef56463473dd3c9eb91dee4d9b8310cdf9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Luis Gabriel Lima [Thu, 8 Mar 2012 02:24:18 +0000 (23:24 -0300)]
Fix AND expression in v4
The type of the and expressions, e.g. (a && b), were being assigned
to the type of the right hand expression (b). As reported in
QTBUG-24660, this approach could lead to some unexpected behaviors.
Now, when the left and right hand expressions are of different types,
the responsability to deal with the and expression is delegated to v8.
Task-number: QTBUG-24660
Change-Id: Ic42ebb035e62e2f197c337b2106d00453a99f04c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Andrew den Exter [Wed, 14 Mar 2012 05:28:27 +0000 (15:28 +1000)]
Fix memory leak with the shared distance field glyph cache.
A new glyph node instance registers its owner element with its
glyph cache which in the case of the shared distance field glyph cache
connects a signal from the cache to a slot on the owner, changing the
text creates a new node but destroying the old node didn't remove the
connection causing them to accumulate over time.
In the glyph node; unregister the owner element from the cache on
destruction, and in the cache only connect an owner element the
first time it is registered and keep a reference count so the
items can be disconnected when registrations from all nodes have
been cancelled.
Change-Id: Ibf32a146e146dbbf4e0556d1bd756465bd8e45ba
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Chris Adams [Wed, 14 Mar 2012 06:07:03 +0000 (16:07 +1000)]
Disable particle-related examples from tst_examples
CustomParticle and ShaderEffect are currently broken.
Disabling these examples until they can be fixed.
Task-number: QTBUG-24034
Change-Id: Ic1ebba1f66f28495822cd729af1e1c24acad79da
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Gunnar Sletta [Thu, 8 Mar 2012 22:15:11 +0000 (23:15 +0100)]
Fix wrap modes not being set.
Change-Id: Id75ae3f01e6ed72b4a754e05bd55d5ed73b56920
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Gunnar Sletta [Fri, 9 Mar 2012 10:47:42 +0000 (11:47 +0100)]
Remove use of redundante nullPixmap image reference
Change-Id: I40b82c25c813722a94d9897e1f2e1dd8a1681762
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Martin Jones [Wed, 14 Mar 2012 02:41:37 +0000 (12:41 +1000)]
Reuse a QQuickCanvas in examples auto test.
Much faster than creating a new one for each example.
Change-Id: Ic32f244047e0dba78134ba0e3d368260be838f1e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Wed, 29 Feb 2012 01:48:06 +0000 (11:48 +1000)]
Refactor canvas examples by following the new example guidelines.
Change-Id: I1cc749ad11b8439239ba739f40e99b78af7351ab
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Michael Brasser [Thu, 8 Mar 2012 04:41:40 +0000 (14:41 +1000)]
Support module api objects in v4.
Change-Id: I72911a2c8e0a8613e53861da7b38312e51bf57da
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Martin Jones [Tue, 13 Mar 2012 23:50:31 +0000 (09:50 +1000)]
Reuse QQuickView in GridView table driven tests
Makes the tests run faster since we're not waiting for a
window to appear all the time.
Change-Id: Id2442cf32055084088c19865499055c7282bcae0
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Charles Yin [Wed, 7 Mar 2012 14:12:58 +0000 (00:12 +1000)]
More refactoring on animation controller
Add a flag and helper functions for disabling user control in QAbstractAnimationJob
class and make it synchronized with QDeclarativeAnimation class's disableUserControl
flag.
Change-Id: Ifa84ab0c78291941469c33f2cafe5f61ee718b2c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Casper van Donderen [Thu, 1 Mar 2012 17:05:16 +0000 (18:05 +0100)]
Remove the usage of deprecated qdoc macros.
QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.
Task-number: QTBUG-24578
Change-Id: I62d203f21df63a95ee236e578b10418fd9680707
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
Charles Yin [Thu, 8 Mar 2012 01:27:04 +0000 (11:27 +1000)]
Implement mouseDrag
Simulates the drag behavior by press-move-move-release mouse events,
we need 2 move events here to trigger the drag threshold.
Task-number: QTBUG-22753
Change-Id: Ic3470c061834b7410c524029d82375cba62afa36
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Frederik Gladhorn [Wed, 7 Mar 2012 18:50:23 +0000 (19:50 +0100)]
Send accessibility updates for the right item.
Child 0 means the first child.
The index needs to be -1 which the default ctor does.
Change-Id: I71fbdf5a15dd4593178cb250f06d42f601e40d4d
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Thomas Hartmann [Tue, 13 Mar 2012 09:27:59 +0000 (10:27 +0100)]
Adding a custom easing curve editor to declarative tools
Change-Id: Ic8ef77792d74ec99b23d85cd8888e0190acc3e10
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Andrew den Exter [Fri, 9 Mar 2012 05:22:44 +0000 (15:22 +1000)]
Remove unused init function.
Change-Id: Id66e177a544fd8e019bae86fff6bd04bd0497d7c
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Aurindam Jana [Mon, 12 Mar 2012 09:19:05 +0000 (10:19 +0100)]
QmlDebugging: Modify test JSDebug test cases
Add signals that are emitted on debugger responses for
flaky auto tests.
Change-Id: Ic59f559083b2b19fb8eec920dcb76f23125639a8
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Thu, 8 Mar 2012 14:01:53 +0000 (15:01 +0100)]
Debugger: Use QStringLiteral where appropriate
Change-Id: I5c33113783834ef0c7292f5f19f12d8c68f42141
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Martin Jones [Tue, 13 Mar 2012 05:54:19 +0000 (15:54 +1000)]
Reuse QQuickView in ListView table driven tests
Makes the tests run faster since we're not waiting for a
window to appear all the time.
Change-Id: Ibff3706873dbad2f92d2135eae260368f4f4bb10
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Christiaan Janssen [Thu, 8 Mar 2012 15:50:14 +0000 (16:50 +0100)]
QmlProfiler: updated standalone app
Using a stripped-down version of the profiler data structure.
Change-Id: I93a0b12462edea0ca8a1d0db42aa892aa2afc919
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Toby Tomkins [Tue, 13 Mar 2012 01:17:54 +0000 (11:17 +1000)]
Default image scaling behaviour has changed; fix autotest.
The default image scaling behaviour has changed in qtdeclarative. This
change fixes the autotest to conform to fixed ratio scaling.
Change-Id: I9c901825295fb04cab74c46f61696c5274ddd943
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Mon, 12 Mar 2012 01:54:11 +0000 (11:54 +1000)]
Fix crash when writing property after engine deletion
Previously, the engine pointer stored in a QQmlProperty could be
stale due to engine deletion. This commit ensures we guard that
pointer.
Also reverts
cbb7f8b10e99fad675839d7625d3236ed67b3e01
Task-number: QTBUG-24734
Change-Id: I5349c51fbd19fa46a8710280173c1d224358b96e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Aaron McCarthy [Mon, 27 Feb 2012 01:11:10 +0000 (11:11 +1000)]
Only attempt to load QML test cases from source directory if it exists.
When running installed unit tests the QML test cases are likely not
in the source directory, but in the same directory as the installed
test binary. If the source directory does not exist, fall back to
searching for QML test cases in the current directory.
Change-Id: I231b9cd49b12d88dd6cfbcc8dfb8b6c2c69d5aad
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Charles Yin [Tue, 6 Mar 2012 02:13:44 +0000 (12:13 +1000)]
Refactor XMLHttpRequest example.
Change-Id: I4fd4fa4fb190814e1e32ce847d05ab0015ad4ca0
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Charles Yin [Tue, 6 Mar 2012 02:03:36 +0000 (12:03 +1000)]
Refactor localstorage example
Change-Id: I0c742c35ba8d5a2812dc1665905e45f5ffb745b5
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Aaron Kennedy [Thu, 8 Mar 2012 13:25:50 +0000 (14:25 +0100)]
Move binding and expression classes to separate files
Change-Id: Ia9c6996a606e140f31681ecd26d93b1b0fdedf02
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Martin Jones [Tue, 13 Mar 2012 00:32:48 +0000 (10:32 +1000)]
Speed up view flick tests.
Change-Id: I98b0a45b5afd0150bfacef2c1c1e814f70ae042f
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Jason McDonald [Wed, 29 Feb 2012 05:36:21 +0000 (15:36 +1000)]
testlib: Improve verbose and XPASS output
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>
Martin Jones [Mon, 12 Mar 2012 07:55:38 +0000 (17:55 +1000)]
ListView.contentHeight does not include header and footer item heights
Task-number: QTBUG-24664
Change-Id: I2a2fe144835e61665b8693d58ca4fb9ba506e8a8
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Chris Adams [Mon, 12 Mar 2012 03:39:45 +0000 (13:39 +1000)]
Fix leak in tst_qquicklistmodel unit test
Change-Id: I6883f263648d425240503f6abbd358b744d68506
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Bea Lam [Mon, 5 Mar 2012 08:06:33 +0000 (18:06 +1000)]
Displaced items were moving unnecessarily
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>
Martin Jones [Fri, 9 Mar 2012 05:40:29 +0000 (15:40 +1000)]
Improve interaction of nested Flickables and PathView
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>
Andrew den Exter [Fri, 9 Mar 2012 01:02:03 +0000 (11:02 +1000)]
Declare change set and compositor structs as movable primative types.
Allows QVector to avoid invoking contructors for these types
unnecessarily.
Change-Id: Icc8670e4a033c943666f907c7e1b006a3d205597
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Glenn Watson [Mon, 12 Mar 2012 03:20:22 +0000 (13:20 +1000)]
Change repeater item to handle model being deleted.
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>
Charles Yin [Wed, 7 Mar 2012 13:12:26 +0000 (23:12 +1000)]
Fix SignalSpy disconnect issue
Task-number:QTBUG-21083
Change-Id: Ic61472d886bf7c46eb37dc44b5e5ceb401917087
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Thu, 8 Mar 2012 04:04:25 +0000 (14:04 +1000)]
Remove the rest of qtquick 1.0 code from qmltest
Change-Id: I0d20583faf1a75f287dcd866b11457254d250354
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Wed, 7 Mar 2012 13:12:19 +0000 (23:12 +1000)]
include header correctly
Change-Id: I462fbcdd2954979fbff92965cc813551773b4118
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Gatis Paeglis [Tue, 14 Feb 2012 18:04:12 +0000 (19:04 +0100)]
Fix for QTBUG-22777. Removed unnecessary check.
Change-Id: I82de9e1d6eb4b8bdb8c90c69e686b700a02f40aa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Mon, 12 Mar 2012 05:27:09 +0000 (15:27 +1000)]
Fix v4 nested object access bug.
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>
Michael Brasser [Fri, 9 Mar 2012 03:09:07 +0000 (13:09 +1000)]
Add additional v4 tests.
Change-Id: Id33eb50e4a01f3450515f6e666e18cb018f1706e
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Michael Brasser [Thu, 8 Mar 2012 00:36:51 +0000 (10:36 +1000)]
Add two argument Math.min and Math.max support to v4.
Change-Id: I26a4812b76571bf0ae6a0b4bd5d1e2afd64051df
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Michael Brasser [Wed, 7 Mar 2012 23:16:07 +0000 (09:16 +1000)]
Add Math.ceil and Math.abs support to v4.
Change-Id: I23e7c8294abf80914d4529740af6e9124f66c5bf
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Frederik Gladhorn [Tue, 6 Mar 2012 10:25:59 +0000 (11:25 +0100)]
Check that canvas is valid.
During creation the canvas might not have been set.
Change-Id: I7ea8922413e3b6fb4ffd2ed9758c57eea1de02db
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Matthew Vogt [Mon, 12 Mar 2012 06:53:24 +0000 (16:53 +1000)]
Prefer \b word boundary markers
/usr/bin/sed on mac does not process '\<' and '\>' boundary markers
correctly.
Change-Id: I750f7c69579ddcbe39a6246a3d3321cab714fc27
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Mon, 12 Mar 2012 00:01:56 +0000 (10:01 +1000)]
tests: enable headersclean also for cross_compile builds
This test is no longer a host-only test.
Enable it everywhere.
Change-Id: Id7e65ad4d6f468b6b65d0f6035934fbd20fcb5e0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Morten Johan Sorvig [Thu, 19 Jan 2012 07:02:09 +0000 (08:02 +0100)]
Accessibility: childAt_helper descends too far.
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>
Lars Knoll [Wed, 29 Feb 2012 19:43:09 +0000 (20:43 +0100)]
Remove unneeded dependencies to QtWidgets and QtOpenGL
Change-Id: I43bb54524f5786a838073df8812107dda7b0d56e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Laszlo Agocs [Mon, 12 Mar 2012 06:40:52 +0000 (08:40 +0200)]
Fix MouseArea autotest.
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>
Michael Brasser [Mon, 12 Mar 2012 00:55:25 +0000 (10:55 +1000)]
Fix tst_qquicktextedit.
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>
Laszlo Agocs [Fri, 9 Mar 2012 10:00:29 +0000 (12:00 +0200)]
Fix double click handler in QQuickItem.
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>
Sergio Ahumada [Tue, 6 Mar 2012 12:17:16 +0000 (13:17 +0100)]
Remove pin of qtbase for qtdeclarative.
Change-Id: Ib70a3438d085adbed3a1ca7df81d593c7a512ae0
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Kent Hansen [Mon, 12 Mar 2012 12:13:48 +0000 (13:13 +0100)]
Skip test that accesses deleted QML engine
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>
Kent Hansen [Mon, 12 Mar 2012 15:02:43 +0000 (16:02 +0100)]
Fix flakiness in qquicklistmodel autotest
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>
Lars Knoll [Mon, 12 Mar 2012 16:01:16 +0000 (17:01 +0100)]
Mark presumed unstable test as insignificant.
Change-Id: Iea22ae6596c04ba95d59bcb3957bdc3cf9263ae2
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Charles Yin [Fri, 9 Mar 2012 01:34:18 +0000 (11:34 +1000)]
Return early if animationjob was deleted in all callback methods.
Change-Id: I703c8a8904ffd760683de4ee74544dff9eb53144
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Stephen Kelly [Wed, 7 Mar 2012 20:17:02 +0000 (21:17 +0100)]
Remove undefined method.
Change-Id: Id95aebcfc5beac0154db4b1137fc08d5172f3428
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Rohan McGovern [Mon, 5 Mar 2012 05:55:31 +0000 (15:55 +1000)]
Make headersclean in qtdeclarative enforce correct header conventions.
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>
Bea Lam [Mon, 5 Mar 2012 08:05:40 +0000 (18:05 +1000)]
refilled items should be moved immediately
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>
Bea Lam [Wed, 7 Mar 2012 08:20:06 +0000 (18:20 +1000)]
Clean up transition objects for positioners
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>
Luis Gabriel Lima [Thu, 5 Jan 2012 18:19:26 +0000 (15:19 -0300)]
Add mouse wheel events handler to MouseArea
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>
Bea Lam [Wed, 7 Mar 2012 03:29:20 +0000 (13:29 +1000)]
Avoid using QQuickViewItem as base class
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>
João Abecasis [Wed, 7 Mar 2012 22:17:54 +0000 (23:17 +0100)]
Don't grow container when desired size is known
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>
Michael Brasser [Wed, 7 Mar 2012 22:25:45 +0000 (08:25 +1000)]
Fix typo.
Change-Id: Ibbfcc787e463a3a9d1a154d1986c3969f11e60d8
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Michael Brasser [Fri, 2 Mar 2012 01:33:46 +0000 (11:33 +1000)]
Add autotest for v4 nested object bug.
Task-number: QTBUG-24606
Change-Id: I0909d60316f7213b21fc315e8a3d0a6124e84409
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Bea Lam [Thu, 8 Mar 2012 07:05:07 +0000 (17:05 +1000)]
Reset transitioner pointer when transition job finishes
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>
Alan Alpert [Wed, 7 Mar 2012 07:10:14 +0000 (17:10 +1000)]
Update righttoleft examples to new form factor
Change-Id: I2591f45a91da8bad90c5f3b9c963199c57bcf74d
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Alan Alpert [Fri, 2 Mar 2012 04:30:51 +0000 (14:30 +1000)]
Update text examples to new guidelines
Change-Id: I6bbf414f3734bc2f29a7182746c5df158a5924da
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Alan Alpert [Fri, 2 Mar 2012 04:16:55 +0000 (14:16 +1000)]
Update shadereffects example to new guidelines
Change-Id: Ifa4f06cbf990a2f3fd1c46a3c4fda02b5c42d15b
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Alan Alpert [Fri, 2 Mar 2012 01:05:10 +0000 (11:05 +1000)]
Update positioners examples to new guidelines
Change-Id: I197a94bca26adbb79f1822b693fa73109db5a4ac
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Glenn Watson [Thu, 8 Mar 2012 23:19:35 +0000 (09:19 +1000)]
Fix crash in listmodel when data is assigned incorrectly.
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>
Martin Jones [Thu, 8 Mar 2012 03:41:19 +0000 (13:41 +1000)]
Handle QEvent::TouchCancel in QML_TRANSLATE_TOUCH_TO_MOUSE mode
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>
Roberto Raggi [Thu, 1 Mar 2012 14:33:23 +0000 (15:33 +0100)]
Keep high-level intermediate representation for IR::BINOPs.
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>
Roberto Raggi [Thu, 1 Mar 2012 14:18:54 +0000 (15:18 +0100)]
Remove non explicitly typed IR::CONST() nodes.
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>
Aurindam Jana [Tue, 6 Mar 2012 13:59:29 +0000 (14:59 +0100)]
QmlDebugging: Remove QQmlDebugClient
Remove QQmlDebugClient and relevant classes from the
library and move to client code.
Change-Id: I6f526b3f0c92970dcad5e5abd8585bb9b406349e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Thu, 8 Mar 2012 10:47:38 +0000 (11:47 +0100)]
QmlProfiler: Avoid overhead if profiling is not enabled
Change-Id: I7ecf32fca53fdb2672760a5b0c5ae88d6bd8fe5a
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Matthew Vogt [Thu, 8 Mar 2012 04:11:46 +0000 (14:11 +1000)]
Remove unused QTextCursor code from rewriter.
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>
Matthew Vogt [Fri, 9 Mar 2012 00:44:21 +0000 (10:44 +1000)]
Pin qtbase at known-good change ID.
Change-Id: I889a427bf1bddbcc70255f4efb47b803f18dd89e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Andrew den Exter [Wed, 7 Mar 2012 07:42:49 +0000 (17:42 +1000)]
Fix selected text highlight in TextEdit.
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>
Morten Johan Sorvig [Tue, 10 Jan 2012 11:12:51 +0000 (12:12 +0100)]
Improve accessibility action support for Qt Quick
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>
Kai Koehne [Wed, 7 Mar 2012 13:53:24 +0000 (14:53 +0100)]
QML Debugger: Change prefix of warnings
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>
Alexis Menard [Mon, 5 Mar 2012 14:32:52 +0000 (11:32 -0300)]
QQuickView with the default constructor doesn't show any window decorations.
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>
Jørgen Lind [Wed, 7 Mar 2012 12:59:54 +0000 (13:59 +0100)]
Install compat into the correct dir
Change-Id: I699a943862d6388add2e4e7c24ed416ec1bd1444
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Aurindam Jana [Wed, 7 Mar 2012 08:00:22 +0000 (09:00 +0100)]
QmlDebugging: Remove deprecated classes
Remove the deprecated QQmlDebugHelper class.
Change-Id: I56823774f67ee06ccf7e0a797e250178f4a141f7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aurindam Jana [Wed, 7 Mar 2012 08:34:12 +0000 (09:34 +0100)]
QmlDebugging: Revert the names of services
Revert the names of the services changed in
b855240b782395f94315f43ea3e7e182299fac48 to
maintain BC.
Change-Id: I79826d92fd09c41e0020541b0c7bb77b5b2ecb1f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Gunnar Sletta [Wed, 7 Mar 2012 09:21:08 +0000 (10:21 +0100)]
Compile after API changes in QCoreApplication
Change-Id: I6bc6978a5c68503facd8085bd35e66f86af58a90
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Kent Hansen [Mon, 5 Mar 2012 11:58:50 +0000 (12:58 +0100)]
Use StringRef::load() to initialize DefaultProperty string
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>
Kent Hansen [Mon, 5 Mar 2012 11:23:19 +0000 (12:23 +0100)]
Don't needlessly create alias property names in the meta-object
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>
Kent Hansen [Mon, 5 Mar 2012 10:54:01 +0000 (11:54 +0100)]
Make sure QML type "real" always maps to C++ type "double"
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>
Michael Brasser [Wed, 7 Mar 2012 03:50:41 +0000 (13:50 +1000)]
Correctly place '.' when building name for call expressions.
Change-Id: Ic0119a0f4c02387ed19e2905f0b24c4ce86565cb
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Lars Knoll [Wed, 29 Feb 2012 19:41:47 +0000 (20:41 +0100)]
Don't link against QtWidgets and QtOpenGL
Change-Id: I3a949dff488d200762b18a0c0a16103f8908052e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Martin Jones [Wed, 7 Mar 2012 05:26:33 +0000 (15:26 +1000)]
ListView can freeze if flicked beyond its bounds.
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>
Bea Lam [Mon, 5 Mar 2012 23:39:24 +0000 (09:39 +1000)]
Fix setting of target lists when target Transition is not set
Target items are now set from QQuickViewItem::prepareTransition()
instead of QQuickItemView and QQuickPositioner to ensure they are
for a displaced transition even if there is no matching target
transition.
Task-number: QTBUG-24535
Change-Id: I0a6c7e3c6198786527014d421b96fc562c6186dc
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kurt Korbatits [Tue, 6 Mar 2012 22:02:44 +0000 (08:02 +1000)]
Changed particles tests to work from install directory
- Changed particles tests to use TESTDATA
- Changed particles tests to inherit from QQmlDataTest
and use testFileUrl() to find test data
Change-Id: Iae7c5111d976ec3efe473c40a3bab2f0a38c0969
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Kurt Korbatits [Tue, 6 Mar 2012 04:48:21 +0000 (14:48 +1000)]
Changed quick tests to work from install directory
- Changed tests to use TESTDATA
- added check for cross_compile option to skip when sources not available
Change-Id: I1f382794ff982bbc07fc20438a4e4a8c8b8d565f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Kurt Korbatits [Tue, 6 Mar 2012 04:01:34 +0000 (14:01 +1000)]
Changed qml tests to work from install directory
- Changed tests to use TESTDATA
- moved qqmlcontext to private test as it contains private header
- added check for cross_compile option to skip when sources not available
Change-Id: I0f68f58ffcb1b41b8e40a9851e3e003fe72ee2f9
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Tue, 6 Mar 2012 23:28:27 +0000 (09:28 +1000)]
Change the default renderTarget and renderStrategy
As we always use OpenGL and scenegraph render thread now, the best default
render target should be FBO and the best render strategy should be
cooperative mode (use the render thread).
Task-number:QTBUG-23956
Change-Id: I64b070dec566e359d27c84680fef1c691d6ce411
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Tue, 6 Mar 2012 23:34:18 +0000 (09:34 +1000)]
Repaint the canvas item properly when canvas resized
Task-number:QTBUG-23594
Change-Id: I703a5190b5b306666ffd61001ff94f296399465f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>