platform/upstream/qtdeclarative.git
12 years agoFix updating text color in Text element
Eskil Abrahamsen Blomfeldt [Fri, 3 Feb 2012 12:49:00 +0000 (13:49 +0100)]
Fix updating text color in Text element

The setColor() function in QQuickText calls markDirty() which
did not specify that the whole paint node should be updated, so
color updates would have no effect until something else changed.

Change-Id: I93741b6c697f2dd6ad5a315250502a7a6e3ce1d7
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoFix vertical offset of TextInput.positionToRectangle.
Andrew den Exter [Fri, 3 Feb 2012 02:36:10 +0000 (12:36 +1000)]
Fix vertical offset of TextInput.positionToRectangle.

Offset the y value of the rectangle by the vertical scroll and line
offset.

Task-number: QTBUG-23934
Change-Id: I43815b480f43a089a9a03b0aec32dfc0598b6154
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix TextEdit vertical alignment.
Andrew den Exter [Fri, 3 Feb 2012 03:34:57 +0000 (13:34 +1000)]
Fix TextEdit vertical alignment.

Don't ignore the position of a QTextDocument when contructing a text
node, and translate the rectangle returned by positionToRectangle by
the y offset.

Task-number: QTBUG-23935
Change-Id: I55a2b69a32a8b623be7e36de54ad083c2f8591e5
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdd support for resizing fonts to fit Text dimensions.
Andrew den Exter [Wed, 11 Jan 2012 05:49:36 +0000 (15:49 +1000)]
Add support for resizing fonts to fit Text dimensions.

This adds a mode where if the content of a Text item doesn't fit
within its bounds the font size is reduced during layout until it
does or a minimum font size is reached.

Task-number: QTBUG-22832
Change-Id: I6198ef03899e2f21b32e313548966ef4b0e3bff1
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
12 years agoFix some QJSValue test failures.
Glenn Watson [Fri, 3 Feb 2012 01:21:24 +0000 (11:21 +1000)]
Fix some QJSValue test failures.

Fix precision issues causing test failures on platforms where
qreal is defined as single precision. Also use explicit casts
to ensure well defined behaviour when converting a negative
double value to an unsigned integer.

Change-Id: Ia0048bf83169d3b617f70828f86368c23f4f3786
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix incorrect ref count with dynamic roles on worker thread.
Glenn Watson [Sun, 5 Feb 2012 22:44:18 +0000 (08:44 +1000)]
Fix incorrect ref count with dynamic roles on worker thread.

When using the dynamic roles mode from a worker script thread,
the reference count for the list model worker agent was not
being incremented correctly, causing the final release of the
agent to be reading from memory that had already been freed.

Change-Id: I06d8e363c95133c1c162f32e1efb2d4020ed96be
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdd a grouping examples launcher for animation examples
Alan Alpert [Thu, 2 Feb 2012 23:28:00 +0000 (09:28 +1000)]
Add a grouping examples launcher for animation examples

Components are designed to be reusable, so that other categories might
use them to create grouping launchers.

Single grouped launchers fit better into the Qt examples style that
QtCreator and qdoc are expecting.

Change-Id: Ia6935394caa1856aa8cc105746dd3d30fd0b8c7c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoRemove SVG use from example
Alan Alpert [Fri, 3 Feb 2012 02:45:23 +0000 (12:45 +1000)]
Remove SVG use from example

With the SVG module now an optional dependency, examples that don't need
SVG shouldn't use them.

Change-Id: I17ad57dec6982e78090904d1514e28233c354b5b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoUpdate BearWhack sprites
Alan Alpert [Fri, 3 Feb 2012 07:07:48 +0000 (17:07 +1000)]
Update BearWhack sprites

Missed the API change on duration

Change-Id: I64abcdad3f0e9554f797868761a06b9ed8662762
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoTeach build system tst_qdeclarativepixmapcache needs QtConcurrent
Alan Alpert [Mon, 6 Feb 2012 01:38:24 +0000 (11:38 +1000)]
Teach build system tst_qdeclarativepixmapcache needs QtConcurrent

So if QtConcurrent is disabled, this test should be too.

Change-Id: Ib4c6a952f73fc21bb201cf6017cd3e73732fbe7b
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
12 years agoAdd "QT += concurrent" to a test that needs it
Alex Wilson [Mon, 6 Feb 2012 00:00:41 +0000 (10:00 +1000)]
Add "QT += concurrent" to a test that needs it

QtConcurrent became its own module in qtbase as of
http://codereview.qt-project.org/15206

Change-Id: Ie9b638d83012aa83f854b92fec80d48babcf6ef0
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
12 years agoCleanup: remove some debugging and use QQuickTextNode::addImage
Yann Bodson [Fri, 3 Feb 2012 01:48:24 +0000 (11:48 +1000)]
Cleanup: remove some debugging and use QQuickTextNode::addImage

