Kent Hansen [Fri, 25 Nov 2011 09:00:07 +0000 (10:00 +0100)]
Remove QtQuick1-specific define from declarative.pro
This only needs to be defined in qtquick1.pro; it's used
in qtquick1/util/qdeclarativeview.cpp.
Change-Id: I14dbf3e192218c6cc740295d4f575842de48dddc
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kent Hansen [Wed, 23 Nov 2011 11:09:15 +0000 (12:09 +0100)]
qml debugger: Create abstraction for State management
State and PropertyChanges aren't part of the core qml types. The
(general-purpose) qml debugger shouldn't have to know those types;
they are only relevant when QtQuick (2.0) has been imported.
Introduce a delegate interface that performs State processing.
Implement a delegate for QtQuick 2, and install it when the QtQuick 2
module is imported.
Change-Id: I8af1157346ca9365eb0f7b99ccb71744d17fcebc
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kent Hansen [Fri, 25 Nov 2011 22:03:24 +0000 (23:03 +0100)]
qdeclarativedebugclient: Fix flaky autotest
The connectToHost() call can try to establish the connection directly
(synchronously), in which case the warning message will be output
before the subsequent ignoreMessage() call, causing the test to fail.
Change-Id: I08a6a7d4d090cbb942c348e0787b586c71318f99
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Alan Alpert [Mon, 28 Nov 2011 03:11:25 +0000 (13:11 +1000)]
Explain the implications of QML versions a little more
Change-Id: I2b1667333a18daebba5224e210f219721096bc91
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kim Motoyoshi Kalland [Fri, 25 Nov 2011 09:01:32 +0000 (10:01 +0100)]
Removed ShaderEffectItem and qt_ModelViewProjectionMatrix.
ShaderEffectItem was replaced by ShaderEffect, and
qt_ModelViewProjectionMatrix with qt_Matrix a while ago. The old
names were kept working for a transition period, but it's now time
to remove them completely.
Change-Id: Ife030d2122250784fe2ec80b1f8645301b0165d0
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Alan Alpert [Wed, 23 Nov 2011 01:43:49 +0000 (11:43 +1000)]
Better falling bear sprite
He looked too comfortable.
Change-Id: I8de05188587c53b18639cd2dc2a011db193b7790
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Fri, 25 Nov 2011 01:41:04 +0000 (11:41 +1000)]
qmltestrunner reports wrong LOC for failed test cases
The callerFile() and callerLine() calls GetFrame() with incorrect index,
the right index should be the current frame index + 1.
Task-number:QTBUG-22887
Change-Id: I694073b80853bf66e02414a158c8e155f8be8390
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Michael Brasser [Thu, 24 Nov 2011 04:43:09 +0000 (14:43 +1000)]
Rewrite Connections signal handlers at compile time.
Task-number: QTBUG-22726
Change-Id: I039d54661bbf7d44912c894bf0cc1d70023a9187
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aurindam Jana [Fri, 25 Nov 2011 12:34:35 +0000 (13:34 +0100)]
DeclarativeDebugServices: Cleanup Code
Removed addEngine and removeEngine methods from services
that do not use the functions of QDeclarativeEngine.
Change-Id: Id2ddcbe8cf5706d1e4ca4b59011c7e3574cfdba8
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Aurindam Jana [Thu, 24 Nov 2011 17:12:17 +0000 (18:12 +0100)]
V8DebugService: Optimize Code.
Replace usage of QJSEngine with V8 APIs.
Change-Id: I5221d11c1fb96a4912063d452af437a7f5bdb471
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kent Hansen [Fri, 25 Nov 2011 08:20:28 +0000 (09:20 +0100)]
Remove harfbuzz cruft from {declarative,qtquick1}.pro
As of
b97215b04c0bf12ecfd51ccdeaedd1fab5e8bc03 in qtbase, modules
outside of qtbase can include private text headers without depending
on the harfbuzz sources being present.
Change-Id: Idb3d70d70c1f0f194382a405daa573e66146272a
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Friedemann Kleint [Fri, 25 Nov 2011 07:27:09 +0000 (08:27 +0100)]
QtDeclarative: Fix building of tests on Windows.
Export inner classes, add missing module.
Change-Id: Iabc69ac5f08b70ade994c26d36bd08359fa71137
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Friedemann Kleint [Fri, 25 Nov 2011 07:44:51 +0000 (08:44 +0100)]
QtDeclarative: Remove obsolete qmetaobjectbuilder-test.
The test now lives in qtbase.
Change-Id: I50166795d8cae039272bc9448b9e1fc64248e10f
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Andrew den Exter [Fri, 25 Nov 2011 06:09:38 +0000 (16:09 +1000)]
Fix crash calling VisualDataGroup.setGroups during initialization.
A VisualDataModel's meta type is constructed in componentComplete(),
avoid accessing it before then.
Change-Id: Ic9fdfa3c458d5da3014289b777f74df87aa97103
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Fri, 25 Nov 2011 03:33:09 +0000 (13:33 +1000)]
Fix searchs for insert positions in QDeclarativeListCompositor.
When scanning for a start range don't stop on ranges that don't
have an group flags unless that range is the terminal range.
This fixes a couple of issues where moving an item to the end
of the list would position it after a prepend only range instead
of before it, or would miscalculate the iterator offset resulting
in invalid indexes in the insert range.
Change-Id: Ic4aa001edf43ec86a65d432cd8f80abf0b44d276
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 25 Nov 2011 05:22:09 +0000 (15:22 +1000)]
Remove ints from mouse event handling.
Change-Id: Icda13ae3644dc274e08e626545df75d3e561cf87
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Andrew den Exter [Thu, 24 Nov 2011 02:53:05 +0000 (12:53 +1000)]
Add getText(), insert(), and remove() functions to TextEdit.
The getText() function provides access to the plain text content of a
TextEdit, and the insert() and remove() functions allow the text content
to be edited inline instead of having to assign an edited string to the
text property to make any change.
Change-Id: Id4edf0312358e2d2db45e4c649b7bd3d22f02ffa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Thu, 24 Nov 2011 07:22:31 +0000 (17:22 +1000)]
Improve performance on touch event delivery.
We continuously constructed and sorted the paint ordered items for every
touch event (and paint), even though the list in most cases is identical
to the childItems list, and when it is different it rarely changes.
Detect when we can just use the childItems list directly, and otherwise
cache the ordered items list.
Change-Id: I5db0f19fc021d0c95aa6f8372ae47e6ce138d5ad
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kent Hansen [Thu, 24 Nov 2011 13:54:13 +0000 (14:54 +0100)]
Make the particles benchmarks compile again
Change-Id: Ia56fcb06ee1ef73d81288358f584cb65e3242254
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kent Hansen [Thu, 24 Nov 2011 13:52:35 +0000 (14:52 +0100)]
Fix style issues
Make the Sanity Bot happy.
Change-Id: Idb6d7f8c758de991c60e100b76d54ad49e16212b
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Gunnar Sletta [Thu, 24 Nov 2011 13:12:56 +0000 (14:12 +0100)]
Propegate the smooth property to the textureprovider
Task-number: QTBUG-22880
Change-Id: I693a44e87fb87bc92e1647f6158d23986f98623a
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Pekka Vuorela [Tue, 15 Nov 2011 11:43:16 +0000 (13:43 +0200)]
Added test for input method selection in TextInput
Change-Id: I4438625f9bb82e53bbdf173c9148f587984d7f81
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Aurindam Jana [Thu, 24 Nov 2011 12:14:21 +0000 (13:14 +0100)]
QDeclarativeDebugService: Crash fix
Query for serviceNames in registerService.
Change-Id: I570bd68c424cec696ca813a7fa1b485b64e328a4
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Pekka Vuorela [Thu, 17 Nov 2011 12:34:06 +0000 (14:34 +0200)]
QQuickTextInput - Remove nonexisting method from header
Change-Id: I48aa6efec784ea3ae937636083f6ce211521bfc6
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Pekka Vuorela [Tue, 15 Nov 2011 16:17:29 +0000 (18:17 +0200)]
TextInput elements not to have tentative commit in inputMethodQuery
Tentative commit should not be part of surrounding text, it's already
a property of the input method.
Change-Id: I64aec9763fb20770b6729f7f59dcbe23cf5a6718
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Kim Motoyoshi Kalland [Mon, 21 Nov 2011 13:02:45 +0000 (14:02 +0100)]
Fixed assert during QQuickCanvas::hideEvent().
Also fixed a memory leak in the non-threaded renderer so that it
is on par with the threaded one.
Change-Id: Ie3111730a9d10085c83f7aafceda240419b722cd
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Aurindam Jana [Fri, 18 Nov 2011 15:41:08 +0000 (16:41 +0100)]
ConsoleAPI: Use environment variable
Show detailed information, such as file and line number, for
console.log, console.debug and print when the environment variable
QML_CONSOLE_EXTENDED is set.
Change-Id: I8f660f58d0fd08971ce9706b4a418ed60f312980
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Joona Petrell [Fri, 18 Nov 2011 11:19:09 +0000 (13:19 +0200)]
Get rid of unused inputMethodQuery and inputMethodEvent functions in QQuickCanvas
* in Qt5 input method events and queries are meant to be sent directly to
QInputPanel::inputItem() instead of the focused QWindow
* protected inputMethodEvent was actually never called by QWindow::event()
like it called other specialized event functions
Change-Id: I68cced106808098c320841d6a17a0cc170a8369f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Kent Hansen [Tue, 22 Nov 2011 14:56:10 +0000 (15:56 +0100)]
Move registration of QtQuick 2 types to separate class
Just a bit of cleanup to make QtQuick2's definition follow the
convention of QtQuick1, in preparation of moving QtQuick2 to its own
library.
Change-Id: If9e19e5f5512f9417373bb977bcb424186554c8f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kent Hansen [Tue, 22 Nov 2011 12:26:20 +0000 (13:26 +0100)]
Move QDeclarativeListModel and friends from util/ to qml/
QDeclarativeWorkerScript depends on QDeclarativeListModel et al, so the latter
should also reside under qml/.
Note that QDeclarativeOpenMetaObject also had to be moved, since
QDeclarativeListModel depends on it.
Change-Id: I164cba0e530d22b5771056a2acde12a18d5e83e1
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Kent Hansen [Mon, 21 Nov 2011 10:38:26 +0000 (11:38 +0100)]
Move QDeclarativeApplication from util/ to qml/
QDeclarativeEngine/QV8Engine depend on QDeclarativeApplication,
so this class should reside under qml/, not util/.
Change-Id: I2cd49ba1170bfb610a7607525891cb80c8828f27
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Martin Jones [Thu, 24 Nov 2011 00:16:42 +0000 (10:16 +1000)]
Remove unused code.
Change-Id: Ib6ed3b9ff80593ce84930c0837201be3516b7918
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Martin Jones [Thu, 24 Nov 2011 00:35:08 +0000 (10:35 +1000)]
Skip tst_QQuickListView::resizeFirstDelegate unstable test
Task-number: QTBUG-22872
Change-Id: Ie77701f4f2ab5c56106f9c58b9ace869868e3452
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Michael Brasser [Mon, 21 Nov 2011 05:51:54 +0000 (15:51 +1000)]
Use the AST for binding rewriting when possible.
Change-Id: I1ac8bd39ea7e02f7c236c030ca233e1060746431
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
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>