Frederik Gladhorn [Mon, 31 Oct 2011 16:07:20 +0000 (17:07 +0100)]
Remove embarassing line from tutorial.
Change-Id: Ie392214f1b0bea0314ebf94f24fac1122db6483a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Jędrzej Nowacki [Wed, 16 Nov 2011 13:43:28 +0000 (14:43 +0100)]
Fix console.log function.
This patch fix problem of a truncated log message if it includes
an object. The regression was introduced by
a7f5c93de3f9811eef3f5a19ab6dec83b997e0d6.
Change-Id: I080956ef3c902b6c4a57f5d0066c4616a449e661
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kent Hansen [Fri, 11 Nov 2011 08:39:15 +0000 (09:39 +0100)]
Add autotest for qml/v8 optimization bug
After a function that accesses a qml context property was
inlined, calls to global functions would fail with
"TypeError: Illegal invocation".
Fixed in qtbase's v8.
Task-number: QTBUG-22679
Change-Id: Id6e2604e5151585febfe1b667869dc3b1fad6e5e
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kent Hansen [Wed, 16 Nov 2011 10:24:18 +0000 (11:24 +0100)]
Change destruction order to avoid accessing deleted GL resources
This commit fixes a crash when a QQuickCanvas containing a
Text item is destroyed.
202127f860208c21145e05685bc54219e1655dbd in qtbase fixed a
resource leak with QOpenGLMultiGroupSharedResource; resources
were not cleaned up correctly when the associated GL context
(group) was destroyed.
This exposed a bug where QSGDefaultDistanceFieldGlyphCache
(used for Text items) relied on that leakage. In particular,
the glyph cache stores a pointer to a GL resource that it
doesn't own (m_textureData).
If the GL context is deleted and there are no other contexts
in the group, the group and its resources will be deleted.
Subsequently, if the glyph cache accesses the resource pointer
when the Text node is destroyed (via
QSGDefaultDistanceFieldGlyphCache::releaseGlyphs()), we crash.
The GL context is deleted when QQuickCanvasPlainRenderLoop is
destroyed. By moving the deletion of the render loop object to
the end of QQuickCanvas destructor, the canvas nodes get a
chance to clean up the resources they use _before_ the
resources are deleted.
Task-number: QTBUG-22754
Change-Id: Ie8de19a139b4631a16203e63e731feed3d8d64cf
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Aaron Kennedy [Wed, 9 Nov 2011 14:13:41 +0000 (14:13 +0000)]
Allow aliases to QVariant properties
Task-number: QTBUG-22464
Change-Id: I449d4fc709d34a69116258660d721596cd9b778b
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Gunnar Sletta [Wed, 16 Nov 2011 10:16:57 +0000 (11:16 +0100)]
Improved comments on threaded renderer a bit
Change-Id: I1ee3879bde219e0008d70117dbfdd14f7da31f18
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Kent Hansen [Tue, 15 Nov 2011 08:21:24 +0000 (09:21 +0100)]
Make non-threaded VME interpreter work again
625bb0520708879ef5d281ab0c62fc7ad5415441 added a statement
to the QML_NEXT_INSTR macro without turning the macro
definition into a block. This caused statements like
if (foo)
QML_NEXT_INSTR(bar);
to unexpectedly break from the switch (the second statement
in the QML_NEXT_INSTR expansion is "break").
Change-Id: I384280eaea1dd1f3b940be67d589f3a03d9e8685
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Bea Lam [Wed, 16 Nov 2011 06:47:56 +0000 (16:47 +1000)]
Fix for moving multiple items to top of view
Top item wasn't positioned correctly when moving multiple items
backwards to the top of the view. Don't move visibleItems.first() if
we've already repositioned the top item correctly.
Task-number: QTBUG-22762
Change-Id: Ib216adea719044ee55349478237473ff3194a326
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Wed, 16 Nov 2011 07:19:47 +0000 (17:19 +1000)]
Add \inqmlmodule tags to the generic QtQuick module docs
Change-Id: If40907e44a0e54f8a9caaea2103eb3e5c9e541d3
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Kim Motoyoshi Kalland [Tue, 15 Nov 2011 16:20:46 +0000 (17:20 +0100)]
Avoid calling maybeUpdate() during ShaderEffectSource cleanup.
markDirtyTexture() causes sceneGraphChanged() to be emitted from
the renderer containing the ShaderEffectSource, which in turn
causes QQuickCanvasRenderThread::maybeUpdate() to be called.
Change-Id: I3c068e41501ed4cb2c5f4ff705ffd478743b4beb
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Tero Tiittanen [Tue, 15 Nov 2011 15:17:50 +0000 (17:17 +0200)]
Fixed some copy-paste errors is documentation.
Change-Id: I882df7dffea032e9fae16e87f48f70c5d26beb26
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Tero Tiittanen [Tue, 15 Nov 2011 15:05:53 +0000 (17:05 +0200)]
Texture coordinates fixed in subrect tiling in SG image node.
Fixes the texture coordinates for the inner tiles in a tiling
algorithm that scenegraph default image node uses when texture
is a subrect and image repeats.
Change-Id: Iacf3e63c4c02bdbdc473f8128efecc7908322a50
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kim Motoyoshi Kalland [Mon, 14 Nov 2011 16:19:50 +0000 (17:19 +0100)]
Fixed deferred deletion of objects in the render thread loop.
processEvents() does not process DeferredDelete events.
Change-Id: Iee8491b7c63a26af8e36f777d872115ab1b64763
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Bea Lam [Thu, 10 Nov 2011 04:30:08 +0000 (14:30 +1000)]
Fix refill where zero-size items are involved
881091b5c0f1d2ead2b70e54f7ac2e4c17680b4e was incorrect since it meant
that any items following zero-sized delegates would not be deleted as
they scrolled up past the top of the view.
refill() should be deleting these items as well as any zero-sized items
before them.
Task-number: QTBUG-22014
Change-Id: I10cd30bb85a8ec1ddaa2a1cbaa924192536ef6fc
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Glenn Watson [Tue, 15 Nov 2011 01:32:56 +0000 (11:32 +1000)]
Add optional count parameter to ListModel.remove
When calling remove on ListModel, it's now possible to supply
a second parameter giving the number of items to remove. If the
count parameter is omitted, it defaults to one, which maintains
the previous behaviour.
Task-number: QTBUG-22601
Change-Id: I0fb5c394a2b312095ce6e99e379d0f789d3ab4e6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Wed, 16 Nov 2011 00:47:56 +0000 (10:47 +1000)]
Remove unused code in qquickimplicitsizeitem.
Change-Id: I47ad98e0c515ddc5a9ac224048cdf396cce22699
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Alan Alpert [Wed, 16 Nov 2011 01:08:13 +0000 (11:08 +1000)]
Correct image path
Change-Id: I9bf07a90d6e9c64a9f8470da0744766a391a06cd
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Mon, 14 Nov 2011 03:40:03 +0000 (13:40 +1000)]
Remove events from the revert list.
State change "events" should be removed from the revert
list the same way property changes are.
Task-number: QTBUG-22583
Change-Id: Ia3f4d16ee8855d163a7f6118a0bc1f8492727940
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Alan Alpert [Wed, 16 Nov 2011 01:02:01 +0000 (11:02 +1000)]
Update sync.profile
202127f860208c21145e05685bc54219e1655dbd in qtbase introduces widespread
regressions, but it was also fixing a test failure inexplicably caused
(presumably by qtbase). Use the last good qtbase from qt5.git until
these issues are resolved.
Task-number: QTBUG-22754
Change-Id: Ic6a1272d2079337fb45a6a46f3704380a5a19d73
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 15 Nov 2011 01:51:50 +0000 (11:51 +1000)]
Add propagateComposedEvents property to MouseArea
While necessary, advanced event propagation isn't the common use case.
Now needs to be explicitly enabled.
Task-number: QTBUG-21081
Change-Id: Ibd8b4974934116dbfa32cc5e72037fd9b11015b4
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Gunnar Sletta [Mon, 14 Nov 2011 15:14:22 +0000 (16:14 +0100)]
Make shader effects visible even if source is initially empty
Task-number: QTBUG-21343
Change-Id: Iaa34d74d2458f0a9dc94c96ee13d3406e1d8f1cb
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Roberto Raggi [Thu, 10 Nov 2011 15:36:54 +0000 (16:36 +0100)]
Fix parsing of unary expressions.
Prohibit the lexer to synthesize a semicolon token after the
colon-sign of a binding declaration.
The parser internally was rewriting the following bindings
Component.onCompleted:
++foo
as
Component.onCompleted: ;
++foo
Task-number: QTBUG-21310
Change-Id: I0558d17fd81b5abac81fb990502d49767ea40730
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Roberto Raggi [Thu, 10 Nov 2011 09:39:56 +0000 (10:39 +0100)]
Use the property cache when compiling the V4 instructions.
Change-Id: Ifca6166328e7c20707fef153fa2b960da3a00a98
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Gunnar Sletta [Mon, 14 Nov 2011 14:20:37 +0000 (15:20 +0100)]
Removed annoying warning about threading
Task-number: QTBUG-21707
Change-Id: I7ea7c53f39e2474093d628b5a75a435353b87b87
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Mon, 14 Nov 2011 14:11:45 +0000 (15:11 +0100)]
Fixed assert during QML shutdown
Change-Id: I680af9ccb417d3162277b5740a129ecd77feee7f
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Yoann Lopes [Fri, 11 Nov 2011 15:49:41 +0000 (16:49 +0100)]
Distance field glyph cache refactoring.
The distance field glyph cache is now an abstract class part of the
adaptation layer. It can be implemented to define the way the glyphs are
stored in graphics memory on a specific platform. The typical use case
is for having a cross-process glyph cache. To implement a custom glyph
cache, one has to override three pure virtual functions: requestGlyphs(),
storeGlyphs() and releaseGlyphs().
The default implementation works the same way as before the refactoring
(no cross-process cache).
Change-Id: I6e231a119abbffbe36f5f0d690f0b8be0664ff4f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Kim Motoyoshi Kalland [Tue, 1 Nov 2011 17:11:38 +0000 (18:11 +0100)]
Improved QQuickShaderEffect::lookThroughShaderCode() performance.
Removed use of regexp. Skip comments and compiler directives in
the shader code. Don't look through default shader code.
Task-number: QTBUG-22423
Change-Id: Ie08cd8288ba7d7a33f1e3b0dc2ab5f2bedad04dd
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Alan Alpert [Mon, 14 Nov 2011 04:38:18 +0000 (05:38 +0100)]
Get tst_examples passing again
Shared QDeclarativeEngine sidesteps GC slowdown issue.
New approach also verifies that the root object successfully loaded,
this picks up all the cases where it did not successfully load before.
Most of these were because they weren't importing QtQuick 2.0, import
statements have been updated. One was because it does not create a
QQuickItem root, it has been manually excluded. This required adding per
file exclusions to the current directory exclusions.
Change-Id: I809f0f20acc319aef58ba2e30e672e32f640686d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Mon, 14 Nov 2011 03:00:31 +0000 (13:00 +1000)]
autotest for setting parent in a component created by Loader.
Change-Id: I1b6850ce5e4a820b5ab7b2d06a877307104478a1
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Charles Yin [Mon, 14 Nov 2011 04:01:29 +0000 (14:01 +1000)]
Fix memory leaks&uninitialized members in QQuickContext2D&QQuickContext2DTexture
1) Delete m_buffer in QQuickContext2D::~QQuickContext2D
2) Add a default ctor for QQuickContext2D::State, although the reset() method is
always called, but the valgrind still complains the "uninitialized" error, so
add this to make an explicit initialization.
3) m_item in QQuickContext2DTexture is also not initialized.
Change-Id: Ie6c74136342d7f0ff8dc268d5d6b976c95ff52f1
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Yann Bodson [Mon, 14 Nov 2011 03:14:02 +0000 (13:14 +1000)]
Text.onLineLaidOut doc does not appear
Task-number: QTBUG-22706
Change-Id: I2b8b7d4012e48ff4226f060a5ce38d2acdab0deb
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 11 Nov 2011 03:26:50 +0000 (13:26 +1000)]
Don't clobber unified timer settings
Change-Id: Iee43b566180471e08d655a4d2af72e9586227532
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kai Koehne [Fri, 11 Nov 2011 13:48:12 +0000 (14:48 +0100)]
Debugger: Remove option to constantly send tracing data
Change-Id: I392277453aa34498549e39182accf7797a262504
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Aurindam Jana [Thu, 10 Nov 2011 15:12:45 +0000 (16:12 +0100)]
QV8ProfileService: Code refactor
Define sendProfilingData() to send data to client.
Change-Id: I1f4778946af4552ef6323c78a538ab7149990b0a
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Aurindam Jana [Thu, 10 Nov 2011 14:54:21 +0000 (15:54 +0100)]
QV8Profiler: Rename the global static instance
Change-Id: Iecd2856a36c7cf364f3d18288c2974a3bc29f91f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Jędrzej Nowacki [Thu, 10 Nov 2011 16:55:25 +0000 (17:55 +0100)]
Add missing includes.
We want to move forward declarations in qtbase. It is not good
to depend on qmetatype.h to do all forwarding.
Change-Id: I7d5ecec239e6c2ce5576b19f7af1c6d8d8222e7e
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Aurindam Jana [Tue, 8 Nov 2011 10:39:16 +0000 (11:39 +0100)]
QV8Engine: Console APIs
Modified functionality for console.log, console.debug. Added
script and line information. Added functions console.warn
and console.error.
Change-Id: Id9f4dce5658a09b00522f8e087caf8f4242f418a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Wed, 9 Nov 2011 13:58:53 +0000 (14:58 +0100)]
Debugger: Fix trace service for tracing on startup in block mode
Don't call QDeclarativeDebugTrace::instance() inside messageReceived,
since messageReceived() will be called for the first message while
the constructor is still running.
Also add proper autotests for qdeclarativedebugtrace.
Change-Id: Ic37d077d93ad4957fb21035abe40b2d281278314
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Glenn Watson [Fri, 11 Nov 2011 00:47:33 +0000 (10:47 +1000)]
Support JS objects in ListModel via QVariantMap
Added support for the new listmodel implementation to store and
retrieve JS objects via QVariantMap. Storing JS objects in a
listmodel is significantly slower than storing native datatypes
at the moment (this may be improved in the future). Also note
that it's not currently possible to bind to fields within the JS
object.
Change-Id: I3b1a11ace7cdec754c1a2bb2b2d1b7edf561864d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 11 Nov 2011 01:42:12 +0000 (11:42 +1000)]
Deploy qdeclarativecontext test data files.
Change-Id: I7463b1b8dbfd40764c49c6988dcf8b11e9f3b255
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Chris Adams [Fri, 4 Nov 2011 04:13:43 +0000 (14:13 +1000)]
Remove unused codepaths from QV8SequenceWrapper
The object equality comparison callback does not allow an object with
a sequence resource to be equal to an object with a variant resource.
As such, the SequenceType::isEqual(QVariant) codepaths are not needed.
Also, QVariantList conversion is handled by toBasicVariant() in the
QV8Engine, and thus we don't need conversion code for this type in
the sequence wrapper.
Change-Id: I2ec599c5ad6cfdb715cd4e0aae3f0cc3bb36cfdf
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Michael Brasser [Thu, 10 Nov 2011 05:56:29 +0000 (15:56 +1000)]
Fix qmlplugindump test on mac.
Change-Id: I939e4cccc34dd8807e3dd4e4a2eb43d4653a14e2
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Michael Brasser [Thu, 10 Nov 2011 05:59:50 +0000 (15:59 +1000)]
Stabilize debug client test.
Change-Id: I1f43d754b618ef44a26b749c279fced6636358f8
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Charles Yin [Fri, 11 Nov 2011 01:27:08 +0000 (11:27 +1000)]
Export QSGDynamicTexture
The QSGDynamicTexture is in the public header and documented, it should
be exported like QSGTexture as well.
Change-Id: I7c1811509b0311b177d3b9c9bdb893d1383c6d59
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
Alan Alpert [Fri, 11 Nov 2011 04:46:57 +0000 (15:46 +1100)]
Change examples bug reference
Previous reason it was disable has been fixed. There's now a new reason
with a new bug number.
Change-Id: I7a3d2bcf5d0f72a1909bdb71cc775bf4ec107726
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Bea Lam [Tue, 8 Nov 2011 06:11:26 +0000 (16:11 +1000)]
GridView should re-layout if add/remove before visible index
Unlike ListView, GridView must redo its layout if an item is added or
removed from before the visible items, since it affects the column/row
layout.
Task-number: QTBUG-21588
Change-Id: Id333bc653033751c45d127973e94fae4580c55b0
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Michael Brasser [Thu, 10 Nov 2011 22:21:58 +0000 (08:21 +1000)]
Make compile and pass CI tests.
Change-Id: Ie2ec20d9e346ccaf698762d6abf0224c39fb3490
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 9 Nov 2011 03:26:36 +0000 (13:26 +1000)]
Fix expected failure in TextInput and TextEdit positionAt test.
Test the mid point of the text input falls between the positions of the
cursors before and after that point rather trying to test a minimum
distance that can vary with font size.
Change-Id: Ie3270b4bfb0c579b8b4d5bb47b784d6926521f49
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Thu, 10 Nov 2011 01:29:07 +0000 (11:29 +1000)]
Remove expected failures from TextInput pre-edit tests.
Use the cursorRectangleChanged signal of QInputPanel to determine
if an update has been sent instead of a custom input context.
Change-Id: I500ef71a3ea76e8b4271560d7aa5cc4fc6737cb0
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 9 Nov 2011 04:57:23 +0000 (14:57 +1000)]
Fix expected failure in TextInput horizontalAlignment_RightToLeft test.
Send events to the input panels input item instead of the canvas. And
clear the pre-edit text before testing implicit alignment of empty text.
Change-Id: I5e6b04c53c9c6b344563b80b3aa76ab614b0ca0a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Thu, 10 Nov 2011 00:10:10 +0000 (10:10 +1000)]
Remove the TextInput inputContextMouseHandler test.
QInputPanel/QPlatformInputContext doesn't have a mouseHandler interface.
Change-Id: I9bb839258cbc3869f035a60e2f9bfefec02e92ec
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Thu, 10 Nov 2011 02:09:13 +0000 (12:09 +1000)]
Compile fix for tst_qquicktextinput.
Change-Id: I96a64199bc7f7f03c52f6e67482ae0425805c4a1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 9 Nov 2011 06:48:15 +0000 (16:48 +1000)]
Remove expected failure from TextEdit mouseSelection test.
No longer fails as QTestLib correctly propagates keyboard modifiers.
Task-number: QTBUG-21743
Change-Id: I1419afe8411614368f2284952912f29610530d84
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Martin Jones [Wed, 9 Nov 2011 05:34:01 +0000 (15:34 +1000)]
PathView element's current item changes on insertion.
When inserting an item before the current item update the offset
to ensure the current item doesn't change.
Task-number: QTBUG-21320
Change-Id: I2375bc5098e7f83c33e7a0b123ed1b82f607055f
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Johannes Zellner [Wed, 9 Nov 2011 10:30:25 +0000 (11:30 +0100)]
QStringLiteral does not build on arm gcc 4.5.2 in this condition
Replace QStringLiteral with QLatin1String
Change-Id: I205bcd4f446e225c3f4054798e74dd0cb356e126
Reviewed-by: Robert Griebl <robert.griebl@nokia.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Glenn Watson [Tue, 8 Nov 2011 22:11:21 +0000 (08:11 +1000)]
Improvements to listmodel implementation and tests.
- Fixed edge case crash bug with QObjects being set on existing
listmodel element.
- Improved warning messages when assigning wrong type to role.
- Removed a few code paths that can never be hit.
- Added several tests to cover functionality not hit by coverage.
Change-Id: I3d237c0555afbba6377b4d898bec911515b1b4ea
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Wed, 9 Nov 2011 12:35:02 +0000 (12:35 +0000)]
Delete nodes in the render thread at shutdown
This fixes a crash on OS X and possibly other platforms.
Change-Id: Ie8fc451b526d12d46133ef560c04e88c0b142b9a
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Harald Fernengel [Mon, 7 Nov 2011 06:55:24 +0000 (07:55 +0100)]
trivial: make the test actually check the headers
Change-Id: I82ec9f1d7879c7539d80f49a493f68b5e5be5e70
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Aaron Kennedy [Wed, 9 Nov 2011 11:09:27 +0000 (11:09 +0000)]
Fix v4 crash when accessing invalid attached property
Task-number: QTBUG-21883
Change-Id: Ic14a5d494890fc1bc322c660b97f657d640f2ff8
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Aaron Kennedy [Tue, 8 Nov 2011 12:19:47 +0000 (12:19 +0000)]
Return a string from resolvedUrl() to match 4.x behavior
Task-number: QTBUG-20960
Change-Id: I9ae99ada5c9bbe7498df24908c6acd202ca73a15
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Aaron Kennedy [Tue, 8 Nov 2011 11:37:18 +0000 (11:37 +0000)]
Ensure connection lists get cleaned
Task-number: QTBUG-21368
Change-Id: I2cdecc984edb76a5fb1417cfdb29ffe6b90b0993
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Charles Yin [Wed, 9 Nov 2011 01:20:04 +0000 (11:20 +1000)]
Fix qmltestrunner crash bug when report filename and line number
The HandleScpe is not needed here. Also for each test file, the rootObj
should reset its internal states properly, otherwise the following test
cases are polluted by the previous tests.
Task-number:QTBUG-22620
Change-Id: I1e4869070b8712e5a6c755461d52bd12d1f03160
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Kai Koehne [Tue, 8 Nov 2011 12:47:50 +0000 (13:47 +0100)]
Fix gcc compilation warnings
QML_SHOW_FRAMERATE is a leftover from QDeclarativeView. Rest
is signed vs unsigned integer comparison.
Change-Id: Ie17e217fc1cf13d29a3795a40dbbc07e9c7c6067
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 9 Nov 2011 05:09:12 +0000 (15:09 +1000)]
Fix expected failure in TextEdit hAlign_RightToLeft test.
Send events to the input item instead of the canvas. And apply the fix
from 4.8 for the tested condition which somehow wasn't applied when the
test itself was.
Change-Id: I0f5bfe8fc13fc426b395fa8ef87cb5549789a92e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 9 Nov 2011 01:29:15 +0000 (11:29 +1000)]
Fix expected failure in TextEdit textInput test.
Input method events should be delivered to the input panels input item,
not the canvas.
Change-Id: I9385a66bdea40311f9fe5f3817ff815991575e4a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 9 Nov 2011 01:19:48 +0000 (11:19 +1000)]
Remove the TextEdit inputContextMouseHandler test.
QInputPanel/QPlatformInputContext doesn't have a mouse handler which
invalidates this test.
Change-Id: I0a0009d5808391ba1a2d6b30d6e4a9eeb1160c0f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 9 Nov 2011 00:40:58 +0000 (10:40 +1000)]
Re-enable TextEdit pre-edit cursor rectangle test.
Formerly known as micro focus.
Change-Id: I4a860e1da488b38b8cf17e79ac922a39ff017dbc
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Friedemann Kleint [Mon, 7 Nov 2011 13:39:56 +0000 (14:39 +0100)]
QDeclarativePixmapCache: Add missing enumeration values and break.
Change-Id: Ia83a4932d50133aaae5d488d7be0df99a75be576
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 9 Nov 2011 01:33:12 +0000 (11:33 +1000)]
Fix TextInput inputMethods test.
Input method events should go to the input panels input item not the
canvas.
Change-Id: I2792b8d51585c028c3ba1a109b3dea16bea18f61
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Wed, 9 Nov 2011 03:01:56 +0000 (13:01 +1000)]
Behavior on a value type should not cancel previous assignment.
The call to read the value type value causes the previously assigned
value to be overridden. This commit fixes the issue, but doesn't
solve the root cause, which would require changes at the
compiler/vme level.
Task-number: QTBUG-20827
Change-Id: I1a53ee7b777bea81c5929ab7e47e2932e6901967
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Tue, 8 Nov 2011 23:06:39 +0000 (09:06 +1000)]
tst_QSGGridView enforceRange_rightToLeft fails
Change
9bd6361400a2a4e4045a090de73d70082cc6d1bf corrected the
highlight range for right to left layout, i.e. positioned relative
to the right. This change fixes the autotest to account for this and
fixes flicking in StrictlyEnforceRange mode with RTL layout.
Task-number: QTBUG-22162
Change-Id: I133b7e647883e51783bcf54111871451a3a7e67f
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Andrew den Exter [Tue, 8 Nov 2011 07:29:38 +0000 (17:29 +1000)]
Add tests for the VisualDataGroup onChanged signal.
And other things. Fixes onChanged being emitted with an empty change
list, an out of bounds array access in groups property and model parts
group filter not being correctly reset.
Change-Id: If2f27b303a141634d106b7c5164984e5817aff4e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kai Koehne [Thu, 3 Nov 2011 16:58:07 +0000 (17:58 +0100)]
Add console.time / console.timeEnd API
Implement console.time() / console.timeEnd() as also provided by FireBug
/ Safari.
Task-number: QTBUG-22347
Change-Id: I94fcadbb0c54fdf60dc2559e3ae63d613e29630b
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Tue, 8 Nov 2011 03:00:02 +0000 (13:00 +1000)]
Extend VisualDataModel tests to cover Package delegates.
Verify the existing tests also pass if a package delegate is used.
Fixes incorrect changes being emitted when the group a part model is
filtered on changes and package items not being un-parented when
destroyed.
Change-Id: Ib4be42274b0a0460ae9b763a9737f4a6d3b94603
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Wed, 9 Nov 2011 04:28:41 +0000 (14:28 +1000)]
Fix crash on exit when overriding signal handlers in states.
Cherry-picked from
93c64e1be3a2d68eb504d7c4f7c60f66ce1ff650 in 4.7.
Task-number: QTBUG-21617
Change-Id: I99ce8292d53954f5229867a384f47bedf7fad315
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Tue, 8 Nov 2011 05:28:32 +0000 (15:28 +1000)]
Add missing doc snippet.
Change-Id: I039888fd0203ef23f1c9cc229d7d354d8c908ca0
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Michael Brasser [Mon, 7 Nov 2011 22:35:55 +0000 (08:35 +1000)]
Property changes in Component.onCompleted should trigger Behaviors.
Task-number: QTBUG-22555
Change-Id: Ieffb8037d7289113ea4f629ba3b578a845d2cb28
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Sun, 6 Nov 2011 23:39:08 +0000 (09:39 +1000)]
VisualDataModel group change notification missing initialization.
Found by valgrind. Ensure m_previousIndex is initialized.
Change-Id: Ie3f56d0428d22a7ff1dc54dd53bfdaef21ad169f
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Friedemann Kleint [Mon, 7 Nov 2011 13:44:39 +0000 (14:44 +0100)]
Declarative: Add define _CRT_SECURE_NO_WARNINGS for MSVC.
Silence warnings about usage of strcmp(), etc.
Using wrapper is not an option here for performance reasons.
Change-Id: Ia444a637080c910b8a9a888f422e65c812ba546c
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Aaron Kennedy [Tue, 8 Nov 2011 11:27:04 +0000 (11:27 +0000)]
Don't crash on invalid expression
Task-number: QTBUG-21310
Change-Id: I93de1c520b6f1c2aa3842e1091bcf2b34d9b0420
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Aaron Kennedy [Mon, 7 Nov 2011 18:59:52 +0000 (18:59 +0000)]
Fix autotest
We can't copy QIcon and QKeySequence as we don't link to QtWidgets.
Task-number: QTBUG-21629
Change-Id: I4e935e4dd398202f442288849b1cbb9b3d02932b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Mon, 7 Nov 2011 18:38:44 +0000 (18:38 +0000)]
Include correct line number when throwing an exception from a slot
Task-number: QTBUG-20344
Change-Id: I25be1520b55ce13d4e1c75e06effa1dee8530a7a
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Jiang Jiang [Tue, 8 Nov 2011 09:17:29 +0000 (10:17 +0100)]
Fix default glyph node after qtbase refactor
Change-Id: Ib08c1bcf33bafcee828169b3ddfa264bd010cfef
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Alan Alpert [Tue, 8 Nov 2011 03:15:34 +0000 (13:15 +1000)]
Add QQuickSpriteImage test to pro file
Change-Id: Id375c9ff1e543d69b102fec33d1e672890e87078
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Gunnar Sletta [Wed, 26 Oct 2011 10:42:25 +0000 (12:42 +0200)]
Don't create geometries for transparent Rectangle {} elements
Change-Id: If59f7ad7f85849559707cecacc9e2d917e68ab26
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Bradley T. Hughes [Tue, 1 Nov 2011 12:36:00 +0000 (13:36 +0100)]
Use QAtomicInt::store() instead of operator=(int)
The operator=() is deprecated and will be removed.
Change-Id: I5b6d2578d085334ce9e9fb5d01dfb1eca5569e4b
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Friedemann Kleint [Mon, 7 Nov 2011 13:47:55 +0000 (14:47 +0100)]
Declarative: Fix compiler warnings.
- Unused parameters, variables
- Usage of deprecated QAtomic::operator=(int)
Change-Id: I2861968dac8ef8a3126783e3447c593808116871
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kim Motoyoshi Kalland [Fri, 4 Nov 2011 12:57:14 +0000 (13:57 +0100)]
Minor improvements to some of the node implementations.
Change-Id: I05c7c4810b37d8f808e812eac7b2128d21de36c8
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Kim Motoyoshi Kalland [Wed, 2 Nov 2011 13:07:40 +0000 (14:07 +0100)]
Emit signal when texture is updated in ShaderEffectSource.
Added a signal scheduledUpdateCompleted() which is emitted after
the texture content has been updated as a result of a call to
scheduleUpdate(). Also renamed the textureChanged() signal to
updateRequested(), which I think is a more accurate name.
Task-number: QTBUG-22174
Change-Id: If4d29e3be3a953494562d1ff55045f2154491d97
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Aurindam Jana [Fri, 4 Nov 2011 13:04:56 +0000 (14:04 +0100)]
QV8DebugService: Return JSON messages for internal requests.
Internal requests are not handles by V8. Hence, create a JSON
message similar to v8 debugging protocol and send it to client.
This is only for uniformity wrt to debug requests.
Change-Id: Ia0a3cda0ef157b852fb4402fde62b4651a95bd56
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Damian Jansen [Fri, 4 Nov 2011 05:32:58 +0000 (15:32 +1000)]
Documentation fixes
Change-Id: If30f98aafcedc5119e305dcb48b610a459780344
Reviewed-by: Thorbjørn Lund Martsum
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Aaron Kennedy [Thu, 3 Nov 2011 16:52:53 +0000 (16:52 +0000)]
Optimization: Minimize refreshing when root context changes
Modifying a context requires expressions to be refreshed incase they
depend on a name resolution that changes. As it is common to modify
the root context, and the root context can't hide any names, it is easy
to constrain the expressions that require refreshing. In a well
behaving app, this should mean that no expressions are reevaluated when
the root context is modified.
Change-Id: Id3b48cd595fdd6b5a3dc6f26319f652dccaef79c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aurindam Jana [Fri, 4 Nov 2011 13:07:17 +0000 (14:07 +0100)]
QV8DebugService: Cancel DebugBreak Requests before disconnect
Change-Id: Iaf00123e0c9aa2e5542e9c8863df3887092ac953
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aaron Kennedy [Wed, 2 Nov 2011 17:08:16 +0000 (17:08 +0000)]
Don't crash if contexts are deleted during refreshExpressions
Change-Id: I23b59d33c07b017ef7355a7fe4a728d84c5d7eaa
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Aaron Kennedy [Wed, 2 Nov 2011 14:28:02 +0000 (14:28 +0000)]
Skip the captured properties step in bindings
Objects and notifiers in the capturedProperties list were not guarded
which can lead to crashes if they're deleted prior to the binding
completing. Now the notifiers are connected to and guarded immediately
to prevent this.
Change-Id: I912e323c52bf6169fb5077e552d5d38d9aa7faec
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Chris Adams [Fri, 4 Nov 2011 04:38:38 +0000 (14:38 +1000)]
Fix crash in object serialization due to sequences
Commit
c177691118e4e2bace9b5c1f4f57343190e6ad64 added support for
sequences, but in doing so, introduced a crash bug into worker thread
object serialisation. This commit fixes the bug by ensuring that the
object resource type is checked prior to serialisation.
Change-Id: I4ef9e4d0865a337c4fe6e8f1cd40cf4462ca7a60
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Fri, 4 Nov 2011 03:43:15 +0000 (13:43 +1000)]
Fix invalid remove cache indexes caused by consecutive ranges.
listItemsRemoved attempts to merge and consecutive cache only ranges
it produces, this same logic would also merge other consecutive ranges
incorrectly incrementing the cacheIndex in the process. Since
listItemsRemoved won't produce these consecutive ranges itself handle
only the cache only ranges there and compress the other consecutive
ranges where they originate.
Change-Id: If4d95fb741c8e7003ed48bfb2559c30c948c255b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 4 Nov 2011 04:04:20 +0000 (14:04 +1000)]
Fix test stability with threaded renderer.
Change-Id: I0ba617d2dcbc97de3e8c6bb280ccd8d1b9448fdc
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Chris Adams [Tue, 1 Nov 2011 06:54:47 +0000 (16:54 +1000)]
Fix documentation for property var
Previously, it was not clear that a binding which accesses a property
of a JavaScript Objects assigned to a var property would not be
re-evaluated if the value of the property changed.
Change-Id: I72d990e05104bc452fc516511a14716b2913ff9a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Fri, 4 Nov 2011 01:51:53 +0000 (11:51 +1000)]
Fix module API provider registration function documentation
Previously, the documentation was not able to be linked correctly by
qdoc3. This commit moves the documentation to the correct file and
ensures that the links work correctly. It also fixes a typo in
the QQuickLoader documentation.
Change-Id: Id675954dd3009fafe6e0cfeb81342c947302ffcb
Reviewed-by: Martin Jones <martin.jones@nokia.com>