profile/ivi/qtdeclarative.git
12 years agoSkip some font loader tests for Windows
Charles Yin [Mon, 19 Mar 2012 03:27:51 +0000 (13:27 +1000)]
Skip some font loader tests for Windows

Windows currently does not support font loader yet.

Change-Id: I370e41c1f2e2a45787741414a6e7bf00cc3f6c3e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDon't change the executable name if only build in debug mode on Windows
Charles Yin [Mon, 19 Mar 2012 03:40:42 +0000 (13:40 +1000)]
Don't change the executable name if only build in debug mode on Windows

Change-Id: I298c14d6ea5829d23a4f8b57b9c2f30546e12e80
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix qmldevtools library build error on Windows
Charles Yin [Mon, 19 Mar 2012 03:46:22 +0000 (13:46 +1000)]
Fix qmldevtools library build error on Windows

$$Qt.qml.sources not recongnized on Windows, use relative path instead.

Change-Id: Ia30acc34eff5193bea66ff06754b1cd2b2524878
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoMake qqmlinspector test work on Windows
Charles Yin [Mon, 19 Mar 2012 04:05:23 +0000 (14:05 +1000)]
Make qqmlinspector test work on Windows

Change-Id: Ib7399f9a005d3674fcb46c605cea3a8d40c21284
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoNotify QQJSE::DW of expression deletion during dtor
Chris Adams [Mon, 19 Mar 2012 02:19:53 +0000 (12:19 +1000)]
Notify QQJSE::DW of expression deletion during dtor

QQmlJavaScriptExpression::DeleteWatcher's wasDeleted() function simply
checks to see if the pointer to the expression being watched is null.
This commit ensures that the DeleteWatcher's expression pointer is
set to null during QQJSE::dtor().

Change-Id: I566737bf30b4466ba96d771d9846fc3dd860cd2f
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoDebugger: Fix compilation with C++11
Kai Koehne [Fri, 16 Mar 2012 13:05:05 +0000 (14:05 +0100)]
Debugger: Fix compilation with C++11

Change-Id: I6f753d14aa381fd29aadfc7c649599beb4ec4a9a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQmlDebugging: Object Tree and States List
Aurindam Jana [Mon, 12 Mar 2012 13:08:56 +0000 (14:08 +0100)]
QmlDebugging: Object Tree and States List

All created instances are stored under the root context.
Check for the creation context of the object when building
up the tree. Do the same when building up the states list.

Change-Id: I8716d9966a61b8f7cb3ad4b7ab5acd4c94b4cd03
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoWhen clearing an incubator also clear incubators it is waiting for.
Martin Jones [Mon, 19 Mar 2012 07:37:02 +0000 (17:37 +1000)]
When clearing an incubator also clear incubators it is waiting for.

If an incubator is cleared while waiting for other incubators
to complete also clear the incubators it is waiting for.

Change-Id: I83470920c0fd8a23d0098849192555f7478bb492
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoResetting a model can cause a crash in views with header/footer.
Martin Jones [Fri, 16 Mar 2012 08:45:39 +0000 (18:45 +1000)]
Resetting a model can cause a crash in views with header/footer.

Geometry listeners were called for deleted header/footer.

Change-Id: I47854178232f8a4ab5e19a931901b49741fec388
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoEnsure section header/footer are cleaned up.
Martin Jones [Fri, 16 Mar 2012 07:01:11 +0000 (17:01 +1000)]
Ensure section header/footer are cleaned up.

If the model is cleared or replaced with an empty one,
the section headers should be released.

Change-Id: Ia2f070c312593743b2c5332a6c69facaf222ee6d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoDon't crash view while changing model.
Martin Jones [Fri, 16 Mar 2012 04:48:58 +0000 (14:48 +1000)]
Don't crash view while changing model.

Set model to null before adjusting view position, as changing
position can trigger a refill() if the view is animating at
that instance.

Change-Id: I4bc20766b1ab906799213b149c84a1bdb268c200
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoFix QQuickCanvas test failure.
Andrew den Exter [Mon, 19 Mar 2012 07:27:38 +0000 (17:27 +1000)]
Fix QQuickCanvas test failure.

Switch to a QTRY_COMPARE to allow a little more time processing the
event loop.

Change-Id: I4f14feb5cbc7d11654f6c9089baff4ae67d894db
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix grabbing to wait until the image has actually been grabbed.
Michael Brasser [Mon, 19 Mar 2012 03:33:23 +0000 (13:33 +1000)]
Fix grabbing to wait until the image has actually been grabbed.

Change-Id: I3535c57b5d8dd99c8a6cf24ccb1b56af298fcfe6
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix bug in v4 strict equality.
Michael Brasser [Wed, 14 Mar 2012 01:35:13 +0000 (11:35 +1000)]
Fix bug in v4 strict equality.