Change-Id: I20f38f590b158d5d615923c30e85e2a7cfd99763
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoSkip tst_qquickitem::simpleFocus on Mac OS X 10.7
Yann Bodson [Mon, 6 Feb 2012 00:01:26 +0000 (10:01 +1000)]
Skip tst_qquickitem::simpleFocus on Mac OS X 10.7

Task-number: QTBUG-24094

Change-Id: I521707891d2695d7dde8eea4ef8a6a2e3f5ea935
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix crash bug related to QDeclarativeListModel
Charles Yin [Fri, 20 Jan 2012 05:41:16 +0000 (15:41 +1000)]
Fix crash bug related to QDeclarativeListModel

If QDeclarativeListModel is deleted, all references to this object in
QDeclarativeListModelWorkerAgent and WorkerScript objects should be removed
and additional checking is needed when process the pending sync() events.

Change-Id: I12b1f06699cc908e684af0886cf06d811c3fceb4
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
12 years agoEnsure || expressions in v4 will always exit.
Michael Brasser [Thu, 2 Feb 2012 04:47:07 +0000 (14:47 +1000)]
Ensure || expressions in v4 will always exit.

Change-Id: I7188e38403fec96f83f3bdfc68b763a9aec9346a
Task-number: QTBUG-24038
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoCleanup text examples
Yann Bodson [Thu, 2 Feb 2012 22:24:50 +0000 (08:24 +1000)]
Cleanup text examples

Change-Id: I66797c9cf8b2c3a502a31c442d9e51d7febfe368
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
12 years agoRemove QtQuick1 elements from qtdeclarative
Matthew Vogt [Tue, 31 Jan 2012 06:52:36 +0000 (16:52 +1000)]
Remove QtQuick1 elements from qtdeclarative

QtQuick1 is now contained in a separate repository.

Task-number: QTBUG-23737
Change-Id: I09eae67af5693a22b896b916f816f73ccc3a89b1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix spelling errors that refer to non-existent symbols
Matthew Vogt [Thu, 2 Feb 2012 01:44:16 +0000 (11:44 +1000)]
Fix spelling errors that refer to non-existent symbols

These erors create the appearance of symbols that do not actually
exist.

Task-number: QTBUG-23737
Change-Id: I249742998524b6156185a6601f36e7691013ddf3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoStarted implementation of offscreen canvas FBO rendering API
Gunnar Sletta [Thu, 26 Jan 2012 10:17:37 +0000 (11:17 +0100)]
Started implementation of offscreen canvas FBO rendering API

Change-Id: I15b1799982d20d16c9c5e08eee7095cf087b49e1
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoDo not start timers in QDeclarativePixmapStore teardown
Laszlo Agocs [Sun, 29 Jan 2012 15:14:48 +0000 (17:14 +0200)]
Do not start timers in QDeclarativePixmapStore teardown

The store instance is a global static and so starting timers
during its destruction is unnecessary, and may cause crashes
if the QAbstractEventDispatcher's statics are already destroyed.
This happens on OS X at least.

Change-Id: I785515c8973b291a7bfc6c5dabe2c19e8393c7ad
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdapt to QGuiApplication::focusObject() for notifying input method
Pekka Vuorela [Thu, 2 Feb 2012 12:58:49 +0000 (14:58 +0200)]
Adapt to QGuiApplication::focusObject() for notifying input method

Emitting focusObjectChanged() signal now instead of explicitly setting
inputItem to QInputPanel. Also adapted from deprecated
QInputPanel::inputItem() to QGuiApplication::focusObject().

Change-Id: I97460625cc8bb2820ec7716a06330aecd1b585ea
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoRemove QAccessible::FocusChild, add focusChild()
Jan-Arve Saether [Mon, 30 Jan 2012 13:57:22 +0000 (14:57 +0100)]
Remove QAccessible::FocusChild, add focusChild()

Change-Id: Idc96d91ec31630b4240fe473ed3b4bf0a4753618
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoRemove QJSEngine::undefinedValue() function
Kent Hansen [Wed, 18 Jan 2012 06:03:48 +0000 (07:03 +0100)]
Remove QJSEngine::undefinedValue() function

Rationale: It's strange to have an undefined value factory function.
There should just be one way of constructing undefined values: By
passing UndefinedValue to the QJSValue constructor.

The undefinedValue() function created a value that was bound to the
engine; the QJSValue constructor does not. In order to ensure that
we're testing the same behavior as before, I've replaced
undefinedValue() calls by toScriptValue(QVariant()) in the autotests.

Task-number: QTBUG-23604
Change-Id: Ie9295b7af49c853b5a4a3445da48c325fef8d6b1
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agoRemove QJSValue::isFunction() function
Kent Hansen [Fri, 20 Jan 2012 06:08:08 +0000 (07:08 +0100)]
Remove QJSValue::isFunction() function

Rationale: QJSValue::isCallable() should be used instead. There is no
compelling reason to be able to distinguish between JS Function
instances and other callable objects.

Task-number: QTBUG-23604
Change-Id: Ieef6b32030ef70f54081035fd4ffc3c17c184cd3
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove QJSValue::construct() and deprecated call() overload
Kent Hansen [Wed, 18 Jan 2012 13:36:28 +0000 (14:36 +0100)]
Remove QJSValue::construct() and deprecated call() overload

