Jason McDonald [Thu, 9 Feb 2012 06:17:32 +0000 (16:17 +1000)]
qmltest: Count passes, fails and skips consistently.
This commit changes qmltest to count one pass per data row, rather than
a single pass for an entire data-driven test function. This makes
counting of passes consistent with counting of fails and skips which
were already counted once per data row. This change also means that the
plain-text, xml and light-xml output formats will now show one result
per data row, so that every data row executed will be shown in the test
output with either a pass, fail or skip result. Previously data rows
that passed were not shown in the output, preventing analysis of total
number of tests runs, pass-rates, and various other metrics.
This commit corresponds to (and depends on) a commit in the qtbase
module which changes the behaviour of qtestlib in the same way.
Task-number: QTBUG-21848
Task-number: QTBUG-22124
Change-Id: I3c1f0e68bdff4087b9ccfc80a3f96f4541335b6f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Yann Bodson [Sun, 12 Feb 2012 23:52:11 +0000 (09:52 +1000)]
QML Text: make sure that the bounding rect has a y position of 0.
This line was lost in a previous merge.
Change-Id: If3683fa17630452abab115638c1c0ebf0824e2a1
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Justin McPherson [Fri, 10 Feb 2012 06:04:11 +0000 (16:04 +1000)]
Change linkage of datafunction in V8_DEFINE_EXTENSION to static.
Stops interaction with items of the same name elsewhere.
Change-Id: I37ffdc8253d76247f03bd593785a35069636eba8
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Justin McPherson [Tue, 7 Feb 2012 05:31:28 +0000 (15:31 +1000)]
Make sure polish() is reentrant.
Take a copy of the items currently scheduled for polish (and clear the internal
list) to ensure an item can re-add itself to the polish list during an
updatePolish().
Change-Id: I0c629795f64d5926ac87a838ea5e216b6a1fa6cf
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Michael Brasser [Fri, 10 Feb 2012 00:15:13 +0000 (10:15 +1000)]
Fix anchor jitters that could occur during animation.
The anchors were using a different definition of center than the
actual center (
9337c140cab7db1285f893b66d0e56423a74c253). With
this change center-anchored Rectangles may sometimes have fuzzy
antialiasing again.
Task-number: QTBUG-12441
Task-number: QTBUG-21730
Change-Id: Iaf61409c7c523510d0d657fe7ba96f29a8610090
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Fri, 10 Feb 2012 05:33:53 +0000 (15:33 +1000)]
Track the animationRunning flag correctly in QQuickRenderThreadSingleContextWindowManager
The animationRunning value in QQuickRenderThreadSingleContextWindowManager
should always match the animation driver's running state. When the renderer
starts rendering, should check and update the animationRunning to
the current animation driver's isRunning() value after killing the
animation timer.
Change-Id: I30b55872ae1fc69b8db47ead7f1f2ee86de966c8
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kai Koehne [Thu, 2 Feb 2012 11:06:06 +0000 (12:06 +0100)]
Debugger: Rename QDeclarativeDebugTrace to QDeclarativeProfilerService
This avoids naming confusion with QDeclarativeTrace + makes it in line
with QV8ProfilerService.
Change-Id: Ifd801655044cff3ffdb2a9695ffc9868eeb51663
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Thu, 2 Feb 2012 10:18:08 +0000 (11:18 +0100)]
Debugger: Consistenly use 'state' instead of 'status'
Fix inconsistent naming e.g. in QtDeclarativeEngineDebug by always
using 'state' instead of 'status'. This is in line with the other
source code, which also seems to favor 'state'.
Change-Id: I65a7a3bd0eb7dfffeb37b5f8dad15b0a4a78de70
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Pekka Vuorela [Fri, 3 Feb 2012 08:07:51 +0000 (10:07 +0200)]
Use QInputMethod instead of deprecated QInputPanel
Similarly deprecate Qt.application.inputPanel and
introduce replacement Qt.inputMethod.
Change-Id: Ie4fd467f93f75023c86b0a2d038d858fe5001146
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Sami Kananoja <sami.kananoja@nokia.com>
Martin Jones [Fri, 10 Feb 2012 06:12:10 +0000 (16:12 +1000)]
Flickable containing PinchArea is unresponsive following pinch.
PinchArea was releasing the mouse grab when all touches were
released, causing the mouse release event to not be propagated
to its parents, who were then unable to correct their state.
Remove this code and allow the normal event handlers to do their
thing.
Change-Id: I367772ca13546425fed4bed4438084bdf3c74dde
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Justin McPherson [Thu, 9 Feb 2012 05:48:40 +0000 (15:48 +1000)]
Use only standard API in examples.
Change-Id: I62a864de35c5b595ffda4397edb16342f54a86ce
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Justin McPherson [Thu, 9 Feb 2012 05:46:09 +0000 (15:46 +1000)]
Refactor Canvas rendering paths.
Refactor Canvas rendering paths to enable different drawing contexts.
Change-Id: If0e00a14baa673fca6b999a787b4e89885bb1e51
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Christopher Ham [Wed, 25 Jan 2012 00:50:13 +0000 (10:50 +1000)]
Fix for QTBUG-23862 - Blank screen in Viewport
This patch fixes an issue that causes Qt3D's Viewport to be blank
when its renderMode property is set to BufferedRender.
(QSGPainterNode's RenderTarget is set to FramebufferObject)
Task-number: QTBUG-23862
Change-Id: Ic7a333f79ecf1aa153ef42e213644a17243a3580
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Yann Bodson [Fri, 10 Feb 2012 04:48:10 +0000 (14:48 +1000)]
Remove clang warnings in particles
Change-Id: I4fb92a76143e5b9b607bbf9461b27ade3776edf0
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Fri, 10 Feb 2012 01:36:37 +0000 (11:36 +1000)]
Update SmoothedAnimation and SpringAnimation to accept default target.
Followup to
f5a43c09dbbf0caece4976303250a7582f6037ec.
Change-Id: I591836996b815f3128b5f67f11efcc644011d6b4
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Martin Jones [Thu, 9 Feb 2012 05:28:29 +0000 (15:28 +1000)]
Use use touch events to generate mouse events in Quick canvas.
Allowing the canvas to deal with mouse event emulation provides
a couple of advantages: 1. touches outside a reactive area can
be ignored, allowing a touch within a reactive area to become
the "mouse touch". 2. we can extend the mouse events with
data available in touch events for use within the quick elements;
specifically velocity in this case.
Change-Id: Id9df397f1a3a03dbda2ef5dcf6189e7eb3377356
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Mathias Malmqvist [Mon, 5 Dec 2011 19:21:33 +0000 (19:21 +0000)]
Added new convenience readonly visibleChildren property to Item
Change-Id: I5ec541226fabd72c05ce8ccb8bb7e56f6ec7717a
Task-number: 22724
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Thu, 9 Feb 2012 09:40:34 +0000 (19:40 +1000)]
Doc fix
Change-Id: I94712d5e7ca81618c4c506f5984ff94c46b730dd
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Thu, 9 Feb 2012 03:00:07 +0000 (13:00 +1000)]
Remove deprecated builtin sql database API.
The new local storage API has been implemented as a standalone module plugin
for a while, and qtquick1 has been moved into a seperated repo, so
the old API can be safely removed now.
Task-number:QTBUG-21538
Change-Id: Ib89f34797afe492ad4987d5afa8ff23cdca044ab
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kai Koehne [Tue, 20 Dec 2011 13:26:39 +0000 (14:26 +0100)]
Debugger: Allow trace service to send data on exit
Add a statusAboutToBeChanged virtual that allows
services to send data e.g. on application exit.
Change-Id: I28fa513ab2a12d6973c444aac3062d64a0957207
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Christiaan Janssen [Thu, 9 Feb 2012 11:48:29 +0000 (12:48 +0100)]
QmlProfiler: add filename to "Compiling" events location
Change-Id: I58c4cae59790bed6a921f7e94d97ee84ba3e6777
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Gunnar Sletta [Wed, 8 Feb 2012 07:09:11 +0000 (08:09 +0100)]
Pass the QQuickCanvas to texture factories.
This makes it a lot more convenient as we then have direct access to the
GL context, createTexture(), invalidation signal and more.
Change-Id: I114514d1379c4d0efcc35c512fa2b485da3438b0
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Andrew den Exter [Thu, 9 Feb 2012 06:14:40 +0000 (16:14 +1000)]
Add linkColor property to Text.
Allows the color of links in text to be changed from the default blue.
This currently only works with StyledText and the distance field
rendererer. It could be made to work with RichText overwriting the
specified foreground color in all instances or by not setting a default
color in the html parser. The former would prevent the color being
set with CSS or some future means for altering text formats. The latter
would break rendering with QPainter.
Task-number: QTBUG-23048
Change-Id: I98df215cabe8a089f648fd4a6206622b4318fb8f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Thu, 2 Feb 2012 04:51:17 +0000 (14:51 +1000)]
Check dynamic slot function for nullness before evaluation
Previously, we didn't check whether the function object handle
associated with a dynamic slot's method index was null before
attempting to evaluate it, which could cause a crash in some
circumstances. This change also adds better error reporting
during function compilation.
Task-number: QTBUG-24064
Task-number: QTBUG-24037
Task-number: QTBUG-23387
Change-Id: I3c5e35e8c16187870125736013a5935fcc5cb1f2
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Wed, 25 Jan 2012 09:18:25 +0000 (19:18 +1000)]
Use QDeclarativePixmap in the Particle System
This allows for source URLs to come from network sources.
Change-Id: I416edca010e77e507598eaf4eead4291f044f379
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jason McDonald [Tue, 7 Feb 2012 02:42:05 +0000 (12:42 +1000)]
Remove code related to test location.
Testlib no longer does anything with the test location and neither do
any of Qt's tests, so this code is no longer needed.
Change-Id: Ic370b6b741382a90454c893bffcab4a7328a2f9e
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Gunnar Sletta [Wed, 8 Feb 2012 09:19:39 +0000 (10:19 +0100)]
Make use of the new maybeAdvance animation logic inside the animation system
Change-Id: Ifef986241d4817fe1e8f8cb94b9640b2bcec0d29
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Chris Adams [Fri, 30 Dec 2011 03:20:33 +0000 (13:20 +1000)]
Handle exceptions while compiling v8 bindings
Previously, no exception handling existed, which could cause a crash
if an invalid v8 binding expression was generated. Such invalid
bindings should usually be rewritten into valid form by the bindings
rewriter, but in some cases it is too costly to do so, so we need
to handle exceptions.
Task-number: QTBUG-24064
Task-number: QTBUG-23387
Change-Id: I7da12a936780a561c9e9cad3a4a7b62c06d6973e
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Jason McDonald [Thu, 9 Feb 2012 00:20:36 +0000 (10:20 +1000)]
Fix error in qdeclarativeecmascript autotest.
The test did not correctly ignore warning messages, but instead ignored
too many messages for one data row and too few for another data row.
This error was exposed when testlib was changed in qtbase commit
d9e35e2884cc75969f0eb860082ea11f8bb95a64 to be more strict with checking
that all ignored messages are correctly produced.
Task-number: QTBUG-24156
Change-Id: Iae73fb26bda83317256c504a8cb3d45783444f66
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Damian Jansen [Thu, 9 Feb 2012 01:25:59 +0000 (11:25 +1000)]
UI improvement for TwitterFriends example
Remove need to erase pre-existing text in TextInput
More likeable input field
Change-Id: I253c0a871079ebedecb96a4b2e27998e82cb10c2
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Michael Brasser [Thu, 9 Feb 2012 01:18:27 +0000 (11:18 +1000)]
Fix warnings reported by clang.
Change-Id: Ifa850c2848c61319cb2465d7fcfffc7fef630923
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Alan Alpert [Thu, 9 Feb 2012 01:12:31 +0000 (11:12 +1000)]
Don't crash if focus issues arise.
The test has some strict focus requirements, but if they are not met
then the test should FAIL with a bit of explanation instead of crash.
Change-Id: I796e8a8092833f3413b3dc98a22466575dfe241d
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Alan Alpert [Tue, 31 Jan 2012 22:07:39 +0000 (08:07 +1000)]
Rewrite multiline strings properly
Because the bindings rewriter works on code strings, it would leave
multiline strings across multiple lines (which is illegal in ECMAScript.
It now manually breaks them up when it sees them, by replacing a \n
character with a literal \n.
Since RewriteSignalHandler now likes to have the AST passed in too, the
related method in QDeclarativeCompiler (and its customers) have been
altered to use the QDeclarativeScript::Value instead of just a string.
Task-number: QTBUG-23387
Change-Id: Id060de37e70590c9da2a902038ed02d948fdd70f
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Jason McDonald [Tue, 7 Feb 2012 05:09:44 +0000 (15:09 +1000)]
qmltest: Perform extra checks after each data row is executed.
Add calls to the new function QTestResult::finishedCurrentTestData() to
verify that expected failures and expected messages have been produced.
Change-Id: Ia139a962c705a5f47be992b7f2e81775aa2e2f28
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Charles Yin [Wed, 8 Feb 2012 06:26:06 +0000 (16:26 +1000)]
Add missing interface declaration
Change-Id: I18774f01b78f160b53c3ee96f1fe3a4cc8ce4950
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Jamey Hicks [Wed, 8 Feb 2012 14:42:16 +0000 (09:42 -0500)]
Update documentation on QJSEngine::newQObject to match implementation.
Change-Id: Id38244dd78b7d562dad14e08555fb55d2e0815fa
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Gunnar Sletta [Wed, 8 Feb 2012 07:06:17 +0000 (08:06 +0100)]
Use a singleton for the plugin.
The factory is created from the QQuickCanvas constructor
before any alternative threads are started and doesn't need
this kind of protected. In addition this caused problems on
shutdown if multiple custom contexts where created.
Change-Id: Ifdd9bde0c65aa7c399722aea33af78087a2465b4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Caroline Chao [Tue, 7 Feb 2012 11:35:58 +0000 (12:35 +0100)]
CodeCoverage: Fix wrong type passed to saveCoverageTool.
Passing a bool as appropriate.
Change-Id: I0dcca8d30c6d75e7fcddcf7047e1dd1c572ec6ea
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Alan Alpert [Wed, 8 Feb 2012 05:16:50 +0000 (15:16 +1000)]
Switch to QMetaType::Type
Looks like this change was made to QVariant for Qt5, slight behavioural
difference because floats are now a separate case.
Change-Id: Ia9d420b03454c13c97515ab9c89b743a668b37e2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Glenn Watson [Tue, 7 Feb 2012 23:36:18 +0000 (09:36 +1000)]
Provide determinant accessor in render state structure.
This allows custom renderers to set the determinant to a value
different than the actual model view transform matrix. This is
useful when parts of the scene node transformation are done on
the CPU rather than in the vertex shader.
Change-Id: Icf26a5922b0933275a61af4656cf842bf61e70d5
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Gunnar Sletta [Wed, 8 Feb 2012 13:29:44 +0000 (14:29 +0100)]
Disable broken test
Change-Id: I3588153c37ef3d2ced43dba308502dd06428e0a6
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Gunnar Sletta [Fri, 3 Feb 2012 10:17:29 +0000 (11:17 +0100)]
Added QQuickCanvas::setRenderTarget(uint fbo, const QSize &size)
This allows to hook in non-QOpenGLFrameBufferObject FBO's also
Change-Id: I8a2f8f7f15d5a92262bdbb0507b232d7c11fdf25
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
Bea Lam [Fri, 3 Feb 2012 03:18:05 +0000 (13:18 +1000)]
Accept default targets for transitions
QDeclarativeAbstractAnimation::transition(),
QDeclarativeTransition::prepare() and QDeclarativeTransitionManager
now accept a QObject* to specify a default target for a transition.
For view transitions, this will allow the view to pass a view item
as the default target for a view transition so that the Transition
does not have to explicitly set the target for every animation.
Change-Id: I2c8d5535283335e139d98ef56f399f338627fb3e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Mon, 6 Feb 2012 03:27:34 +0000 (13:27 +1000)]
Don't hide virtual method.
Task-number: QTBUG-20994
Change-Id: Iaeeb23ed758ef52e0a3a61c4310aafec383e8a28
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Kim Motoyoshi Kalland [Wed, 18 Jan 2012 13:58:54 +0000 (14:58 +0100)]
Let Item.layer.samplerName be a QByteArray instead of QString.
Both Qt's property system and OpenGL shaders use 8-bit characters,
so there is no need to use a QString for samplerName.
Change-Id: I8cc29c74adb5d71a34cc99d9ecebbbba8b554cdf
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kim Motoyoshi Kalland [Tue, 17 Jan 2012 16:06:08 +0000 (17:06 +0100)]
Allow Item components to be assigned to Item.layer.effect.
Some complex effects are easier to implement as Items using
ShaderEffects internally rather than with a top-level ShaderEffect.
Auto-tests added.
Change-Id: I4b99811b87e7ca5054bf119b99207b7f5a7c666e
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Michael Brasser [Tue, 7 Feb 2012 00:22:09 +0000 (10:22 +1000)]
Initialize value.
Change-Id: Ibfb045827a38021fcfa43e735823ad346c5c066c
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Andrew den Exter [Tue, 7 Feb 2012 07:52:52 +0000 (17:52 +1000)]
Resolve StyledText img tags relative to baseUrl.
Change-Id: I954195d52330c65e851b7c0fcdb6c8dabf29335d
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Kim Motoyoshi Kalland [Tue, 17 Jan 2012 15:49:13 +0000 (16:49 +0100)]
Fixed some Item.layer bugs and added auto-tests.
Change-Id: I3f66f911d1c499c37a66904f8ddab6951ba85e60
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Jędrzej Nowacki [Tue, 31 Jan 2012 09:03:56 +0000 (10:03 +0100)]
Mark constructor of QJSValue as deletable.
This constructor is there only to force compile time error.
Change-Id: Ia2e059e0c7fa516949a166da8856543a5608d217
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Bea Lam [Tue, 31 Jan 2012 07:15:00 +0000 (17:15 +1000)]
Separate out some of the common test code
Moves findItem, findItems() etc. into shared/visualtestutil.h and
moves duplicate list model test classes and other common view-specific
code into shared/viewtestutil.h.
Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Wed, 25 Jan 2012 00:32:43 +0000 (10:32 +1000)]
Add additional animation autotests.
Change-Id: I11894325e73b8bb5b6ece4c626b15bd1d099f229
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Gunnar Sletta [Mon, 6 Feb 2012 16:57:43 +0000 (17:57 +0100)]
Avoid recursive parent chains in QQuickItem
Change-Id: I47b666cfacd804c4302236f0a4b371ca7b382c3d
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Thu, 2 Feb 2012 23:17:43 +0000 (09:17 +1000)]
Fix example to clear rect before painting.
Change-Id: Iecefc9bb38957ec463edb575f4495275aae7c57e
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Andrew den Exter [Tue, 7 Feb 2012 01:57:42 +0000 (11:57 +1000)]
Add contentWidth and contentHeight properties to Text elements.
For Text and TextEdit this is a rename of paintedWidth and paintedHeight
both of which remain as synonyms of the content properties for
compatability. For TextInput this is a new property.
Task-number: QTBUG-23691
Task-number: QTBUG-15160
Change-Id: Idbdc72fad34922be21b649ca45fc39b5e533ed1a
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Michael Brasser [Fri, 3 Feb 2012 02:26:37 +0000 (12:26 +1000)]
Add and use new animation backend.
The new backend improves performance, and allows us to create
multiple running animation jobs from a single Transition. It is
based off of the existing Qt animation framework.
Change-Id: Id1d0162f6e5c65bf31267f3f9f2042c354375d57
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Yann Bodson [Sun, 5 Feb 2012 22:20:02 +0000 (08:20 +1000)]
Remove warnings with clang
Change-Id: I924f0adc036b47e2342bf383d308c6a5269c2de6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 7 Feb 2012 00:03:06 +0000 (10:03 +1000)]
Update test files to API changes
API changes are being managed, but the test files shouldn't be
triggering the warning.
Change-Id: Ifd6c0c08be9979d72f98eb6a1df07daf9302772e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Tue, 7 Feb 2012 02:06:49 +0000 (12:06 +1000)]
More fixes for QDeclarativeListModelWorkerAgent cleanup
1) Use deleteLater() instead of delete to avoid crashing with any pending events
2) During event processing, return earlier if possible
Change-Id: Ia7d6c95acf1175a16b80e952b95909bb5bbc9433
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 7 Feb 2012 02:40:53 +0000 (12:40 +1000)]
Fix symbol clash
SpriteImage and ImageParticle are now in the same library, need
different internal class names.
Change-Id: Ic32fafb729818a6114fe454e7288fbf00fd6a1e7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 3 Feb 2012 03:09:17 +0000 (13:09 +1000)]
Ensure Flickable moving and flicking properties are correct.
Flicking, then touching to stop the flick should set flicking
property to false. Moving or flicking vertically should not
set flickingHorizontally, and vise-versa.
Change-Id: Iee42a92ffff2707f0691ffa285dec514b47c9986
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Martin Jones [Fri, 3 Feb 2012 00:55:19 +0000 (10:55 +1000)]
Section header is not made visible when changing currentIndex.
Make section header visible when setting currentIndex to an
item on a section boundary. Could also affect initial position
if view size started at 0.
Change-Id: Ie65f91826311d34a290d369d8956f1c88f7efb70
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Yann Bodson [Thu, 2 Feb 2012 01:51:45 +0000 (11:51 +1000)]
Remove pixmap text caching in QML text element
Task-number: QTBUG-24033
Change-Id: Ifa24482b98536300c2f4c643a86517a019de8a84
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 6 Feb 2012 02:36:43 +0000 (12:36 +1000)]
Fix truncation and incorrect formatting of RichText.
Update the text position when adding text.
Task-number: QTBUG-23981
Change-Id: I4a10916559745e8df805b1f8563522341bc6f69b
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Alan Alpert [Fri, 3 Feb 2012 04:43:05 +0000 (14:43 +1000)]
Homogenize examples
Several groups of examples are now organized like the other Qt examples,
with a project file, doc entry, and single launch point.
Change-Id: I2fd957c00e0d1121ebe47c806e54e6999425d1d3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Simon Hausmann [Fri, 3 Feb 2012 13:41:17 +0000 (14:41 +0100)]
Fix acceptance of unhandled mouse events.
Mouse events not handled by the canvas need to be ignored, in order for
features like touch synthetization to work. In case of the initially
delivered mouse press event, the canvas did not ignore the event if it
was not handled. This patch corrects that and adds an auto-test to verify
the new behaviour.
Change-Id: I8499701f5a161ce1e90a70303aa7ca4ccf2f0b6f
Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Mon, 6 Feb 2012 15:40:55 +0000 (16:40 +0100)]
Warnings in the before/afterRender docs
Change-Id: I2311e574b45d518893ef868fdcf51053dc43bb13
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Tor Arne Vestbø [Fri, 3 Feb 2012 13:11:27 +0000 (14:11 +0100)]
Don't start timers in the QDeclarativePixmapStore destructor
Timers use global static data, which might have been torn down at the
point where we start the timer.
Change-Id: Id11de05ae92b9a3652f9b1d7c3d5ca4947ffe065
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Eskil Abrahamsen Blomfeldt [Fri, 3 Feb 2012 12:49:00 +0000 (13:49 +0100)]
Fix updating text color in Text element
The setColor() function in QQuickText calls markDirty() which
did not specify that the whole paint node should be updated, so
color updates would have no effect until something else changed.
Change-Id: I93741b6c697f2dd6ad5a315250502a7a6e3ce1d7
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Fri, 3 Feb 2012 02:36:10 +0000 (12:36 +1000)]
Fix vertical offset of TextInput.positionToRectangle.
Offset the y value of the rectangle by the vertical scroll and line
offset.
Task-number: QTBUG-23934
Change-Id: I43815b480f43a089a9a03b0aec32dfc0598b6154
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Fri, 3 Feb 2012 03:34:57 +0000 (13:34 +1000)]
Fix TextEdit vertical alignment.
Don't ignore the position of a QTextDocument when contructing a text
node, and translate the rectangle returned by positionToRectangle by
the y offset.
Task-number: QTBUG-23935
Change-Id: I55a2b69a32a8b623be7e36de54ad083c2f8591e5
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 11 Jan 2012 05:49:36 +0000 (15:49 +1000)]
Add support for resizing fonts to fit Text dimensions.
This adds a mode where if the content of a Text item doesn't fit
within its bounds the font size is reduced during layout until it
does or a minimum font size is reached.
Task-number: QTBUG-22832
Change-Id: I6198ef03899e2f21b32e313548966ef4b0e3bff1
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Glenn Watson [Fri, 3 Feb 2012 01:21:24 +0000 (11:21 +1000)]
Fix some QJSValue test failures.
Fix precision issues causing test failures on platforms where
qreal is defined as single precision. Also use explicit casts
to ensure well defined behaviour when converting a negative
double value to an unsigned integer.
Change-Id: Ia0048bf83169d3b617f70828f86368c23f4f3786
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Glenn Watson [Sun, 5 Feb 2012 22:44:18 +0000 (08:44 +1000)]
Fix incorrect ref count with dynamic roles on worker thread.
When using the dynamic roles mode from a worker script thread,
the reference count for the list model worker agent was not
being incremented correctly, causing the final release of the
agent to be reading from memory that had already been freed.
Change-Id: I06d8e363c95133c1c162f32e1efb2d4020ed96be
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Thu, 2 Feb 2012 23:28:00 +0000 (09:28 +1000)]
Add a grouping examples launcher for animation examples
Components are designed to be reusable, so that other categories might
use them to create grouping launchers.
Single grouped launchers fit better into the Qt examples style that
QtCreator and qdoc are expecting.
Change-Id: Ia6935394caa1856aa8cc105746dd3d30fd0b8c7c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 3 Feb 2012 02:45:23 +0000 (12:45 +1000)]
Remove SVG use from example
With the SVG module now an optional dependency, examples that don't need
SVG shouldn't use them.
Change-Id: I17ad57dec6982e78090904d1514e28233c354b5b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 3 Feb 2012 07:07:48 +0000 (17:07 +1000)]
Update BearWhack sprites
Missed the API change on duration
Change-Id: I64abcdad3f0e9554f797868761a06b9ed8662762
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Mon, 6 Feb 2012 01:38:24 +0000 (11:38 +1000)]
Teach build system tst_qdeclarativepixmapcache needs QtConcurrent
So if QtConcurrent is disabled, this test should be too.
Change-Id: Ib4c6a952f73fc21bb201cf6017cd3e73732fbe7b
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Alex Wilson [Mon, 6 Feb 2012 00:00:41 +0000 (10:00 +1000)]
Add "QT += concurrent" to a test that needs it
QtConcurrent became its own module in qtbase as of
http://codereview.qt-project.org/15206
Change-Id: Ie9b638d83012aa83f854b92fec80d48babcf6ef0
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Yann Bodson [Fri, 3 Feb 2012 01:48:24 +0000 (11:48 +1000)]
Cleanup: remove some debugging and use QQuickTextNode::addImage
Change-Id: I20f38f590b158d5d615923c30e85e2a7cfd99763
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Yann Bodson [Mon, 6 Feb 2012 00:01:26 +0000 (10:01 +1000)]
Skip tst_qquickitem::simpleFocus on Mac OS X 10.7
Task-number: QTBUG-24094
Change-Id: I521707891d2695d7dde8eea4ef8a6a2e3f5ea935
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Charles Yin [Fri, 20 Jan 2012 05:41:16 +0000 (15:41 +1000)]
Fix crash bug related to QDeclarativeListModel
If QDeclarativeListModel is deleted, all references to this object in
QDeclarativeListModelWorkerAgent and WorkerScript objects should be removed
and additional checking is needed when process the pending sync() events.
Change-Id: I12b1f06699cc908e684af0886cf06d811c3fceb4
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Michael Brasser [Thu, 2 Feb 2012 04:47:07 +0000 (14:47 +1000)]
Ensure || expressions in v4 will always exit.
Change-Id: I7188e38403fec96f83f3bdfc68b763a9aec9346a
Task-number: QTBUG-24038
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Yann Bodson [Thu, 2 Feb 2012 22:24:50 +0000 (08:24 +1000)]
Cleanup text examples
Change-Id: I66797c9cf8b2c3a502a31c442d9e51d7febfe368
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Matthew Vogt [Tue, 31 Jan 2012 06:52:36 +0000 (16:52 +1000)]
Remove QtQuick1 elements from qtdeclarative
QtQuick1 is now contained in a separate repository.
Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Matthew Vogt [Thu, 2 Feb 2012 01:44:16 +0000 (11:44 +1000)]
Fix spelling errors that refer to non-existent symbols
These erors create the appearance of symbols that do not actually
exist.
Task-number: QTBUG-23737
Change-Id: I249742998524b6156185a6601f36e7691013ddf3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Gunnar Sletta [Thu, 26 Jan 2012 10:17:37 +0000 (11:17 +0100)]
Started implementation of offscreen canvas FBO rendering API
Change-Id: I15b1799982d20d16c9c5e08eee7095cf087b49e1
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Laszlo Agocs [Sun, 29 Jan 2012 15:14:48 +0000 (17:14 +0200)]
Do not start timers in QDeclarativePixmapStore teardown
The store instance is a global static and so starting timers
during its destruction is unnecessary, and may cause crashes
if the QAbstractEventDispatcher's statics are already destroyed.
This happens on OS X at least.
Change-Id: I785515c8973b291a7bfc6c5dabe2c19e8393c7ad
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Pekka Vuorela [Thu, 2 Feb 2012 12:58:49 +0000 (14:58 +0200)]
Adapt to QGuiApplication::focusObject() for notifying input method
Emitting focusObjectChanged() signal now instead of explicitly setting
inputItem to QInputPanel. Also adapted from deprecated
QInputPanel::inputItem() to QGuiApplication::focusObject().
Change-Id: I97460625cc8bb2820ec7716a06330aecd1b585ea
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Jan-Arve Saether [Mon, 30 Jan 2012 13:57:22 +0000 (14:57 +0100)]
Remove QAccessible::FocusChild, add focusChild()
Change-Id: Idc96d91ec31630b4240fe473ed3b4bf0a4753618
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Kent Hansen [Wed, 18 Jan 2012 06:03:48 +0000 (07:03 +0100)]
Remove QJSEngine::undefinedValue() function
Rationale: It's strange to have an undefined value factory function.
There should just be one way of constructing undefined values: By
passing UndefinedValue to the QJSValue constructor.
The undefinedValue() function created a value that was bound to the
engine; the QJSValue constructor does not. In order to ensure that
we're testing the same behavior as before, I've replaced
undefinedValue() calls by toScriptValue(QVariant()) in the autotests.
Task-number: QTBUG-23604
Change-Id: Ie9295b7af49c853b5a4a3445da48c325fef8d6b1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Kent Hansen [Fri, 20 Jan 2012 06:08:08 +0000 (07:08 +0100)]
Remove QJSValue::isFunction() function
Rationale: QJSValue::isCallable() should be used instead. There is no
compelling reason to be able to distinguish between JS Function
instances and other callable objects.
Task-number: QTBUG-23604
Change-Id: Ieef6b32030ef70f54081035fd4ffc3c17c184cd3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Wed, 18 Jan 2012 13:36:28 +0000 (14:36 +0100)]
Remove QJSValue::construct() and deprecated call() overload
callAsConstructor() should be used instead.
Task-number: QTBUG-23604
Change-Id: If95ab9906712ede7cbae5e9d24624708bccf880f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Wed, 18 Jan 2012 13:31:10 +0000 (14:31 +0100)]
Remove QJSValue::toInt32() and toUInt32() functions
toInt() and toUInt() should be used instead.
Task-number: QTBUG-23604
Change-Id: Ib64aea139e9082066a1e5096ef9fe3a97c35d3eb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Yann Bodson [Mon, 28 Nov 2011 01:26:40 +0000 (11:26 +1000)]
Support inline images with <img> tag in StyledText
Task-number: QTBUG-21793
Change-Id: Ie7b9f293c6c9a949c1899152c38b61251b0069d3
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Aurindam Jana [Tue, 31 Jan 2012 16:05:01 +0000 (17:05 +0100)]
Debugger Test Case: Fix failures
Fix test cases related to verifying debug messages.
Task-number: QTBUG-23977
Change-Id: Ieab6a5975bff1ef7fcee3eb1befe0c544a63ea1f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Martin Jones [Thu, 2 Feb 2012 01:46:55 +0000 (11:46 +1000)]
Incorrect initial pos after resizing view with margins.
The currentItem tracking didn't position the view to show the
margins. This affects resizing the view and also changing
currentIndex.
Task-number: QTBUG-24028
Change-Id: I47d4c771c0d712c93abadfb6b2deb5194241fb6b
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Alan Alpert [Wed, 1 Feb 2012 21:21:28 +0000 (07:21 +1000)]
Revert "Mark tst_qdebugmessageservice as insignificant until it passes again"
This reverts commit
27427efbb9c898b08de92e6b0a1b4d890fcdcabc, as it
passes again.
Change-Id: Ie05729c024c748ff5c4c58c143ee8601f7c466c2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Charles Yin [Mon, 5 Dec 2011 00:38:59 +0000 (10:38 +1000)]
update .gitignore
Change-Id: I7bb60aaadf2ca2153e8e76bba092dba753e9cf2c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Simon Hausmann [Mon, 30 Jan 2012 16:04:42 +0000 (17:04 +0100)]
Fix unhandled touch events not being ignored.
Unhandled touch events need to be ignored in order for things like
mouse event synthetization in QtGui to work.
Change-Id: I6fe9dad205c8bb8547d2424c2e2a3b3518598006
Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>