Change-Id: I184065e0b7c8c6536f2081b9bf03e98992a4c9fe
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoSmall LSB hacks
Harald Fernengel [Tue, 13 Mar 2012 20:34:05 +0000 (21:34 +0100)]
Small LSB hacks

Enable building QtDeclarative with the LSB compiler

Change-Id: I3a81247670f47db3d861910150a722bc8ac7691a
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoWindows: Fix file URL issues in declarative autotests
Miikka Heikkinen [Wed, 14 Mar 2012 14:42:58 +0000 (16:42 +0200)]
Windows: Fix file URL issues in declarative autotests

Fixed by using testFileUrl() shared utility function where appropriate
instead of testFile() or various other ways file URLs were being
incorrectly used.

Task-number: QTBUG-24779
Change-Id: I48cbd297d419238f42ea45132344b7e5a487b6f1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix tst_qquickimageparticle test compilation with Visual Studio
Miikka Heikkinen [Wed, 14 Mar 2012 15:09:06 +0000 (17:09 +0200)]
Fix tst_qquickimageparticle test compilation with Visual Studio

MSVC doesn't support setenv or unsetenv functions, so use
qputenv instead.

Change-Id: Ife4eb056e6c87d23774512c61b13a3ae3d8ac9ce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoAllow threaded compilation in an async Loader
Martin Jones [Tue, 6 Mar 2012 08:03:33 +0000 (18:03 +1000)]
Allow threaded compilation in an async Loader

Enables threaded compilation for a Loader "source".

Change-Id: I2d60a3ace07aab58f3b8f069e45a2864178c959f
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoSupport for multiple textures in the default distance field glyph cache.
Yoann Lopes [Wed, 14 Mar 2012 15:11:10 +0000 (16:11 +0100)]
Support for multiple textures in the default distance field glyph cache.

The default implementation of the distance field glyph cache can now
store the glyphs of one font in several textures, allowing to cache more
glyphs at once. The default maximum number of textures per cache is 3.
Glyphs are recycled when all textures are full.

Change-Id: I28d2d6cf5aa409141e2700b505023f15d3c2cd26
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoFix merge
Alan Alpert [Mon, 12 Mar 2012 02:56:12 +0000 (12:56 +1000)]
Fix merge

Examples are in quick, not qtquick, since the rename merge.

Change-Id: Ideb677752c3ea320bbddba49204d37e8a34e2609
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
12 years agoDon't assert if focus is already clear.
Alan Alpert [Mon, 12 Mar 2012 08:48:05 +0000 (18:48 +1000)]
Don't assert if focus is already clear.

Already cleared focus should exit the function without terminating the
runtime.

Task-number: QTBUG-24714
Change-Id: Ia8c6be0d88e43d1f71112acc7bac3eb674f22de8
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDon't leak function objects created by VisualDataModel.
Andrew den Exter [Thu, 15 Mar 2012 05:55:24 +0000 (15:55 +1000)]
Don't leak function objects created by VisualDataModel.

Function objects created from a FunctionTemplate are not short lived,
and the objects created by a VisualDataModel can change between
instances meaning a template is needed per instance.  So use an object
template as a constructor instead of a function.

Change-Id: I364c6e4f714a623b7adb7475a3ee9862eeeeb119
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoSet more sensible Flickable default input filtering parameters
Martin Jones [Wed, 14 Mar 2012 06:56:46 +0000 (16:56 +1000)]
Set more sensible Flickable default input filtering parameters

Shouldn't throw anything away by default.  Also fix bug that
flicking back into bounds from outside bounds halved velocity.

Change-Id: I3c2d303a9e46910439dc8bfb01771376f634a684
Reviewed-by: Laszlo Agocs <laszlo.p.agocs@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoFix crash caused by dereferencing collected v8 data
Chris Adams [Tue, 13 Mar 2012 03:30:39 +0000 (13:30 +1000)]
Fix crash caused by dereferencing collected v8 data

If a var property of a QObject is read after the v8 data associated
with the qobject has been deleted but prior to the DeferredDelete
event being processed, the varProperties array will be null and
a crash will occur.

This patch ensures that we check for this condition in both the
access and set codepaths for var properties, and also ensures
that an object which has previously been queued for deletion cannot
be referenced in JS.

Finally, it adds a unit test to ensure that we don't regress.

Task-number: QTBUG-24748
Change-Id: Idde384ca01e18f4dcf9e376e9379f2c5eb410e14
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoDon't allow tst_QJSEngine or tst_QJSValue instance to be collected
Chris Adams [Thu, 15 Mar 2012 00:20:26 +0000 (10:20 +1000)]
Don't allow tst_QJSEngine or tst_QJSValue instance to be collected

Both of those unit tests currently change the ownership of the test
instance object, which could result in it being collected by the JS
GC and deleted if events were processed.