callAsConstructor() should be used instead.

Task-number: QTBUG-23604
Change-Id: If95ab9906712ede7cbae5e9d24624708bccf880f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove QJSValue::toInt32() and toUInt32() functions
Kent Hansen [Wed, 18 Jan 2012 13:31:10 +0000 (14:31 +0100)]
Remove QJSValue::toInt32() and toUInt32() functions

toInt() and toUInt() should be used instead.

Task-number: QTBUG-23604
Change-Id: Ib64aea139e9082066a1e5096ef9fe3a97c35d3eb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoSupport inline images with <img> tag in StyledText
Yann Bodson [Mon, 28 Nov 2011 01:26:40 +0000 (11:26 +1000)]
Support inline images with <img> tag in StyledText

Task-number: QTBUG-21793
Change-Id: Ie7b9f293c6c9a949c1899152c38b61251b0069d3
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
12 years agoDebugger Test Case: Fix failures
Aurindam Jana [Tue, 31 Jan 2012 16:05:01 +0000 (17:05 +0100)]
Debugger Test Case: Fix failures

Fix test cases related to verifying debug messages.

Task-number: QTBUG-23977

Change-Id: Ieab6a5975bff1ef7fcee3eb1befe0c544a63ea1f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoIncorrect initial pos after resizing view with margins.
Martin Jones [Thu, 2 Feb 2012 01:46:55 +0000 (11:46 +1000)]
Incorrect initial pos after resizing view with margins.

The currentItem tracking didn't position the view to show the
margins.  This affects resizing the view and also changing
currentIndex.

Task-number: QTBUG-24028
Change-Id: I47d4c771c0d712c93abadfb6b2deb5194241fb6b
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoRevert "Mark tst_qdebugmessageservice as insignificant until it passes again"
Alan Alpert [Wed, 1 Feb 2012 21:21:28 +0000 (07:21 +1000)]
Revert "Mark tst_qdebugmessageservice as insignificant until it passes again"

This reverts commit 27427efbb9c898b08de92e6b0a1b4d890fcdcabc, as it
passes again.

Change-Id: Ie05729c024c748ff5c4c58c143ee8601f7c466c2
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoupdate .gitignore
Charles Yin [Mon, 5 Dec 2011 00:38:59 +0000 (10:38 +1000)]
update .gitignore

Change-Id: I7bb60aaadf2ca2153e8e76bba092dba753e9cf2c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoFix unhandled touch events not being ignored.
Simon Hausmann [Mon, 30 Jan 2012 16:04:42 +0000 (17:04 +0100)]
Fix unhandled touch events not being ignored.

Unhandled touch events need to be ignored in order for things like
mouse event synthetization in QtGui to work.

Change-Id: I6fe9dad205c8bb8547d2424c2e2a3b3518598006
Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRemove QJSEngine::nullValue() function
Kent Hansen [Wed, 18 Jan 2012 05:53:39 +0000 (06:53 +0100)]
Remove QJSEngine::nullValue() function

Rationale: It's strange to have a null value factory function.
There should just be one way of constructing null values: By
passing NullValue to the QJSValue constructor.

The nullValue() function created a value that was bound to the
engine; the QJSValue constructor does not. In order to ensure that
we're testing the same behavior as before, I've replaced nullValue()
calls by evaluate("null") in the autotests.

Task-number: QTBUG-23604
Change-Id: Ie40b61fa64e070b90c6245fd21554963073c5f80
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove QJSValue constructors that take QJSEngine argument
Kent Hansen [Tue, 17 Jan 2012 14:42:36 +0000 (15:42 +0100)]
Remove QJSValue constructors that take QJSEngine argument

Rationale: These were remnants from QtScript.
The difference from the standard constructors is that the value is
eagerly bound to the engine, so they can be a bit faster. But they
are also more low-level and look ugly in use.

Task-number: QTBUG-23604
Change-Id: I5dae7452389383f60055d5ccc4f28d53c52f6092
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove QJSValue::propertyFlags() function
Kent Hansen [Tue, 17 Jan 2012 14:23:01 +0000 (15:23 +0100)]
Remove QJSValue::propertyFlags() function

Rationale: The API is incomplete. There is no way to set/update the
flags; adding a third (optional) argument to setProperty() is ugly.

If necessary, a QJSPropertyDescriptor API should be added, to enable
complete setting/querying of properties.

The flags were moved to QJSValuePrivate, and the propertyFlags()
implementation kept, because there is one place the read-only flag
is checked internally (in qv8typewrapper).

Task-number: QTBUG-23604
Change-Id: I089dce28dbda428662aac7c8d1536987fe6d855c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove invalid QJSValue type
Kent Hansen [Wed, 18 Jan 2012 08:37:30 +0000 (09:37 +0100)]
Remove invalid QJSValue type

