Kai Koehne [Mon, 14 Nov 2011 11:01:04 +0000 (12:01 +0100)]
Debugger: Don't register v8 callback until client is attached
Registering the v8 debugger callback reportedly slows down
performance. Do this only if a client is really attached. When
attaching, request the already compiled scripts to make sure
breakpoint urls are properly adapted.
Change-Id: I9ff24b7ca53e13da06f70a9e5860bbd4b9aa0d99
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Mon, 14 Nov 2011 15:37:43 +0000 (16:37 +0100)]
Debugger: Extend v8 debugger autotests
Add a few test cases for attaching to a non-blocking process (using the new
timer.qml test file).
Change-Id: I480fb358411b5b19e22bc9875e1809f1faad5514
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Mon, 21 Nov 2011 10:50:30 +0000 (11:50 +0100)]
Debugger: Re-enable autotests for v8 debugger
The crash in getScopes has been fixed in qtbase (commit
ecd31946789)
Change-Id: I853d2567701ac986b30fc9013dac4c05eb450c9a
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Mon, 21 Nov 2011 15:03:53 +0000 (16:03 +0100)]
Debugger: Make registration of services explicit
Services now have to call registerService() themselves in the constructor.
This fixes a race condition where the empty implementation of messageReceived()
was called instead of the one in the subclass because the object wasn't fully
constructed yet.
Change-Id: I590ec8b76e906bdb6b5cdcb18680938edde283ee
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Gunnar Sletta [Tue, 22 Nov 2011 14:15:28 +0000 (15:15 +0100)]
Increase the limit of the QDeclarativePixmapCache to something sensible
The limit used to be much higher, but was changed due to an accidental
tag-along in a commit in April.
Change-Id: Ie9f868b3059758aef87c2e1979ef22d840631930
Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
Gunnar Sletta [Tue, 22 Nov 2011 12:01:30 +0000 (13:01 +0100)]
Remove documentation for non-existing function
Change-Id: I1f08e0501694bde6991eb35adaadb9fa4a3356c1
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Kent Hansen [Mon, 21 Nov 2011 12:35:40 +0000 (13:35 +0100)]
Don't crash when importing script with syntax error
Task-number: QTBUG-22843
Change-Id: I2b1ed6cbbc7a566f54b441359941ea121a9033ba
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kent Hansen [Tue, 22 Nov 2011 14:10:42 +0000 (15:10 +0100)]
v4: Get rid of dependency on QQuickAnchorLine type
Delegate the meta-type id query and value comparison to
QDeclarativeMetaType.
Register a comparison function for QQuickAnchorLine in
QQuickItemsModule, so that not even QDeclarativeMetaType needs to
know the type declaration. (This is needed in order to be able to
move the items to a separate library.)
Change-Id: I6404d01b74143946ae0a79fa18d1777b675e4194
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Kent Hansen [Tue, 22 Nov 2011 11:01:48 +0000 (12:01 +0100)]
Add QtQuick1 plugin's major version to target path
This ensures that the plugin is only loaded when "import QtQuick 1.0"
(or 1.x, rather) is used, and not when "import QtQuick 2.0" (or a
later version) is used.
Change-Id: I3f7621f316449071d7a891c72840ab1d2fd6b962
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Martin Jones [Tue, 22 Nov 2011 07:26:49 +0000 (17:26 +1000)]
Fix PathView insertion/removal/move item offset
Fix item positioning post model changes and add auto tests. Also
fixes crash when inserting items before currentIndex, causing
offset to increase beyond item count.
Task-number: TBUG-22785
Change-Id: I17000ba497a190554c8b137a72b7e6551e8a0e56
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Bea Lam [Tue, 22 Nov 2011 07:04:57 +0000 (17:04 +1000)]
tst_QQuickGridView::unaligned() was failing on mac
Failing when threaded renderer is enabled. Ensure remove is
applied before testing the result.
Change-Id: I156efb43735ee0efd6a6f0b9a721979aafe17605
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Michael Brasser [Wed, 23 Nov 2011 05:30:14 +0000 (15:30 +1000)]
Stabilize Behavior tests.
Change-Id: I6ef68fa5f8fd7731c3e683de517ec3a2cb05365b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Aaron Kennedy [Tue, 22 Nov 2011 13:43:10 +0000 (13:43 +0000)]
Don't disconnect mid binding evaluation
Task-number: QTBUG-22816
Change-Id: I7a958203945a051322228b6fade9e1d49d5f4c4a
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Kai Koehne [Fri, 11 Nov 2011 16:18:21 +0000 (17:18 +0100)]
Profiler: Preserve line information also for optimized bindings
Change-Id: Ibd5abb42364711fab454e6b9c13af53462730471
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kai Koehne [Wed, 24 Aug 2011 11:51:07 +0000 (13:51 +0200)]
Debugger: Move server into it's own thread
So far the debugger infrastructure was running in the GUI thread,
which required e.g. nested event loops to implement blocking behavior.
The server and networking code are now running in their own thread,
while the services are still running in the main thread.
Because v8 isn't thread safe, we're adding two new JSEngines + isolates
to qv8debugservice: One to decode JSON messages in the debugger thread,
and one in the GUI thread.
Change-Id: I746f5e203968f7bcc510fb66118c88ef0fd0cd14
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Christian Kamm [Mon, 21 Nov 2011 09:34:40 +0000 (10:34 +0100)]
qmlplugindump: Fix QObject dump.
* Hide deleteLater and the destroyed signal.
* Add destroy and toString functions.
Task-number: QTCREATORBUG-4903
Change-Id: Icbae3e1c82605baa84ac9cc8f38cd747e4dcf687
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 22 Nov 2011 04:27:34 +0000 (14:27 +1000)]
SpriteImage Example
Click the bear!
Change-Id: I804f95930000ec1b4dec2cd631bc51dd88689d1c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Fri, 18 Nov 2011 02:04:56 +0000 (12:04 +1000)]
Fix inserting before the visible area into cache buffer
Items being inserted after the visible index must be created, even if
they aren't in view (e.g. are in the cache buffer) otherwise they will
not appear at the correct index in the visibleItems list.
Task-number: QTBUG-22772
Change-Id: I235dc766a6abf4988872bb70aa40cdc767df8c96
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Tue, 22 Nov 2011 05:13:28 +0000 (15:13 +1000)]
Try again to fix currentIndex() test
Seems that if the threaded renderer is disabled, updatePolish() isn't
called on the view until after setCurrentIndex(), so then the view
starts at the wrong position and never moves upwards when
setCurrentIndex(0) is executed.
Change-Id: I74da9de8ac432d27189416287e7ea5937c1d6299
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Martin Jones [Mon, 21 Nov 2011 23:28:40 +0000 (09:28 +1000)]
Move path with highlightMoveDuration: 0
Task-number: QTBUG-22786
Change-Id: I10043bfa5d8c622fc4e7a25bcb1f96ef43d23890
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Martin Jones [Thu, 10 Nov 2011 08:33:27 +0000 (18:33 +1000)]
Qt.locale() and JS locale type extension.
Task-number: QTBUG-17129
Change-Id: I69cbbe858735b750b4e37ce489f2fa1ad5d8b5d3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Glenn Watson [Mon, 21 Nov 2011 22:02:17 +0000 (08:02 +1000)]
Emit destruction signal before child contexts are destroyed.
Verbatim comment from bug report:
When using a QtObject inside an item, and then we call a function
in the Component.onDestruction handler of that item, we get a
crash. This happens because the QDeclarativeContextData engine
has been invalidated before reaching
QDeclarativeExpressionPrivate::evalFunction.
Change code to emit the onDestruction signal before the child
contexts are invalidated.
Task-number: QTBUG-22535
Change-Id: Ic4983ae5fdf104ae977189c21dc202c9b02bc2bc
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Glenn Watson [Mon, 21 Nov 2011 23:13:21 +0000 (09:13 +1000)]
Fix default property preventing signals from being emitted.
Change the way connectAlias works so that even if the target
for the connection is not available immediately, anything that
is bound to it is notified when the target is changed.
(Fix is authored by Aaron).
Task-number: QTBUG-21580
Change-Id: Ida23c0e620069c50b123c71b5078929d4c7ec4e4
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Joona Petrell [Mon, 21 Nov 2011 14:50:06 +0000 (16:50 +0200)]
Fix failing openInputPanel autotests
Task-number: QTBUG-21946
Change-Id: I605aca3ba5b01414c9533ca9673f1b51917df755
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 11:23:20 +0000 (12:23 +0100)]
Debugger: Fix Qt library dependencies for autotests
Change-Id: Icf5465a60c7b76d5b80d0ecb40a2bd7eaa2a3689
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aaron Kennedy [Mon, 21 Nov 2011 17:51:31 +0000 (17:51 +0000)]
Adding custom easing curves to property animations
QDeclarativeEasingValueType gets the property customBezierCurve.
This allows to define a custom easing curve as a cubic bezier curve.
Change-Id: I33ae128ce29bba2834eedcbb90a9769a5391f997
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Friedemann Kleint [Mon, 21 Nov 2011 16:02:16 +0000 (17:02 +0100)]
Fix compile.
Fix breakage introduced by
qtbase:
dc0b588162951b3412e835d931637d74cb4e98b5,
missing forward declaration of QInputMethodEvent.
Change-Id: I0b659c97b15b651effb589611641e97156e385d3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 11:26:40 +0000 (12:26 +0100)]
Debugger: Fix QDeclarativeDebugTrace autotest
Change-Id: Ic17c42b6a6e388b92729fd2f653515b714f765b0
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 09:47:36 +0000 (10:47 +0100)]
Silence compiler warnings about unused variables (MSVC)
Fixes most 'C4189: local variable is initialized but not referenced' warnings
Change-Id: I8c5a1ba0a50dd3fcb22294e564425846362ee911
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 08:25:44 +0000 (09:25 +0100)]
Fix MSVC warning about struct vs class declaration
Change-Id: I00dc08c746b30f6d49b831989ae1d0d798b430a5
warning: C4099: 'QMetaObject' : type name first seen using 'struct' now seen using 'class'
warning: C4099: 'QV4Program' : type name first seen using 'class' now seen using 'struct'`
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Mon, 21 Nov 2011 05:48:46 +0000 (15:48 +1000)]
Fix GridView currentIndex test stability
Change-Id: Ib3a8efdc4447712f9877b70338027efcceff558f
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Alan Alpert [Thu, 17 Nov 2011 03:46:08 +0000 (13:46 +1000)]
Clean up static analysis issues.
Just removing overly defensive programming and unused variables.
Change-Id: I1ffe7a5bd46375f74a8e71e7710d29bc1de02b7d
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Rohan McGovern [Mon, 21 Nov 2011 03:02:48 +0000 (13:02 +1000)]
Fixed compile of tst_qdeclarativelistcompositor with -qtnamespace.
This operator== must be in the Qt namespace.
Change-Id: I28cece2b5f54efc3b2b5aed2ef675ff1b6056370
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Martin Jones [Sun, 20 Nov 2011 23:40:11 +0000 (09:40 +1000)]
Doc: Canvas doc review.
Change-Id: I6edf44c1db47ca58c426464f8e4c852bf71176f6
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Andrew den Exter [Wed, 16 Nov 2011 03:08:16 +0000 (13:08 +1000)]
Don't leak objects when a VisualDataModel is destroyed before a view.
If an item is still referenced by a view when the VisualDataModel is
destroyed delete it, otherwise it will leak as the view have no
interface to release it and deleting the item won't delete the package.
Task-number: QTBUG-22672
Change-Id: I7b89962d724d7a391c97722638e03b7a186b8a8f
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Rohan McGovern [Mon, 21 Nov 2011 02:48:06 +0000 (12:48 +1000)]
Fixed more declarative -qtnamespace compilation issues.
Change-Id: I56a00af1e360887af97eb98f2c6756fb90ba75d6
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Toby Tomkins [Mon, 21 Nov 2011 02:29:35 +0000 (12:29 +1000)]
Fix Qt Declarative namespace compilation.
Change-Id: Ib3294278985cd43e40610dacd7b69bf98ff4d788
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Martin Jones [Wed, 9 Nov 2011 22:53:04 +0000 (08:53 +1000)]
GridView sometimes lays out one less column than expected
If the cellWidth/cellHeight was not a whole number the wrapping was
unreliable. Calulate column positions more robustly, i.e. avoid
comparing values subject to rounding errors.
Task-number: QTBUG-21846
Change-Id: Ic3a90b36d542ce8af49461bd524e4405c74aece5
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Glenn Watson [Thu, 17 Nov 2011 02:46:27 +0000 (12:46 +1000)]
Fix v8 handle leak in incubator code.
Release forceCompletion handle that is created in the constructor
to avoid a persistent handle being leaked.
Change-Id: I5b68d586e7a8e6ba48c018e21faac8108387fa2b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 18 Nov 2011 08:18:41 +0000 (18:18 +1000)]
Doc: cleanup list of QtQuick2 elements
Change-Id: Ic07521e31870f5ecd544834c0839034578c62dcf
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Thu, 17 Nov 2011 02:53:26 +0000 (12:53 +1000)]
Rewrite signal handlers at compile time.
Task-number: QTBUG-22726
Change-Id: If2c3c00c646b2ed6b6899573a0b487c8deeaad3f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Gunnar Sletta [Wed, 16 Nov 2011 14:39:45 +0000 (15:39 +0100)]
Copy QSGEngine functions to QQuickCanvas.
Long term we intend to remove the QSGEngine class
all together so this is the first step. It duplicates
some of the logic but doesn't break anything.
Also including an example on how to use it in
examples/declarative/openglunderqml
Change-Id: I69ed93ec5fa1b5c4c746169306d38f8d6ce80477
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Alan Alpert [Thu, 17 Nov 2011 01:43:21 +0000 (11:43 +1000)]
Un-skip Positioners test
This test was skipped because it inexplicably led to a crash on exit,
but this crash is now fixed.
Task-number: QTBUG-21995
Change-Id: I439a410a7f36adef9924d163941a79a39886a5d1
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Kent Hansen [Wed, 16 Nov 2011 11:22:28 +0000 (12:22 +0100)]
Change sync.profile back to using refs/heads/master for qtbase
The issue that caused crashes with a more recent qtbase
was fixed in commit
ddf9883f8d00dcdfd908b38c60114a06ce8af185.
Task-number: QTBUG-22574
Change-Id: Ia85b7265103e03f71585c5b72496af83056a4fcf
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Fri, 18 Nov 2011 07:44:30 +0000 (17:44 +1000)]
Mark unstable test to be ignored
Task-number: QTBUG-22807
Change-Id: I59b4d49c049756d2d133d1455165d16218042663
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Yann Bodson [Thu, 17 Nov 2011 03:13:05 +0000 (13:13 +1000)]
Fix tst_qquicktext autotest
Task-number: QTBUG-21009
Change-Id: I3dea72318b7b6040ddd906a6e870389754d4d750
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Thu, 17 Nov 2011 01:23:52 +0000 (11:23 +1000)]
Parent delegate items to PathView.
This is consistent with ListView and GridView and ensures the items
live only as long as the view and are deleted on application shutdown
where deferred delete events are discarded.
Change-Id: I77174b2725310d068fbba89b57e0da59619ef22a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Thu, 17 Nov 2011 01:23:52 +0000 (11:23 +1000)]
Parent delegate items to PathView.
This is consistent with ListView and GridView and ensures the items
live only as long as the view and are deleted on application shutdown
where deferred delete events are discarded.
Change-Id: I77174b2725310d068fbba89b57e0da59619ef22a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Yann Bodson [Thu, 17 Nov 2011 03:13:05 +0000 (13:13 +1000)]
Fix tst_qquicktext autotest
Task-number: QTBUG-21009
Change-Id: I3dea72318b7b6040ddd906a6e870389754d4d750
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Mon, 14 Nov 2011 01:03:05 +0000 (11:03 +1000)]
Add tests for Undo/Redo and key sequences to TextInput/Edit.
Task-number: QTBUG-22627
Change-Id: Id7072a0a98529bbd5b50b4b292eca7235a7b6149
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 14 Nov 2011 01:03:05 +0000 (11:03 +1000)]
Add tests for Undo/Redo and key sequences to TextInput/Edit.
Task-number: QTBUG-22627
Change-Id: Id7072a0a98529bbd5b50b4b292eca7235a7b6149
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Chris Adams [Thu, 17 Nov 2011 01:56:22 +0000 (11:56 +1000)]
Fix leak in QQuickParticleData
Task-number: QTBUG-22672
Change-Id: I14b436b0d968409bd71a6bf65db6c994f08dece1
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Chris Adams [Thu, 17 Nov 2011 01:56:22 +0000 (11:56 +1000)]
Fix leak in QQuickParticleData
Task-number: QTBUG-22672
Change-Id: I14b436b0d968409bd71a6bf65db6c994f08dece1
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Aurindam Jana [Thu, 17 Nov 2011 12:52:02 +0000 (13:52 +0100)]
InspectorService: fix failing test cases
Change-Id: I741cc8cc2d1004c2c94a1985ed9287aecf613675
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aurindam Jana [Thu, 17 Nov 2011 12:52:02 +0000 (13:52 +0100)]
InspectorService: fix failing test cases
Change-Id: I741cc8cc2d1004c2c94a1985ed9287aecf613675
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 11:59:11 +0000 (12:59 +0100)]
Debugger: Fix QPacketProtocol autotest on Windows
Change-Id: Ica119eb6854cd4d42d022c33c4b2973ae116d279
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 11:24:50 +0000 (12:24 +0100)]
Debugger: Fix warnings about QProcess still running in autotest
Change-Id: Ib0c68629cfe430a0d13b1504f86bfa78e85007b4
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 11:24:50 +0000 (12:24 +0100)]
Debugger: Fix warnings about QProcess still running in autotest
Change-Id: Ib0c68629cfe430a0d13b1504f86bfa78e85007b4
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Thu, 17 Nov 2011 11:59:11 +0000 (12:59 +0100)]
Debugger: Fix QPacketProtocol autotest on Windows
Change-Id: Ica119eb6854cd4d42d022c33c4b2973ae116d279
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kim Motoyoshi Kalland [Tue, 15 Nov 2011 14:59:11 +0000 (15:59 +0100)]
Fixed QQuickShaderEffect::lookThroughShaderCode(), added autotest.
Change-Id: I1e4a1589e1482c21eedab4cd052c16b6653344fb
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Aurindam Jana [Thu, 17 Nov 2011 11:19:45 +0000 (12:19 +0100)]
QDeclarativeDebugServer: Crash Fix
Instantiate QPluginLoader on heap.
Change-Id: I53a7cb669379d374e8b6f83fe998c0bb17fbce33
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aaron Kennedy [Thu, 17 Nov 2011 15:27:04 +0000 (15:27 +0000)]
Fix crash in incubator when a guarded context is deleted
Change-Id: Ice7375c344b7e8d0d11cc6ee0bdfdf864ecd7109
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Aaron Kennedy [Thu, 17 Nov 2011 15:27:04 +0000 (15:27 +0000)]
Fix crash in incubator when a guarded context is deleted
Change-Id: Ice7375c344b7e8d0d11cc6ee0bdfdf864ecd7109
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Aurindam Jana [Thu, 17 Nov 2011 11:19:45 +0000 (12:19 +0100)]
QDeclarativeDebugServer: Crash Fix
Instantiate QPluginLoader on heap.
Change-Id: I53a7cb669379d374e8b6f83fe998c0bb17fbce33
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kim Motoyoshi Kalland [Tue, 15 Nov 2011 14:59:11 +0000 (15:59 +0100)]
Fixed QQuickShaderEffect::lookThroughShaderCode(), added autotest.
Change-Id: I1e4a1589e1482c21eedab4cd052c16b6653344fb
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Yoann Lopes [Thu, 17 Nov 2011 13:25:24 +0000 (14:25 +0100)]
Fixes crash in QSGDefaultDistanceFieldGlyphCache::resizeTexture()
The blit shader was not valid anymore after deleting and recreating a
QQuickCanvas.
Task-number: QTBUG-22783
Change-Id: Id13578006b89859b862685b3a695eb8b59a48c56
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Yoann Lopes [Thu, 17 Nov 2011 13:25:24 +0000 (14:25 +0100)]
Fixes crash in QSGDefaultDistanceFieldGlyphCache::resizeTexture()
The blit shader was not valid anymore after deleting and recreating a
QQuickCanvas.
Task-number: QTBUG-22783
Change-Id: Id13578006b89859b862685b3a695eb8b59a48c56
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Christian Kamm [Thu, 17 Nov 2011 12:57:37 +0000 (13:57 +0100)]
qmlplugindump: Fix dumping empty names for generated QMetaObjects.
Task-number: QTCREATORBUG-6543
Reviewed-by: Roberto Raggi
Change-Id: I2e85432ea8ff84ea4172e462782c0484ed75dcde
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Christian Kamm [Thu, 17 Nov 2011 12:57:37 +0000 (13:57 +0100)]
qmlplugindump: Fix dumping empty names for generated QMetaObjects.
Task-number: QTCREATORBUG-6543
Reviewed-by: Roberto Raggi
Change-Id: I2e85432ea8ff84ea4172e462782c0484ed75dcde
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Gunnar Sletta [Thu, 17 Nov 2011 10:47:17 +0000 (11:47 +0100)]
Add debug description to shader effects
Change-Id: Icb6d45003f534c6e2d8d2382b408de0e368df29c
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Gunnar Sletta [Thu, 17 Nov 2011 10:47:17 +0000 (11:47 +0100)]
Add debug description to shader effects
Change-Id: Icb6d45003f534c6e2d8d2382b408de0e368df29c
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Tero Tiittanen [Thu, 17 Nov 2011 09:00:07 +0000 (11:00 +0200)]
Performance optimization in transform node traversal.
Transform node matrix calculation was modified to use the combined
matrix stack instead of matrix stack. Combined matrix stack has already
been used by clip and geometry nodes.
This improves performance because combined matrix stack stores
pointers (matrix stack stored objects). It also removes duplication of
information.
Change-Id: I1a5a2546fa9aa5a4823328dd8a321ddc42fd15a0
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Charles Yin [Thu, 17 Nov 2011 08:14:44 +0000 (18:14 +1000)]
Optimization for context2d painting
Avoid pass painting state by value.
Change-Id: I86529ee7357b6cadbaa941b296d7ad025977f2aa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Wed, 16 Nov 2011 07:03:56 +0000 (18:03 +1100)]
Stabilize test
Test failed in DST when JS and QDateTime DST methods conflict. The time
in ms since epoch is still correct though, so test data is now within
ranges where they do not conflict (only happens with historical data).
Task-number: QTBUG-22408
Change-Id: I884e28b4681cc10fb25e777d2eabe20d8ac0bce4
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Gunnar Sletta [Tue, 15 Nov 2011 08:44:40 +0000 (09:44 +0100)]
Use QQuickChangeListener for better performance
Change-Id: Ia959cf905fd0a03f7f69b6b65b2eeed8e4a62153
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Kai Koehne [Fri, 11 Nov 2011 14:57:05 +0000 (15:57 +0100)]
Debugger: Add unit tests for v8 profiler service
Change-Id: I556b9c537a43347b42669b2272925af6b05e6014
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Fri, 11 Nov 2011 14:16:24 +0000 (15:16 +0100)]
Debugger: Add test case for profiling an app without block mode
Change-Id: I5c22eb89854eec7d8984504ec81d20892e82b551
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Mon, 14 Nov 2011 12:46:13 +0000 (13:46 +0100)]
Debugger: Print debuggee output for failing v8 autotests
Change-Id: I80f963042f0d2e30f5a715fca3b60a66751efbb4
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Mon, 14 Nov 2011 15:30:22 +0000 (16:30 +0100)]
Debugger: Fix autotest for calling v8::gc()
Change-Id: Iae47c16adf417b8ac74b36cffcdb076201e81b82
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
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>