Change-Id: I5a9821fb56e19af1d52fea46e54755875dfbb29a
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoRemove binding dependency on QQmlExpression
Aaron Kennedy [Fri, 9 Mar 2012 08:16:50 +0000 (09:16 +0100)]
Remove binding dependency on QQmlExpression

This is the first step to creating much lighter weight bindings that
are tuned for the specific scenario in which they're used.

Change-Id: Ib985dcff25679b711b5c634bbc891aa7902bf405
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoEnsure that dynamic property storing QObject ptr notifies on delete
Chris Adams [Fri, 27 Jan 2012 01:33:37 +0000 (11:33 +1000)]
Ensure that dynamic property storing QObject ptr notifies on delete

Previously, when a QObject ptr was stored in a dynamic variant
property, the value of the property could change (to a zero ptr)
if the QObject was deleted without a notify signal being emitted
by the QDeclarativeVMEMetaObject which stores the property.

This commit ensures that such a notify signal is emitted correctly.

Task-number: QTBUG-23451
Change-Id: I5689abd984b177737f8d5f18950838b73ebde328
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoLet V8 throw the exception when QML property lookup fails
Kent Hansen [Wed, 14 Mar 2012 12:39:31 +0000 (13:39 +0100)]
Let V8 throw the exception when QML property lookup fails

Only V8 knows whether a failed property lookup should actually cause
a ReferenceError to be thrown. When evaluating a "typeof" expression,
for example, a ReferenceError should not be thrown even if the
expression involves global variables that don't exist, according to
the ECMA-262 specification.

QML should try to match the standard JavaScript behavior. This is
achieved by simply returning an empty value handle (to signify the
absence of the property), and leaving it to V8 to throw an exception
as appropriate.

Task-number: QTBUG-21864
Task-number: QTBUG-24448
Change-Id: I9945adcab98fc3b801371163367473d6af0ab31a
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoRemove warning about missing file from parserstress test
Miikka Heikkinen [Wed, 14 Mar 2012 14:56:22 +0000 (16:56 +0200)]
Remove warning about missing file from parserstress test

There is no dummy.qml, so trying to find it will cause a warning
and return an empty string. Since the url is optional anyway and
apparently not relevant to this test, just use empty QUrl directly.

Change-Id: I11ba742dedccd6bdea226f680aa57c957afc7dc7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWindows: Mark several declarative test cases insignificant
Miikka Heikkinen [Wed, 14 Mar 2012 14:52:35 +0000 (16:52 +0200)]
Windows: Mark several declarative test cases insignificant

These tests are marked insignificant for now to make CI runs pass.
Insignifications need to be removed once the related issues are fixed.

Change-Id: I3a1d36e5b17cf2f1b2f00b20b615359d96975f2b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoUse the same ReferenceError message wording as V8
Kent Hansen [Wed, 14 Mar 2012 11:51:22 +0000 (12:51 +0100)]
Use the same ReferenceError message wording as V8

Instead of "Can't find variable: foo", use "foo is not defined".

This is in preparation of letting V8 throw the exception when a
property lookup fails on the QML scope object (needed for
QTBUG-24448).

Change-Id: I3c747482a8ef138dad9a85530a4f6b5c4c818a03
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoDon't store duplicate glyph data in a distance field node.
Andrew den Exter [Fri, 2 Mar 2012 07:43:44 +0000 (17:43 +1000)]
Don't store duplicate glyph data in a distance field node.

This saves at least 16 bytes per character and removes the need to
copy data between representations.

Change-Id: Ia8236207bdc4ed8292f7b4c72093ee02d13c0463
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
12 years agoDebugger: Print informational messages via qDebug
Kai Koehne [Thu, 8 Mar 2012 14:15:10 +0000 (15:15 +0100)]
Debugger: Print informational messages via qDebug

This allows users to use QT_FATAL_WARNINGS.

Change-Id: I114825764c841030418c956d23575159157dfd69
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoDebugger: Fix autotest for shadow builds
Kai Koehne [Wed, 14 Mar 2012 12:21:59 +0000 (13:21 +0100)]
Debugger: Fix autotest for shadow builds

Change-Id: I1b53afeb2a9f0d6e571c5ed87304e85896523488
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agofix gl under example to work also on trivial render loop
Gunnar Sletta [Wed, 14 Mar 2012 11:31:27 +0000 (12:31 +0100)]
fix gl under example to work also on trivial render loop

Change-Id: Ieb6c9c9646b557a7cca952472325c33d265c9262
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoDebugger: Fix autotests on Windows
Kai Koehne [Wed, 14 Mar 2012 11:37:09 +0000 (12:37 +0100)]
Debugger: Fix autotests on Windows

Remove export macro logic for internal classes.

Change-Id: I4dfa7f8e7bc9b5086e01e40342bd00812d5966bd
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove all accessibility updates to allow changes in qtbase.
Frederik Gladhorn [Thu, 8 Mar 2012 15:32:05 +0000 (16:32 +0100)]
Remove all accessibility updates to allow changes in qtbase.