Rationale: It's confusing to have an invalid type (which doesn't
exist in JavaScript), and it creates lots of extra cases that have
to be handled e.g. in value conversion and comparison. The Undefined
type should be sufficient.

Also, the invalid value type was being (ab)used to 1) make
setProperty() act as a property deleter, and 2) signify that a
property queried by property() doesn't exist. The recently introduced
functions has(Own)Property() and deleteProperty() now provide that
functionality.

Default-constructed QJSValues now have the Undefined type.

Task-number: QTBUG-23604
Change-Id: I1847492724d31e03ee1212c09ec87a2010920dc5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoFix include of private header used between two qtdeclarative libraries
Kalle Juhani Lehtonen [Tue, 31 Jan 2012 08:27:12 +0000 (18:27 +1000)]
Fix include of private header used between two qtdeclarative libraries

Installed private headers can only include installed Qt headers. It is
not safe to include headers from source tree, which can be removed after
installation.

Change-Id: I3b90e93a9b1b77e53bfcbf0eb914394ff7e48a57
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMust update columns when GridView geometry changes
Bea Lam [Wed, 1 Feb 2012 06:48:03 +0000 (16:48 +1000)]
Must update columns when GridView geometry changes

Regression from changes in 80d85e0017cb5cc4b0a0df6c19d4126bf5062731

Also remove shared duplicate code in visibleItemsChanged() in
ListView and GridView.

Change-Id: Ic3ab3ba070ddf9901a232ed5b3250c725797cf69
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoMultiple fast flicks with large content moves faster
Martin Jones [Mon, 30 Jan 2012 23:12:13 +0000 (09:12 +1000)]
Multiple fast flicks with large content moves faster

Repeatedly flicking quickly in a large view moves faster than the velocity
of the touch.

Task-number: QTBUG-18600
Change-Id: Ie6747e0d945022e0c0c5f6c5f95bc35403a14d56
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoMore StyledText autotests
Yann Bodson [Wed, 1 Feb 2012 03:48:28 +0000 (13:48 +1000)]
More StyledText autotests

Change-Id: I4fab5f0b421ddccce2c4bce58861ec236f3434f9
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
12 years agoCompress consective StyledText whitespaces into a single space.
Andrew den Exter [Mon, 30 Jan 2012 06:37:19 +0000 (16:37 +1000)]
Compress consective StyledText whitespaces into a single space.

This improves the correctness of the parser and prevents line feed
characters appearing as unrendereable characters.

Change-Id: I54e8be011ba4d9ad65ee2142e6b1f423a7579352
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoClear Text formatting when setting plain text content.
Andrew den Exter [Mon, 30 Jan 2012 02:44:10 +0000 (12:44 +1000)]
Clear Text formatting when setting plain text content.

Task-number: QTBUG-21919
Change-Id: I55605d2bd053968868a885e63cc4bc042ada0839
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
12 years agoAdd a persistentSelection property to TextInput.
Andrew den Exter [Fri, 20 Jan 2012 06:10:23 +0000 (16:10 +1000)]
Add a persistentSelection property to TextInput.

Improves feature parity with TextEdit.

Task-number: QTBUG-16355
Change-Id: I3919c71454a4f4574a1ee35ad38969459beb8363
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoHandle a null source item being provided to ShaderEffect
Martin Jones [Tue, 31 Jan 2012 03:52:01 +0000 (13:52 +1000)]
Handle a null source item being provided to ShaderEffect

Change-Id: Ibb4a141349c85738f1710ecaadb8ab78a00372ae
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoQmlProfiling: don't send v8 data if not profiling
Christiaan Janssen [Wed, 1 Feb 2012 15:47:26 +0000 (16:47 +0100)]
QmlProfiling: don't send v8 data if not profiling

Change-Id: I41085ed06bcf28e9de0a72f25076b91b9a3b2aea
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoAdd autotests for StyledText list tags (<ol> and <ul>)
Yann Bodson [Wed, 1 Feb 2012 02:02:28 +0000 (12:02 +1000)]
Add autotests for StyledText list tags (<ol> and <ul>)

Task-number: QTBUG-23979
Change-Id: Ic050e443ceed3cc41bd156de1455b2a9bc25fb35
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoDon't leave windows hanging outside test functions
Gunnar Sletta [Wed, 1 Feb 2012 13:58:24 +0000 (14:58 +0100)]
Don't leave windows hanging outside test functions

Change-Id: I2df2167386b0827ae25a14f958ee50d0a15eba0b
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoExport on QQuickImageBase
Gunnar Sletta [Mon, 30 Jan 2012 11:44:49 +0000 (12:44 +0100)]
Export on QQuickImageBase

Change-Id: I2d4892cfb7226794fc617664a50a4674de562317
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoAccessibility: Use new updateAccessibility() API in declarative.
Friedemann Kleint [Wed, 1 Feb 2012 09:15:09 +0000 (10:15 +0100)]
Accessibility: Use new updateAccessibility() API in declarative.

