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>
Yann Bodson [Thu, 3 Nov 2011 06:34:47 +0000 (16:34 +1000)]
Text.RichText ignores color property
Task-number: QTBUG-21921
Change-Id: I2adb9062e658742a704dc55b4def7f6f1eb1f954
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Damian Jansen [Fri, 28 Oct 2011 01:27:22 +0000 (11:27 +1000)]
Fix elements quicktest groups to work with filtering
Change-Id: Iaa1b2bf9a3f810f9f3f5c599d2f5b85e30828bc0
Reviewed-by: Daron Andrew Edie
Christiaan Janssen [Wed, 2 Nov 2011 14:59:17 +0000 (15:59 +0100)]
QmlProfiler: Send trace start event when starting profiling
Change-Id: Ic81c99922f73b0bf9ee830adc2fe35f1c154d868
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Christiaan Janssen [Thu, 3 Nov 2011 11:42:35 +0000 (12:42 +0100)]
V8Profiler: fix block at start when profiling is disabled
The constructor would block the execution of the whole thread until
profiling was enabled. This fix lets the user launch an application
with profiling disabled.
Change-Id: Ia57c19ce9200f7cc21ae2105db954cc2cb0df271
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aaron Kennedy [Mon, 31 Oct 2011 13:10:51 +0000 (13:10 +0000)]
Only issue non-threaded renderer warning once
Change-Id: Id278fa28080d829763c907423089897728b01baa
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Christian Kamm [Thu, 3 Nov 2011 09:19:33 +0000 (10:19 +0100)]
qmlplugindump: Add flush to fix output redirection on windows.
Task-number: QTCREATORBUG-5825
Change-Id: I26c2ecb77a89b352de97c70ff17fd076872a636b
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Kai Koehne [Thu, 3 Nov 2011 08:47:08 +0000 (09:47 +0100)]
Profiler: Fix profiling when disabled on startup
Don't try to call addEvent(EndTrace) if we've just received the inital
message telling us whether to profiler or not.
Change-Id: I78e7437fce46bc1eabfa0c3095ffe11f396c403e
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Thu, 3 Nov 2011 08:24:26 +0000 (09:24 +0100)]
Debugger: Remove unused files
Change-Id: Ib7b9f37226525d2c42729a4ea7fa8f0fd7a4e4c4
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Alan Alpert [Thu, 3 Nov 2011 00:09:38 +0000 (10:09 +1000)]
Cursory docs for QQuickCanvas and QQuickView
Change-Id: I6955164715b07fc11a00466b5a5a1818d97fb9b5
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Thu, 20 Oct 2011 08:03:37 +0000 (18:03 +1000)]
Fix Gravity
Now simulates acceleration instead of setting it, and properties are
renamed to be consistent with AngleDirection
Change-Id: I648aa9122c49b46aa7b7d7796bc25d5bd56bfffe
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Wed, 2 Nov 2011 03:46:01 +0000 (13:46 +1000)]
Only simulate if particle was alive
When spliting the simulation into multiple parts, do not simulate for
times before the particle was born. Otherwise huge simulation times lead
to huge effects even on particles with a simulated birth of near the end
of that time.
Change-Id: I7ff507b27bf819dbebd61934b9523b23316b5e80
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kai Koehne [Wed, 2 Nov 2011 11:19:56 +0000 (12:19 +0100)]
Debugger: Remove widgets dependency for qtquick2 inspector
Change-Id: I596a49375afc1e148fec1aabe0a7d47a81e7442a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Kai Koehne [Wed, 2 Nov 2011 11:21:11 +0000 (12:21 +0100)]
Debugger: Fix compile of qmldbg_qtquick1 plugin on Windows
Change-Id: I5e1991365aa633319ac828898d35d239089816c0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Alan Alpert [Tue, 1 Nov 2011 10:13:35 +0000 (20:13 +1000)]
Make initialize work despite pending resets
This allows for the data to be updated instantly, instead of waiting for
the reset in the next paint event. This is needed by the
QQuickImageParticle autotest to pass stably.
Change-Id: I554eb9d9ddbfc6ba06264dedafb14498685e04cf
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 1 Nov 2011 04:16:09 +0000 (14:16 +1000)]
Fix SizeRootObjectToView mode
It is not yet possible to check if the window has been resized (after
the refactor branch merge). Instead, resize to rootObject regardless
only if the current view has no visible area.
Task-number: QTBUG-22019
Change-Id: I158aaa11862529745ad389e1cbadb6a0ad18c742
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Wed, 2 Nov 2011 03:44:06 +0000 (13:44 +1000)]
Delete view at end of test
Change-Id: I290536bd975e7e6f6f65cf964604664faf7d3056
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Fri, 14 Oct 2011 06:44:46 +0000 (16:44 +1000)]
Fix incorrect cache indexes when consecutive list items are removed.
When cached model items are removed listItemsRemoved will try and append
a new cache only range onto a preceding one where possible. Previously
it would then re-run that range so the current indexes in the list were
incremented before moving onto the next range, which meant that the
current indexes were incremented by size of the previous range twice.
Instead of processing the range a second time increment the cache
indexes directly when inserting a cache only range and move directly
onto the next range in the list.
Change-Id: I63418c4397f911cefb521c5a5b0dd25faf66e08b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Mon, 3 Oct 2011 00:52:38 +0000 (10:52 +1000)]
Add support for more sequence types
This commit adds support for more sequence types by adding a sequence
wrapper. This class enables conversion between v8::Array and C++
sequences of various types (currently just QList<int>, QList<qreal>,
QList<bool>, QList<QString>, QList<QUrl> and QStringList), but more
types can be added later if required).
When a JavaScript object is created from such a sequence, its
prototype object is set to the v8::Array prototype object. The
indexed setter, indexed getter, length and toString methods are
implemented directly or in terms of the underlying sequence resource.
Note that currently, sequences of ValueTypes are NOT supported, due to
the fact that operations like:
someObj.someValueTypeSequence[i].x = 5;
would not behave as required.
Task-number: QTBUG-20826
Task-number: QTBUG-21770
Change-Id: I36deb448fb0e87a32084a900e70a2604ff369309
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Yann Bodson [Tue, 1 Nov 2011 22:42:16 +0000 (08:42 +1000)]
Add Text.onLineLaidOut example
Change-Id: I87bef980cea9c9b5525c3dc88c15b4a9a555888c
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Yann Bodson [Tue, 1 Nov 2011 06:55:19 +0000 (16:55 +1000)]
QDeclarativeStyledText::parse on empty tag causes assert in QString
Task-number: QTBUG-22058
Change-Id: I7141002b751722ab34b378215251562153c4ff46
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Jani Uusi-Rantala [Tue, 1 Nov 2011 19:30:55 +0000 (21:30 +0200)]
Fix most of the declarative bindings failing on ARM.
There was a mismatch between 32 and 64-bit integers which
caused a lot of qdeclarative unit tests to fail and QML to
generally not work properly on ARM.
All of the failing auto tests pass now on ARMV7.
Change-Id: Icf230f79e56c15743c6ee943859ac02e649a6e0a
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kai Koehne [Mon, 31 Oct 2011 13:40:37 +0000 (14:40 +0100)]
Debugger: Add QML_DEBUGGER_VERBOSE environment variable
Print detailed information about plugin loading when QML_DEBUGGER_VERBOSE
is set in the environment.
Change-Id: I48b9df01948b2cd226969cfbc520801527ff5492
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Wed, 26 Oct 2011 13:52:48 +0000 (15:52 +0200)]
Debugger: Split inspector plugin into a qtquick1 and a qtquick2 plugin
This allows the inspector to be used also when e.g. qtquick1 and widgets libraries
are not available.
Change-Id: Id8510ea2a1a9c2a776d67e6d7732a4e40363d5a3
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kim Motoyoshi Kalland [Tue, 1 Nov 2011 11:53:13 +0000 (12:53 +0100)]
Fixed Rectangle where the radius is less than half the border width.
Task-number: QTBUG-21215
Change-Id: Ife6a8aa9070e3da49d02825507a00feb1ecf338f
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Kim Motoyoshi Kalland [Mon, 31 Oct 2011 11:25:13 +0000 (12:25 +0100)]
Avoid crash when ShaderEffect source is not available.
Task-number: QTBUG-21711
Change-Id: I65992ef69a0db829054971125bfb8eb9c150ee99
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Kim Motoyoshi Kalland [Tue, 1 Nov 2011 10:56:25 +0000 (11:56 +0100)]
Repaint when the ShaderEffect's shader properties change.
Task-number: QTBUG-22176
Change-Id: I742d67fc9d4b379ffe931053c096153394a93bec
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Martin Jones [Tue, 1 Nov 2011 00:05:47 +0000 (10:05 +1000)]
Ensure that chained incubation works from componentCompleted.
Make chained AsynchronousIfNested initiated from componentComplete
work correctly, i.e. asynchronous incubator is not Ready until
all chained creation is Ready.
Change-Id: I286cc10e2f09e36dcc6034f3f23681e833d7e6e8
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Friedemann Kleint [Fri, 28 Oct 2011 08:24:28 +0000 (10:24 +0200)]
Declarative: Fix gcc 4.6 warnings about assigned/unused variables.
Change-Id: Iac4bb4a6b1aa4071a239bb25f25f01b71e36868b
Reviewed-by: Alexis Menard <alexis.menard@openbossa.org>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Simon Hausmann [Fri, 28 Oct 2011 10:06:17 +0000 (12:06 +0200)]
Fix bus errors on Linux/ARM due to word alignment issues
If the kernel is configured to SIGBUS on unaligned word access, then the code
in qdeclarativecompiler.cpp that accesses the structs that follow
QDeclarativeVMEMetaData in memory may cause the process to get killed. They
contain integers but they're not aligned.
Ensure that the size of the first structure gives integer alignment for the
following structures.
Change-Id: Iad85557aa3be4949f653d389dbaa3666960be404
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Friedemann Kleint [Fri, 28 Oct 2011 08:22:25 +0000 (10:22 +0200)]
Declarative: Remove qpa-conditionals from test profiles.
Change-Id: I72619c5f76cd455c3fd4ca992dadef73901c1b18
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Alan Alpert [Thu, 20 Oct 2011 10:28:22 +0000 (20:28 +1000)]
Add non-floats to particle type
booleans exposed for the 1.0 or 0.0 floats, and color exposed as 0.0-1.0
even though it's 0-255 internally.
Change-Id: Idc7ab2527fef150fddb077fc73ac1c7cf122cfdd
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Mon, 31 Oct 2011 06:49:42 +0000 (16:49 +1000)]
Add performance guideline page for the particle system
Change-Id: I1c49dc574921b1edbd2d0874bc5b4e806ce42416
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Andrew den Exter [Fri, 28 Oct 2011 06:15:38 +0000 (16:15 +1000)]
Workaround windows not gaining focus on mac.
Delaying giving focus to the rootItem until the canvas window gains
focus doesn't work if the window never gains focus. So give focus to
the rootItem immediately so text input continues to work while
QTBUG-22415 is being resolved.
Task-number: QTBUG-22409
Change-Id: I1bdb13485219d0c2a2f8bdcb3e0972444e3813f2
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Glenn Watson [Mon, 31 Oct 2011 03:06:44 +0000 (13:06 +1000)]
Fix crash when trying to access a missing texture.
Check for valid texture pointer before calling member function
to determine if it is part of a texture atlas.
Change-Id: Ic36ad21f79c514aa92e4c37c467fb4e5d91b4e60
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Glenn Watson [Thu, 27 Oct 2011 03:13:23 +0000 (13:13 +1000)]
Force V8 debugger load on startup instead of on demand.
The V8 debugger code can take several hundred milliseconds to
start. This is by default loaded and unloaded on demand, for
example whenever a script is compiled. This has a significant
effect on the timing reported by the QML profiler in Qt
Creator. This change forces the debugger context to be loaded
when the v8 context is created, so that this cost is paid
once on startup and no longer affects the QML profiling times.
Task-number: QTBUG-22170
Change-Id: I5533b53908b3c53e18b0eb870ed6166d109429df
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Fri, 28 Oct 2011 10:10:31 +0000 (20:10 +1000)]
Clean up ImageParticle shader
Avoid implicit float casts in GLSL and bail out of size == 0 properly
Change-Id: I72a742697089d88c64fc05d23d3009cdcfdb480b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Mon, 31 Oct 2011 09:59:36 +0000 (19:59 +1000)]
Mark ImageParticle as insignificant
CI system only unstable failures take a while to track down and aren't
worth blocking all commits for.
Change-Id: I10750b644f13ad25f66afb3f9551988e1ed2d8b6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Kai Koehne [Mon, 31 Oct 2011 12:45:10 +0000 (13:45 +0100)]
Debugger: Fix crash on exit
It's not guaranteed that the static instance of QPerformanceTimer
still exists when the (also static) QDeclarativeDebugTrace instance
is deleted.
Change-Id: I24ca3154e592011af43714c2574f7243f7550109
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Fri, 28 Oct 2011 07:05:42 +0000 (09:05 +0200)]
Pass the right line information to signal handlers in Connection element
Make sure that the right line information is passed to v8 when executing
signal handlers in the Connection element.
Change-Id: I384caa40217e9c148fdb4943cf471d1aafcea735
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jiang Jiang [Fri, 28 Oct 2011 13:57:50 +0000 (15:57 +0200)]
Eliminate some warnings
Change-Id: Ic76e02ee0a46002e8a30614fb7b1799dd0b74d95
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Alan Alpert [Fri, 28 Oct 2011 10:07:25 +0000 (20:07 +1000)]
Basic autotest of QQuickSpriteGoal
Depends on the fix for QQuickImageParticle that makes it actually update
the data object.
Change-Id: I12992cbe504988c6df45b319c1e6f6e304b327de
Reviewed-by: Martin Jones <martin.jones@nokia.com>