In order to integrate pending api changes these are temporarily
removed and will return fixed as soon as qtbase is up to date.

Change-Id: I558b6049ac3342d41d67441ddfba6821fc370533
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoCodeCoverage: Skip headersclean test.
Caroline Chao [Wed, 14 Mar 2012 08:05:17 +0000 (09:05 +0100)]
CodeCoverage: Skip headersclean test.

The code coverage tool adds #line when instrumenting the code using the gcc
syntax.

tst_headersclean uses the -pedantic-errors flag which causes a fatal error
when the code is instrumented with the coverage tool.

Similar change was done for qtbase (4ee14d6f87688492).

Change-Id: I525879ef56463473dd3c9eb91dee4d9b8310cdf9
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix AND expression in v4
Luis Gabriel Lima [Thu, 8 Mar 2012 02:24:18 +0000 (23:24 -0300)]
Fix AND expression in v4

The type of the and expressions, e.g. (a && b), were being assigned
to the type of the right hand expression (b). As reported in
QTBUG-24660, this approach could lead to some unexpected behaviors.

Now, when the left and right hand expressions are of different types,
the responsability to deal with the and expression is delegated to v8.

Task-number: QTBUG-24660
Change-Id: Ic42ebb035e62e2f197c337b2106d00453a99f04c
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoFix memory leak with the shared distance field glyph cache.
Andrew den Exter [Wed, 14 Mar 2012 05:28:27 +0000 (15:28 +1000)]
Fix memory leak with the shared distance field glyph cache.

A new glyph node instance registers its owner element with its
glyph cache which in the case of the shared distance field glyph cache
connects a signal from the cache to a slot on the owner, changing the
text creates a new node but destroying the old node didn't remove the
connection causing them to accumulate over time.

In the glyph node; unregister the owner element from the cache on
destruction, and in the cache only connect an owner element the
first time it is registered and keep a reference count so the
items can be disconnected when registrations from all nodes have
been cancelled.

Change-Id: Ibf32a146e146dbbf4e0556d1bd756465bd8e45ba
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoDisable particle-related examples from tst_examples
Chris Adams [Wed, 14 Mar 2012 06:07:03 +0000 (16:07 +1000)]
Disable particle-related examples from tst_examples

CustomParticle and ShaderEffect are currently broken.
Disabling these examples until they can be fixed.

Task-number: QTBUG-24034
Change-Id: Ic1ebba1f66f28495822cd729af1e1c24acad79da
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix wrap modes not being set.
Gunnar Sletta [Thu, 8 Mar 2012 22:15:11 +0000 (23:15 +0100)]
Fix wrap modes not being set.

Change-Id: Id75ae3f01e6ed72b4a754e05bd55d5ed73b56920
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoRemove use of redundante nullPixmap image reference
Gunnar Sletta [Fri, 9 Mar 2012 10:47:42 +0000 (11:47 +0100)]
Remove use of redundante nullPixmap image reference

Change-Id: I40b82c25c813722a94d9897e1f2e1dd8a1681762
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoReuse a QQuickCanvas in examples auto test.
Martin Jones [Wed, 14 Mar 2012 02:41:37 +0000 (12:41 +1000)]
Reuse a QQuickCanvas in examples auto test.

Much faster than creating a new one for each example.

Change-Id: Ic32f244047e0dba78134ba0e3d368260be838f1e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoRefactor canvas examples by following the new example guidelines.
Charles Yin [Wed, 29 Feb 2012 01:48:06 +0000 (11:48 +1000)]
Refactor canvas examples by following the new example guidelines.

Change-Id: I1cc749ad11b8439239ba739f40e99b78af7351ab
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoSupport module api objects in v4.
Michael Brasser [Thu, 8 Mar 2012 04:41:40 +0000 (14:41 +1000)]
Support module api objects in v4.

Change-Id: I72911a2c8e0a8613e53861da7b38312e51bf57da
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoReuse QQuickView in GridView table driven tests
Martin Jones [Tue, 13 Mar 2012 23:50:31 +0000 (09:50 +1000)]
Reuse QQuickView in GridView table driven tests

Makes the tests run faster since we're not waiting for a
window to appear all the time.

Change-Id: Id2442cf32055084088c19865499055c7282bcae0
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoMore refactoring on animation controller
Charles Yin [Wed, 7 Mar 2012 14:12:58 +0000 (00:12 +1000)]
More refactoring on animation controller

Add a flag and helper functions for disabling user control in QAbstractAnimationJob
class and make it synchronized with QDeclarativeAnimation class's disableUserControl
flag.

Change-Id: Ifa84ab0c78291941469c33f2cafe5f61ee718b2c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoRemove the usage of deprecated qdoc macros.
Casper van Donderen [Thu, 1 Mar 2012 17:05:16 +0000 (18:05 +0100)]
Remove the usage of deprecated qdoc macros.