Change-Id: I7ab5c767c9d21c9cad1ee7f7c1f6e21ed4dccef3
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
12 years agoFix outdated license headers.
Jason McDonald [Mon, 30 Jan 2012 07:49:43 +0000 (17:49 +1000)]
Fix outdated license headers.

Change-Id: I8448e0d3dbce0c18f38a1ed9b6e2d75ba83f7088
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoGuard against event recursion in QQuickDrag.
Andrew den Exter [Fri, 27 Jan 2012 04:56:07 +0000 (14:56 +1000)]
Guard against event recursion in QQuickDrag.

Do not emit drag events recursively as this will send events out of
order and corrupt the grab stack.

Change-Id: Ieede7123c96304e23c809ac895318ed76c8c95c1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDocument the limitations of AutoText's rich text detection.
Andrew den Exter [Mon, 30 Jan 2012 07:33:27 +0000 (17:33 +1000)]
Document the limitations of AutoText's rich text detection.

Repeat the explanation given in Qt::mightBeRichText's documentation
for how rich text is identified and under what circumstances it may
fail to recognize it.

Task-number: QTBUG-21917
Change-Id: Ie012ddd2fd5f874da0ea819c354a1ed5b7573670
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
12 years agoFixes for removing before visible
Bea Lam [Wed, 25 Jan 2012 07:24:05 +0000 (17:24 +1000)]
Fixes for removing before visible

Account for removing multiple items over visible and non-visible items
and calculate these using the index of the first visible item rather
than the visibleIndex (which can be above the visible position).

Also, don't take the changeBeforeVisible into account if the first
visible is already being adjusted, otherwise it moves back one more row
than it should.

Change-Id: Iea7247102e06697d10eb41301ca689c0cdc35ece
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoRemove QJSEngine::newVariant() function
Kent Hansen [Tue, 17 Jan 2012 08:49:52 +0000 (09:49 +0100)]
Remove QJSEngine::newVariant() function

Rationale: This is a remnant from QtScript. There is no reason one
should be able to explicitly wrap an arbitrary C++ type in a
QVariant. toScriptValue() will automatically wrap the type in a
QVariant if it's a type that's not specifically handled by the
meta-type system, or if it can't usefully/losslessly be converted to
a native JavaScript type.

Task-number: QTBUG-23604
Change-Id: I5790cd92b9ffd5fcfbee1cd73a8eaa16fc74846f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove QJSEngine::newDate() functions
Kent Hansen [Tue, 17 Jan 2012 08:25:53 +0000 (09:25 +0100)]
Remove QJSEngine::newDate() functions

Rationale: Passing a QDateTime to toScriptValue() should be
sufficient, there's no need to have a dedicated factory
function for Date objects.

QDateTime has API for specifying a time in milliseconds, so the
newDate() overload that takes a double argument should be redundant.

Task-number: QTBUG-23604
Change-Id: Iec1d4ce8e1fd0a6ebef58dde3141730d27c2fb8c
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove QJSValue::instanceOf() function
Kent Hansen [Tue, 17 Jan 2012 08:12:10 +0000 (09:12 +0100)]
Remove QJSValue::instanceOf() function

Rationale: This is a remnant from QtScript. There is no good reason
for providing this type of low-level "prototype inheritance chain"
checks in this high-level QJSValue class. If you want to check if an
object is of the "right type", you can check if it has the
properties you require using property().

Task-number: QTBUG-23604
Change-Id: I3a274212cc57c38228fab73423af481e1b95d8a5
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoQJS{Engine,Value}: Remove QRegExp-specific functions
Kent Hansen [Tue, 17 Jan 2012 07:28:18 +0000 (08:28 +0100)]
QJS{Engine,Value}: Remove QRegExp-specific functions

Rationale: QRegExp regular expressions have different semantics than
JavaScript RegExp. This can cause data loss and unexpected behavior.

qjsvalue_cast() and fromScriptValue() can still be used to convert
between QRegExp and JS RegExp.

Task-number: QTBUG-23604
Change-Id: Iacf4aaea232aff9e4cecf4afa40753229bc5d643
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove QJSValue::toUInt16() function
Kent Hansen [Mon, 16 Jan 2012 14:13:51 +0000 (15:13 +0100)]
Remove QJSValue::toUInt16() function

Rationale: Remnant from QtScript. The implementation is just zeroing
the upper 16 bits of the 32-bit integer conversion.

Task-number: QTBUG-23604

Change-Id: I6b4b40883da01713d2a946eb028264f3a351276b
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove QJSValue::toInteger() function
Kent Hansen [Mon, 16 Jan 2012 14:01:29 +0000 (15:01 +0100)]
Remove QJSValue::toInteger() function

Rationale: This is a remnant from QtScript. A function called
toInteger() that returns a double looks strange.
Use toInt32() to convert a QJSValue to an integer.

Task-number: QTBUG-23604

Change-Id: I2829704c64b077fca264b660c46248c3f35cb5c0
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove QJSEngine::toObject() and QJSValue::toObject()
Kent Hansen [Mon, 16 Jan 2012 12:29:38 +0000 (13:29 +0100)]
Remove QJSEngine::toObject() and QJSValue::toObject()