QDoc now has support for Doxygen style commands for italics, bold
and list items. This change applies that change in QDoc to the
actual documentation.

Task-number: QTBUG-24578
Change-Id: I62d203f21df63a95ee236e578b10418fd9680707
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoImplement mouseDrag
Charles Yin [Thu, 8 Mar 2012 01:27:04 +0000 (11:27 +1000)]
Implement mouseDrag

Simulates the drag behavior by press-move-move-release mouse events,
we need 2 move events here to trigger the drag threshold.

Task-number: QTBUG-22753
Change-Id: Ic3470c061834b7410c524029d82375cba62afa36
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoSend accessibility updates for the right item.
Frederik Gladhorn [Wed, 7 Mar 2012 18:50:23 +0000 (19:50 +0100)]
Send accessibility updates for the right item.

Child 0 means the first child.
The index needs to be -1 which the default ctor does.

Change-Id: I71fbdf5a15dd4593178cb250f06d42f601e40d4d
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoAdding a custom easing curve editor to declarative tools
Thomas Hartmann [Tue, 13 Mar 2012 09:27:59 +0000 (10:27 +0100)]
Adding a custom easing curve editor to declarative tools

Change-Id: Ic8ef77792d74ec99b23d85cd8888e0190acc3e10
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
12 years agoRemove unused init function.
Andrew den Exter [Fri, 9 Mar 2012 05:22:44 +0000 (15:22 +1000)]
Remove unused init function.

Change-Id: Id66e177a544fd8e019bae86fff6bd04bd0497d7c
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
12 years agoQmlDebugging: Modify test JSDebug test cases
Aurindam Jana [Mon, 12 Mar 2012 09:19:05 +0000 (10:19 +0100)]
QmlDebugging: Modify test JSDebug test cases

Add signals that are emitted on debugger responses for
flaky auto tests.

Change-Id: Ic59f559083b2b19fb8eec920dcb76f23125639a8
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoDebugger: Use QStringLiteral where appropriate
Kai Koehne [Thu, 8 Mar 2012 14:01:53 +0000 (15:01 +0100)]
Debugger: Use QStringLiteral where appropriate

Change-Id: I5c33113783834ef0c7292f5f19f12d8c68f42141
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agoReuse QQuickView in ListView table driven tests
Martin Jones [Tue, 13 Mar 2012 05:54:19 +0000 (15:54 +1000)]
Reuse QQuickView in ListView table driven tests

Makes the tests run faster since we're not waiting for a
window to appear all the time.

Change-Id: Ibff3706873dbad2f92d2135eae260368f4f4bb10
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoQmlProfiler: updated standalone app
Christiaan Janssen [Thu, 8 Mar 2012 15:50:14 +0000 (16:50 +0100)]
QmlProfiler: updated standalone app

Using a stripped-down version of the profiler data structure.

Change-Id: I93a0b12462edea0ca8a1d0db42aa892aa2afc919
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoDefault image scaling behaviour has changed; fix autotest.
Toby Tomkins [Tue, 13 Mar 2012 01:17:54 +0000 (11:17 +1000)]
Default image scaling behaviour has changed; fix autotest.

The default image scaling behaviour has changed in qtdeclarative. This
change fixes the autotest to conform to fixed ratio scaling.

Change-Id: I9c901825295fb04cab74c46f61696c5274ddd943
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix crash when writing property after engine deletion
Chris Adams [Mon, 12 Mar 2012 01:54:11 +0000 (11:54 +1000)]
Fix crash when writing property after engine deletion

Previously, the engine pointer stored in a QQmlProperty could be
stale due to engine deletion.  This commit ensures we guard that
pointer.

Also reverts cbb7f8b10e99fad675839d7625d3236ed67b3e01

Task-number: QTBUG-24734
Change-Id: I5349c51fbd19fa46a8710280173c1d224358b96e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoOnly attempt to load QML test cases from source directory if it exists.
Aaron McCarthy [Mon, 27 Feb 2012 01:11:10 +0000 (11:11 +1000)]
Only attempt to load QML test cases from source directory if it exists.

When running installed unit tests the QML test cases are likely not
in the source directory, but in the same directory as the installed
test binary.  If the source directory does not exist, fall back to
searching for QML test cases in the current directory.

Change-Id: I231b9cd49b12d88dd6cfbcc8dfb8b6c2c69d5aad
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoRefactor XMLHttpRequest example.
Charles Yin [Tue, 6 Mar 2012 02:13:44 +0000 (12:13 +1000)]
Refactor XMLHttpRequest example.

Change-Id: I4fd4fa4fb190814e1e32ce847d05ab0015ad4ca0
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoRefactor localstorage example
Charles Yin [Tue, 6 Mar 2012 02:03:36 +0000 (12:03 +1000)]
Refactor localstorage example