Rationale: There is no compelling usecase for these functions.
They are a remnant from QtScript.

Task-number: QTBUG-23604
Change-Id: I6d8b4299956dd8f6284934739c4f1a65e4deb64c
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoUpdate item focus when the enabled property is changed.
Andrew den Exter [Mon, 23 Jan 2012 03:30:37 +0000 (13:30 +1000)]
Update item focus when the enabled property is changed.

Remove active focus from an item when it is disabled, and give active
focus to an enabled item if it has focus within a scope with active
focus.

Task-number: QTBUG-22404
Change-Id: Iff2b774a9ff784e6107a4ed6524c93e749ae0182
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoStabilize tests
Gunnar Sletta [Mon, 30 Jan 2012 09:34:55 +0000 (10:34 +0100)]
Stabilize tests

Change-Id: Iafaf645787dfecfbe044dd87dbfdbb884a75040b
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoQmlProfiler: profiling binding loops
Christiaan Janssen [Tue, 31 Jan 2012 10:42:41 +0000 (11:42 +0100)]
QmlProfiler: profiling binding loops

Moved the trace call in bindings so that they are also
registered when binding loops occur.

Change-Id: I56aa7bda6c5305f14dee98bebd929fb720f1ab32
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoQmlProfiler: moved v4 tracing to run method
Christiaan Janssen [Fri, 20 Jan 2012 15:34:49 +0000 (16:34 +0100)]
QmlProfiler: moved v4 tracing to run method

We used to register the calls to update, but that happens
only when the binding is created.  Evaluation occurs at run.

Change-Id: I01927a1eb515a83b4e5c69c6fcf5f358a8e5878f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoQmlProfiler: profiling compiled v8 bindings
Christiaan Janssen [Fri, 13 Jan 2012 14:41:59 +0000 (15:41 +0100)]
QmlProfiler: profiling compiled v8 bindings

Change-Id: I8c61b3805244595de6e1c7fbed7ed23440fe0a82
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoFlickable should be controllable programatically
Andras Becsi [Fri, 27 Jan 2012 11:05:00 +0000 (12:05 +0100)]
Flickable should be controllable programatically

Add flick(xVelocity, yVelocity) and cancelFlick() functions.
The functionality provided by these functions is already covered
by current unit tests.

Task-number: https://bugreports.qt.nokia.com/browse/QTBUG-23865
Change-Id: Ie284232bfbd98ae7c70ca060760fb016b4a45ee1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDocument that Item inherits QtObject
Alan Alpert [Fri, 27 Jan 2012 06:54:46 +0000 (16:54 +1000)]
Document that Item inherits QtObject

Task-number: QTBUG-22134

Change-Id: Ie81a7609eae9586cd49236b1b519567539b220d4
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDocument QRC restriction.
Alan Alpert [Fri, 27 Jan 2012 05:58:22 +0000 (15:58 +1000)]
Document QRC restriction.

Task-number: QTBUG-23362

Change-Id: If4793a2224f2fdbe44df346c762cd061f8471b77
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix Minehunt demo
Alan Alpert [Fri, 27 Jan 2012 05:41:50 +0000 (15:41 +1000)]
Fix Minehunt demo

This masks the real issue in QTBUG-23362, but gets the demo
running again. This is also a more correct way of expressing the URL.

Task-number: QTBUG-23362
Change-Id: I5569b8f0047b03db041f05740cfed52bdef465b9
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoSkip unstable test
Alan Alpert [Wed, 1 Feb 2012 00:30:43 +0000 (10:30 +1000)]
Skip unstable test

Task-number: QTBUG-23976

Change-Id: I81f820e064808d170094e6dcf9cbe35edf7bda35
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoDon't use region.numRects()
Lars Knoll [Tue, 31 Jan 2012 22:52:08 +0000 (23:52 +0100)]
Don't use region.numRects()

The method has been removed in QtCore.

Change-Id: I5dabe7da0ab9de617a6c241196ba803d4e887518
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoMark tst_qdebugmessageservice as insignificant until it passes again
Alan Alpert [Wed, 1 Feb 2012 00:22:03 +0000 (10:22 +1000)]
Mark tst_qdebugmessageservice as insignificant until it passes again

Task-number: QTBUG-23977

Change-Id: I1dbbad33788b3a52866fc4b48c96152a8c93f280
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoSkip failing test row for now
Alan Alpert [Wed, 1 Feb 2012 01:56:22 +0000 (11:56 +1000)]
Skip failing test row for now

Task-number: QTBUG-23980

Change-Id: If8656838296cd392de367f4557ccd676e161987c
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoRemove "All rights reserved" line from license headers.
Jason McDonald [Tue, 24 Jan 2012 03:37:23 +0000 (13:37 +1000)]
Remove "All rights reserved" line from license headers.

As in the past, to avoid rewriting various autotests that contain
line-number information, an extra blank line has been inserted at the
end of the license text to ensure that this commit does not change the
total number of lines in the license header.