Change-Id: I0c742c35ba8d5a2812dc1665905e45f5ffb745b5
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoMove binding and expression classes to separate files
Aaron Kennedy [Thu, 8 Mar 2012 13:25:50 +0000 (14:25 +0100)]
Move binding and expression classes to separate files

Change-Id: Ia9c6996a606e140f31681ecd26d93b1b0fdedf02
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoSpeed up view flick tests.
Martin Jones [Tue, 13 Mar 2012 00:32:48 +0000 (10:32 +1000)]
Speed up view flick tests.

Change-Id: I98b0a45b5afd0150bfacef2c1c1e814f70ae042f
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agotestlib: Improve verbose and XPASS output
Jason McDonald [Wed, 29 Feb 2012 05:36:21 +0000 (15:36 +1000)]
testlib: Improve verbose and XPASS output

Call only the eight-argument version of QTestResult::compare(), as the
four-argument version will soon be removed from the API.

Change-Id: I9e7b95a30b01fb5e084f2954aeb380b492760484
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoListView.contentHeight does not include header and footer item heights
Martin Jones [Mon, 12 Mar 2012 07:55:38 +0000 (17:55 +1000)]
ListView.contentHeight does not include header and footer item heights

Task-number: QTBUG-24664

Change-Id: I2a2fe144835e61665b8693d58ca4fb9ba506e8a8
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoFix leak in tst_qquicklistmodel unit test
Chris Adams [Mon, 12 Mar 2012 03:39:45 +0000 (13:39 +1000)]
Fix leak in tst_qquicklistmodel unit test

Change-Id: I6883f263648d425240503f6abbd358b744d68506
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
12 years agoDisplaced items were moving unnecessarily
Bea Lam [Mon, 5 Mar 2012 08:06:33 +0000 (18:06 +1000)]
Displaced items were moving unnecessarily

They should only move if they actually change from the last set
position, and not if they are simply changing from their current item
position, as that is wrong during an animation.

This also cleans up some code for resetting the transition data.

Task-number: QTBUG-24586
Change-Id: I0a6635903975ebc40d5cf8398b943a9de92d4493
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoImprove interaction of nested Flickables and PathView
Martin Jones [Fri, 9 Mar 2012 05:40:29 +0000 (15:40 +1000)]
Improve interaction of nested Flickables and PathView

Don't require a flick to come to a complete stop before
allowing another flickable element to begin its
gesture.

Change-Id: I74c1998e01e04c70c76253cd09edc02f593123d0
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoDeclare change set and compositor structs as movable primative types.
Andrew den Exter [Fri, 9 Mar 2012 01:02:03 +0000 (11:02 +1000)]
Declare change set and compositor structs as movable primative types.

Allows QVector to avoid invoking contructors for these types
unnecessarily.

Change-Id: Icc8670e4a033c943666f907c7e1b006a3d205597
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoChange repeater item to handle model being deleted.
Glenn Watson [Mon, 12 Mar 2012 03:20:22 +0000 (13:20 +1000)]
Change repeater item to handle model being deleted.

The repeater item previously stored a raw QObject pointer in
a variant. When this pointer was a dynamic list model element
that was deleted, the variant would continue to hold a stale
pointer. Change repeater to use a guard object to hold the model
when it is a QObject. Continue to use a variant to hold models
that are not based on QObject to maintain same semantics.

Change-Id: Ie100947132923803263c725e86efa68206382f12
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix SignalSpy disconnect issue
Charles Yin [Wed, 7 Mar 2012 13:12:26 +0000 (23:12 +1000)]
Fix SignalSpy disconnect issue

Task-number:QTBUG-21083
Change-Id: Ic61472d886bf7c46eb37dc44b5e5ceb401917087
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoRemove the rest of qtquick 1.0 code from qmltest
Charles Yin [Thu, 8 Mar 2012 04:04:25 +0000 (14:04 +1000)]
Remove the rest of qtquick 1.0 code from qmltest

Change-Id: I0d20583faf1a75f287dcd866b11457254d250354
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoinclude header correctly
Charles Yin [Wed, 7 Mar 2012 13:12:19 +0000 (23:12 +1000)]
include header correctly

Change-Id: I462fbcdd2954979fbff92965cc813551773b4118
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoFix for QTBUG-22777. Removed unnecessary check.
Gatis Paeglis [Tue, 14 Feb 2012 18:04:12 +0000 (19:04 +0100)]
Fix for QTBUG-22777. Removed unnecessary check.

Change-Id: I82de9e1d6eb4b8bdb8c90c69e686b700a02f40aa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix v4 nested object access bug.
Michael Brasser [Mon, 12 Mar 2012 05:27:09 +0000 (15:27 +1000)]
Fix v4 nested object access bug.

Use the correct type to look up the sub property.

Task-number: QTBUG-24606
Change-Id: Iab372ca7440249241bf855d2875a947ad8fe4527
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoAdd additional v4 tests.
Michael Brasser [Fri, 9 Mar 2012 03:09:07 +0000 (13:09 +1000)]
Add additional v4 tests.

Change-Id: Id33eb50e4a01f3450515f6e666e18cb018f1706e
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoAdd two argument Math.min and Math.max support to v4.
Michael Brasser [Thu, 8 Mar 2012 00:36:51 +0000 (10:36 +1000)]
Add two argument Math.min and Math.max support to v4.

Change-Id: I26a4812b76571bf0ae6a0b4bd5d1e2afd64051df
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoAdd Math.ceil and Math.abs support to v4.
Michael Brasser [Wed, 7 Mar 2012 23:16:07 +0000 (09:16 +1000)]
Add Math.ceil and Math.abs support to v4.

Change-Id: I23e7c8294abf80914d4529740af6e9124f66c5bf
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoCheck that canvas is valid.
Frederik Gladhorn [Tue, 6 Mar 2012 10:25:59 +0000 (11:25 +0100)]
Check that canvas is valid.

During creation the canvas might not have been set.

Change-Id: I7ea8922413e3b6fb4ffd2ed9758c57eea1de02db
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoPrefer \b word boundary markers
Matthew Vogt [Mon, 12 Mar 2012 06:53:24 +0000 (16:53 +1000)]
Prefer \b word boundary markers

/usr/bin/sed on mac does not process '\<' and '\>' boundary markers
correctly.

Change-Id: I750f7c69579ddcbe39a6246a3d3321cab714fc27
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agotests: enable headersclean also for cross_compile builds
Rohan McGovern [Mon, 12 Mar 2012 00:01:56 +0000 (10:01 +1000)]
tests: enable headersclean also for cross_compile builds

This test is no longer a host-only test.
Enable it everywhere.

Change-Id: Id7e65ad4d6f468b6b65d0f6035934fbd20fcb5e0
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoAccessibility: childAt_helper descends too far.
Morten Johan Sorvig [Thu, 19 Jan 2012 07:02:09 +0000 (08:02 +0100)]
Accessibility: childAt_helper descends too far.

Recursive hit-testing using childAt_helper must stop
when it hits a leaf accessibility item. This leaf item
might not be a leaf item in Qt Quick - a button contains
text and mouse area items not visible to the accessibility
system for example.

Get the accessible interface and check if it has
children before recursing to the child items.

Change-Id: I2cc286cde4bce6b4ca340e8a1819edc5f84006a5
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoRemove unneeded dependencies to QtWidgets and QtOpenGL
Lars Knoll [Wed, 29 Feb 2012 19:43:09 +0000 (20:43 +0100)]
Remove unneeded dependencies to QtWidgets and QtOpenGL

Change-Id: I43bb54524f5786a838073df8812107dda7b0d56e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix MouseArea autotest.
Laszlo Agocs [Mon, 12 Mar 2012 06:40:52 +0000 (08:40 +0200)]
Fix MouseArea autotest.

The hover test seems to be simply wrong. The double click tests worked
before due to the obscure handling of double click but were somewhat
incorrect in any case.

Change-Id: Ie5690e26eb5921fe149e128d24d331f52a5a9075
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix tst_qquicktextedit.
Michael Brasser [Mon, 12 Mar 2012 00:55:25 +0000 (10:55 +1000)]
Fix tst_qquicktextedit.

Recent changes to mouse double-click handling mean that two
calls to QTest::mouseClick with the same position will result in a
double click, which was causing this test to fail.

Change-Id: I21e6aa7ab2221b6ea82b1afd13e36b7ba0aef8dc
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix double click handler in QQuickItem.
Laszlo Agocs [Fri, 9 Mar 2012 10:00:29 +0000 (12:00 +0200)]
Fix double click handler in QQuickItem.

The legacy, desktop-oriented way of calling mousePressed from the
default handlers for mouseDoubleClick is not working properly with
QWindow and QGuiApplication: In Qt 5 a double click will never
suppress any lower level events (like press or release) and therefore
simulating a mouse press in the double click handlers is wrong.

Change-Id: Ic0ad97a5efbcd3deb1717229010dcb84681d7ed4
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoRemove pin of qtbase for qtdeclarative.
Sergio Ahumada [Tue, 6 Mar 2012 12:17:16 +0000 (13:17 +0100)]
Remove pin of qtbase for qtdeclarative.

Change-Id: Ib70a3438d085adbed3a1ca7df81d593c7a512ae0
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoSkip test that accesses deleted QML engine
Kent Hansen [Mon, 12 Mar 2012 12:13:48 +0000 (13:13 +0100)]
Skip test that accesses deleted QML engine

The test is blocking the CI because it crashes on linux/x64.
By "luck" it doesn't crash on the other test machines -- valgrind
still complains, though.