Change-Id: If39bd256b0fa85eba17ea30f8ab87ea27d758908
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoEnhance editors notifying input panel for input method changes
Pekka Vuorela [Fri, 20 Jan 2012 12:07:20 +0000 (14:07 +0200)]
Enhance editors notifying input panel for input method changes

Introduced protected QQuickItem::updateInputMethod() and removed
similar, but badly named updateMicroFocus(). Added some missing
notifications from the editors and avoided unnecessary updates when not
having focus.

Change-Id: Id5c00e87dc26fd35c3f919006817511d4ed6418d
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoRename QSGTexture::textureSubRect to normalizedTextureSubRect()
Gunnar Sletta [Thu, 26 Jan 2012 15:55:27 +0000 (16:55 +0100)]
Rename QSGTexture::textureSubRect to normalizedTextureSubRect()

Change-Id: Id61cdaf1078d7b61d39644a80df8067f4ce4ceb0
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoOutput a friendly warning when makeCurrent fails
Gunnar Sletta [Thu, 26 Jan 2012 15:46:04 +0000 (16:46 +0100)]
Output a friendly warning when makeCurrent fails

Change-Id: Ife582717b4abc657120b98366fe6e6dc5efc7586
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoImprove QRegExp property literal assignment error message
Chris Adams [Fri, 27 Jan 2012 01:19:50 +0000 (11:19 +1000)]
Improve QRegExp property literal assignment error message

Previously, the error message given when a string literal was assigned
to a regular expression property was not very helpful.  This commit
adds a better error message.

Task-number: QTBUG-23068
Change-Id: Ia57b6434b9cdf009429e7b55edab4ab5c2b91c2a
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoUpdate PathAnimation API and document.
Michael Brasser [Tue, 24 Jan 2012 01:40:02 +0000 (11:40 +1000)]
Update PathAnimation API and document.

Update the API according to the last API review. Document it and add
a basic example as well.

Change-Id: I2d06a0772a9fb2101844446e68799620c275db97
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoRe-add documentation for AnchorAnimation and ParentAnimation.
Michael Brasser [Fri, 20 Jan 2012 06:34:19 +0000 (16:34 +1000)]
Re-add documentation for AnchorAnimation and ParentAnimation.

Change-Id: I2dfec71ef24d83492b8ade5849392e4b056ba5f6
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoDocument PathInterpolator.
Michael Brasser [Thu, 19 Jan 2012 02:24:03 +0000 (12:24 +1000)]
Document PathInterpolator.

Change-Id: I8fb625fb6881af8d0928da3d487dcd659dc384f5
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoPathInterpolator should report angle in clockwise direction.
Michael Brasser [Thu, 19 Jan 2012 00:09:40 +0000 (10:09 +1000)]
PathInterpolator should report angle in clockwise direction.

This makes it much more intuitive when binding item rotation to angle.

Change-Id: I5654866d9cd1c0ff5899c5571532fc7fedddd440
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoPrevent PathAnimation from hanging when jumping backwards to beginning.
Michael Brasser [Wed, 4 Jan 2012 01:08:24 +0000 (11:08 +1000)]
Prevent PathAnimation from hanging when jumping backwards to beginning.

Task-number: QTBUG-23076
Change-Id: I2aecdfd28f0c3d45b3b805640edaecbd5be2e6fd
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoUpdate Sprite using examples to frameDuration
Alan Alpert [Wed, 25 Jan 2012 10:48:04 +0000 (20:48 +1000)]
Update Sprite using examples to frameDuration

While it's good to test the interim compatibility code, examples are not
supposed to print any warnings.

Change-Id: Ie6560213fd89b0ca4162c5b48dbaf86dee63cb48
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoImplement reverse mode for sprites
Alan Alpert [Thu, 19 Jan 2012 10:57:07 +0000 (20:57 +1000)]
Implement reverse mode for sprites

Change-Id: I1e8c124e883b881938fce01aeb67ac369fe0bc28
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoExtend QQuickSprite docs
Alan Alpert [Wed, 18 Jan 2012 02:27:30 +0000 (12:27 +1000)]
Extend QQuickSprite docs

Including links to sprite sheet generators to help designers produce
this common format.

Change-Id: I980ae8090804bcc3de5513360dde8e65f9ec2ef8
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoImplement randomStart for sprites
Alan Alpert [Wed, 18 Jan 2012 01:48:30 +0000 (11:48 +1000)]
Implement randomStart for sprites

Most useful in the particle system, so that sprites aren't temporally
aligned at the start (ruining the random look).

Change-Id: I1cbf6c2187e412fcb8b31cab0d87bcde275c9281
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoImplement proper sprite sheet functionality
Alan Alpert [Wed, 18 Jan 2012 01:15:56 +0000 (11:15 +1000)]
Implement proper sprite sheet functionality

Uses frameX/frameY from the new Sprite API. You can now specify your
sprites as a single sprite sheet and just specify the offset for
individual animations.

Change-Id: I3a33d8329e6b9d65e5578669388e3115de992803
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoUpdate Sprite API
Alan Alpert [Wed, 18 Jan 2012 00:32:33 +0000 (10:32 +1000)]
Update Sprite API

Added the following properties
frameSync (replaces duration: -1)
frameRate
frameRateVariation
frameDuration
frameDurationVariation
frameX (not yet implemented)
frameY (not yet implemented)
reverse (not yet implemented)

Started the process of duration meaning animation duration instead of
frameDuration, but some grace period is being allowed for the transition

Change-Id: I0771a55d1708ba999483f76796f0323043b8a4db
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoElaborate on engine change
Alan Alpert [Mon, 23 Jan 2012 03:03:34 +0000 (13:03 +1000)]
Elaborate on engine change

Change-Id: I962f292878e4a1c8a8502f36e59803956230b90d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoSvelte new form for dynamic scene example
Alan Alpert [Thu, 19 Jan 2012 05:59:59 +0000 (15:59 +1000)]
Svelte new form for dynamic scene example

Change-Id: Ic6a3616ea06c8085e6ccd7e3e13566f36aadcc0f
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix updating of QML Text element
Eskil Abrahamsen Blomfeldt [Wed, 25 Jan 2012 14:36:20 +0000 (15:36 +0100)]
Fix updating of QML Text element

The negation in the test was left over from an earlier API and
would break the test and most likely cause the Text element to
always bypass its update.

Change-Id: Idc5c94a76a0477a9433305f5aba43c4bb8d67806
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoFix breakage due to meta-type id reordering in qtbase
Kent Hansen [Thu, 26 Jan 2012 14:04:51 +0000 (15:04 +0100)]
Fix breakage due to meta-type id reordering in qtbase

Commit aee1f6cc413f56bf4962324799ee3887c3dd037f in qtbase changed the
order/IDs of the "extended" meta-types, so that they are not
bigger than QVariant::UserType (127) anymore. This caused autotests
in qtdeclarative to assert/fail.

Ths commit adapts the logic in qtdeclarative accordingly, in
particular so that QVariant/QObjectStar aren't treated as value
types.

Change-Id: I3e6c0b2c9fb04bfd7f7fd94da2741f9536229b87
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoreimplement QWindow::focusObject() on QQuickCanvas
Pekka Vuorela [Fri, 20 Jan 2012 13:38:51 +0000 (15:38 +0200)]
reimplement QWindow::focusObject() on QQuickCanvas

Change-Id: I935a303d0baa9500ab47f749eb3b3f9a11a70946
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
12 years agoRemove the work-around for avoiding possible deadlock.
Xizhi Zhu (Steven) [Wed, 25 Jan 2012 13:26:23 +0000 (14:26 +0100)]
Remove the work-around for avoiding possible deadlock.

The possible deadlock has been fixed by:
http://codereview.qt-project.org/#change,13989

Change-Id: I1238052d4452ac37dedf8939fa27c8c8f6536f16
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoRemove QT_LICENSED_MODULE macro
Lars Knoll [Wed, 25 Jan 2012 20:35:40 +0000 (21:35 +0100)]
Remove QT_LICENSED_MODULE macro

The macro was used to check for valid commercial
licenses, and recently removed from qglobal.h

Change-Id: I20a2e02d0986429120ba2c083f9b50b1a23062f5
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoUse QMetaType::QVariant as the type for QVariant
Kent Hansen [Mon, 9 Jan 2012 13:09:32 +0000 (14:09 +0100)]
Use QMetaType::QVariant as the type for QVariant

Change http://codereview.qt-project.org/#change,12408 in qtbase
updates moc and friends to use QMetaType::QVariant instead of the
magic -1 / 0xffffffff / QVariant::LastType. This change adapts
qtdeclarative accordingly.

Change-Id: Ifb120485a4ee1501df6ad42d8ecd590824c85e9f
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Chris Adams <christopher.adams@nokia.com>
12 years agoAdd a locale property to IntValidator and DoubleValidator.
Andrew den Exter [Thu, 19 Jan 2012 05:53:20 +0000 (15:53 +1000)]
Add a locale property to IntValidator and DoubleValidator.

Allow the locale used for interpreting numbers to be changed from the
application default.

Task-number: QTBUG-23713
Change-Id: I28463485c86236fb2586eeb703ec4b051405c5a8
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix segfault now that the signature of roleNames is changed.
Stephen Kelly [Thu, 12 Jan 2012 19:12:03 +0000 (20:12 +0100)]
Fix segfault now that the signature of roleNames is changed.

(QtBase c3ad8c1c062a972b7fb75d8b51a1f80cb371d503)

Change-Id: I037787f895f71b746c38557f6fdbfbba5813cb25
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix docs: wrong types of Positioner attached properties
Leonardo Sobral Cunha [Fri, 20 Jan 2012 16:10:01 +0000 (17:10 +0100)]
Fix docs: wrong types of Positioner attached properties

Change-Id: I9ec9a070dfe5fdaebd11f4b92b9f44b034f24855
Reviewed-by: Martin Jones <martin.jones@nokia.com>