Task-number: QTBUG-24734
Change-Id: I6bc12ca72f8900339bc9139b40cf828aff8e47ba
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix flakiness in qquicklistmodel autotest
Kent Hansen [Mon, 12 Mar 2012 15:02:43 +0000 (16:02 +0100)]
Fix flakiness in qquicklistmodel autotest

The worker_remove_element test calls processEvents() before
calling waitForWorker(). It's possible that the worker actually
finishes during the processEvents() call. In such a situation,
waitForWorker() should return right away; otherwise it would
wait for 10000ms for a signal that had already emitted, and the
test would fail.

Change-Id: I8e98a3297cf5f360c1c405b1baa7524cc6593d81
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMark presumed unstable test as insignificant.
Lars Knoll [Mon, 12 Mar 2012 16:01:16 +0000 (17:01 +0100)]
Mark presumed unstable test as insignificant.

Change-Id: Iea22ae6596c04ba95d59bcb3957bdc3cf9263ae2
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoReturn early if animationjob was deleted in all callback methods.
Charles Yin [Fri, 9 Mar 2012 01:34:18 +0000 (11:34 +1000)]
Return early if animationjob was deleted in all callback methods.

Change-Id: I703c8a8904ffd760683de4ee74544dff9eb53144
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoRemove undefined method.
Stephen Kelly [Wed, 7 Mar 2012 20:17:02 +0000 (21:17 +0100)]
Remove undefined method.

Change-Id: Id95aebcfc5beac0154db4b1137fc08d5172f3428
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoMake headersclean in qtdeclarative enforce correct header conventions.
Rohan McGovern [Mon, 5 Mar 2012 05:55:31 +0000 (15:55 +1000)]
Make headersclean in qtdeclarative enforce correct header conventions.

This test wasn't testing much before.
Refactor it to reuse headersclean from qtbase.

It will now fail to compile if the headers from this module don't follow
the rules.

Change-Id: I2816b85543da74f66b993b7ee705cdb9e1c0f1c8
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agorefilled items should be moved immediately
Bea Lam [Mon, 5 Mar 2012 08:05:40 +0000 (18:05 +1000)]
refilled items should be moved immediately

refill() functionality should reposition items immediately, else
removeNonVisibleItems() sees different positions from those added in
addVisibleItems() if an item is animating.

Change-Id: Ib9904e08bf92b18fd4b712270c0ab69e9a113e04
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoClean up transition objects for positioners
Bea Lam [Wed, 7 Mar 2012 08:20:06 +0000 (18:20 +1000)]
Clean up transition objects for positioners

These must be cleaned up whenever items are removed from the internal
PositionedItem lists.

Change-Id: I56f64a29bd98c603b00faaead514fd43780c18de
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoAdd mouse wheel events handler to MouseArea
Luis Gabriel Lima [Thu, 5 Jan 2012 18:19:26 +0000 (15:19 -0300)]
Add mouse wheel events handler to MouseArea

This patch was based on the attached patch in QTBUG-7369. It basically
exposes the wheel events to MouseArea via the onWheel signal.

The current API is based on the new QWheelEvent API introduced by this
patch: http://codereview.qt-project.org/#change,12532

Task-number: QTBUG-7369
Change-Id: Id58513715c2d0ae81e3a69e9e1ed400bbae07507
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoAvoid using QQuickViewItem as base class
Bea Lam [Wed, 7 Mar 2012 03:29:20 +0000 (13:29 +1000)]
Avoid using QQuickViewItem as base class

This patch renames it to QQuickItemViewTransitionableItem, and
FxViewItem and PositionedItem now create instances of this instead of
subclassing it, to reduce the memory used when transitions are not
required.

Change-Id: Ie050cda5a121bff9542c7ba7356f6eacf37d241a
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoDon't grow container when desired size is known
João Abecasis [Wed, 7 Mar 2012 22:17:54 +0000 (23:17 +0100)]
Don't grow container when desired size is known

QList<Type>::reserve() is used upfront to allocate necessary memory in a one
go. This tells us straight away whether allocation is possible at all and
reduces re-allocations and consequent memory copies.

This also has the side effect that no spare memory is allocated, also allowing
up to (and including) INT_MAX elements to actually be stored in the underlying
QList, as long as enough memory is available to satisfy the allocation request
and subsequent fill.

The qqmlecmascript::sequenceConversionIndexes was changed to not attempt
INT_MAX allocations as, given enough memory and virtual address space, that
might succeed but take a really long time.

Change-Id: I4b0c965e9c23be78874343a70d7c155933c80903
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix typo.
Michael Brasser [Wed, 7 Mar 2012 22:25:45 +0000 (08:25 +1000)]
Fix typo.

Change-Id: Ibbfcc787e463a3a9d1a154d1986c3969f11e60d8
Reviewed-by: Chris Adams <christopher.adams@nokia.com>