Gunnar Sletta [Wed, 8 Feb 2012 07:06:17 +0000 (08:06 +0100)]
Use a singleton for the plugin.
The factory is created from the QQuickCanvas constructor
before any alternative threads are started and doesn't need
this kind of protected. In addition this caused problems on
shutdown if multiple custom contexts where created.
Change-Id: Ifdd9bde0c65aa7c399722aea33af78087a2465b4
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Caroline Chao [Tue, 7 Feb 2012 11:35:58 +0000 (12:35 +0100)]
CodeCoverage: Fix wrong type passed to saveCoverageTool.
Passing a bool as appropriate.
Change-Id: I0dcca8d30c6d75e7fcddcf7047e1dd1c572ec6ea
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Alan Alpert [Wed, 8 Feb 2012 05:16:50 +0000 (15:16 +1000)]
Switch to QMetaType::Type
Looks like this change was made to QVariant for Qt5, slight behavioural
difference because floats are now a separate case.
Change-Id: Ia9d420b03454c13c97515ab9c89b743a668b37e2
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Glenn Watson [Tue, 7 Feb 2012 23:36:18 +0000 (09:36 +1000)]
Provide determinant accessor in render state structure.
This allows custom renderers to set the determinant to a value
different than the actual model view transform matrix. This is
useful when parts of the scene node transformation are done on
the CPU rather than in the vertex shader.
Change-Id: Icf26a5922b0933275a61af4656cf842bf61e70d5
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Gunnar Sletta [Wed, 8 Feb 2012 13:29:44 +0000 (14:29 +0100)]
Disable broken test
Change-Id: I3588153c37ef3d2ced43dba308502dd06428e0a6
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Gunnar Sletta [Fri, 3 Feb 2012 10:17:29 +0000 (11:17 +0100)]
Added QQuickCanvas::setRenderTarget(uint fbo, const QSize &size)
This allows to hook in non-QOpenGLFrameBufferObject FBO's also
Change-Id: I8a2f8f7f15d5a92262bdbb0507b232d7c11fdf25
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
Bea Lam [Fri, 3 Feb 2012 03:18:05 +0000 (13:18 +1000)]
Accept default targets for transitions
QDeclarativeAbstractAnimation::transition(),
QDeclarativeTransition::prepare() and QDeclarativeTransitionManager
now accept a QObject* to specify a default target for a transition.
For view transitions, this will allow the view to pass a view item
as the default target for a view transition so that the Transition
does not have to explicitly set the target for every animation.
Change-Id: I2c8d5535283335e139d98ef56f399f338627fb3e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Mon, 6 Feb 2012 03:27:34 +0000 (13:27 +1000)]
Don't hide virtual method.
Task-number: QTBUG-20994
Change-Id: Iaeeb23ed758ef52e0a3a61c4310aafec383e8a28
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Kim Motoyoshi Kalland [Wed, 18 Jan 2012 13:58:54 +0000 (14:58 +0100)]
Let Item.layer.samplerName be a QByteArray instead of QString.
Both Qt's property system and OpenGL shaders use 8-bit characters,
so there is no need to use a QString for samplerName.
Change-Id: I8cc29c74adb5d71a34cc99d9ecebbbba8b554cdf
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kim Motoyoshi Kalland [Tue, 17 Jan 2012 16:06:08 +0000 (17:06 +0100)]
Allow Item components to be assigned to Item.layer.effect.
Some complex effects are easier to implement as Items using
ShaderEffects internally rather than with a top-level ShaderEffect.
Auto-tests added.
Change-Id: I4b99811b87e7ca5054bf119b99207b7f5a7c666e
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Michael Brasser [Tue, 7 Feb 2012 00:22:09 +0000 (10:22 +1000)]
Initialize value.
Change-Id: Ibfb045827a38021fcfa43e735823ad346c5c066c
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Andrew den Exter [Tue, 7 Feb 2012 07:52:52 +0000 (17:52 +1000)]
Resolve StyledText img tags relative to baseUrl.
Change-Id: I954195d52330c65e851b7c0fcdb6c8dabf29335d
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Kim Motoyoshi Kalland [Tue, 17 Jan 2012 15:49:13 +0000 (16:49 +0100)]
Fixed some Item.layer bugs and added auto-tests.
Change-Id: I3f66f911d1c499c37a66904f8ddab6951ba85e60
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Jędrzej Nowacki [Tue, 31 Jan 2012 09:03:56 +0000 (10:03 +0100)]
Mark constructor of QJSValue as deletable.
This constructor is there only to force compile time error.
Change-Id: Ia2e059e0c7fa516949a166da8856543a5608d217
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Bea Lam [Tue, 31 Jan 2012 07:15:00 +0000 (17:15 +1000)]
Separate out some of the common test code
Moves findItem, findItems() etc. into shared/visualtestutil.h and
moves duplicate list model test classes and other common view-specific
code into shared/viewtestutil.h.
Change-Id: Ia79bc4df1ab7fb618597755c0288a2e8f5054faf
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Wed, 25 Jan 2012 00:32:43 +0000 (10:32 +1000)]
Add additional animation autotests.
Change-Id: I11894325e73b8bb5b6ece4c626b15bd1d099f229
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Gunnar Sletta [Mon, 6 Feb 2012 16:57:43 +0000 (17:57 +0100)]
Avoid recursive parent chains in QQuickItem
Change-Id: I47b666cfacd804c4302236f0a4b371ca7b382c3d
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Thu, 2 Feb 2012 23:17:43 +0000 (09:17 +1000)]
Fix example to clear rect before painting.
Change-Id: Iecefc9bb38957ec463edb575f4495275aae7c57e
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Andrew den Exter [Tue, 7 Feb 2012 01:57:42 +0000 (11:57 +1000)]
Add contentWidth and contentHeight properties to Text elements.
For Text and TextEdit this is a rename of paintedWidth and paintedHeight
both of which remain as synonyms of the content properties for
compatability. For TextInput this is a new property.
Task-number: QTBUG-23691
Task-number: QTBUG-15160
Change-Id: Idbdc72fad34922be21b649ca45fc39b5e533ed1a
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Michael Brasser [Fri, 3 Feb 2012 02:26:37 +0000 (12:26 +1000)]
Add and use new animation backend.
The new backend improves performance, and allows us to create
multiple running animation jobs from a single Transition. It is
based off of the existing Qt animation framework.
Change-Id: Id1d0162f6e5c65bf31267f3f9f2042c354375d57
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Yann Bodson [Sun, 5 Feb 2012 22:20:02 +0000 (08:20 +1000)]
Remove warnings with clang
Change-Id: I924f0adc036b47e2342bf383d308c6a5269c2de6
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 7 Feb 2012 00:03:06 +0000 (10:03 +1000)]
Update test files to API changes
API changes are being managed, but the test files shouldn't be
triggering the warning.
Change-Id: Ifd6c0c08be9979d72f98eb6a1df07daf9302772e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Tue, 7 Feb 2012 02:06:49 +0000 (12:06 +1000)]
More fixes for QDeclarativeListModelWorkerAgent cleanup
1) Use deleteLater() instead of delete to avoid crashing with any pending events
2) During event processing, return earlier if possible
Change-Id: Ia7d6c95acf1175a16b80e952b95909bb5bbc9433
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 7 Feb 2012 02:40:53 +0000 (12:40 +1000)]
Fix symbol clash
SpriteImage and ImageParticle are now in the same library, need
different internal class names.
Change-Id: Ic32fafb729818a6114fe454e7288fbf00fd6a1e7
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 3 Feb 2012 03:09:17 +0000 (13:09 +1000)]
Ensure Flickable moving and flicking properties are correct.
Flicking, then touching to stop the flick should set flicking
property to false. Moving or flicking vertically should not
set flickingHorizontally, and vise-versa.
Change-Id: Iee42a92ffff2707f0691ffa285dec514b47c9986
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Martin Jones [Fri, 3 Feb 2012 00:55:19 +0000 (10:55 +1000)]
Section header is not made visible when changing currentIndex.
Make section header visible when setting currentIndex to an
item on a section boundary. Could also affect initial position
if view size started at 0.
Change-Id: Ie65f91826311d34a290d369d8956f1c88f7efb70
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Yann Bodson [Thu, 2 Feb 2012 01:51:45 +0000 (11:51 +1000)]
Remove pixmap text caching in QML text element
Task-number: QTBUG-24033
Change-Id: Ifa24482b98536300c2f4c643a86517a019de8a84
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 6 Feb 2012 02:36:43 +0000 (12:36 +1000)]
Fix truncation and incorrect formatting of RichText.
Update the text position when adding text.
Task-number: QTBUG-23981
Change-Id: I4a10916559745e8df805b1f8563522341bc6f69b
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Alan Alpert [Fri, 3 Feb 2012 04:43:05 +0000 (14:43 +1000)]
Homogenize examples
Several groups of examples are now organized like the other Qt examples,
with a project file, doc entry, and single launch point.
Change-Id: I2fd957c00e0d1121ebe47c806e54e6999425d1d3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Simon Hausmann [Fri, 3 Feb 2012 13:41:17 +0000 (14:41 +0100)]
Fix acceptance of unhandled mouse events.
Mouse events not handled by the canvas need to be ignored, in order for
features like touch synthetization to work. In case of the initially
delivered mouse press event, the canvas did not ignore the event if it
was not handled. This patch corrects that and adds an auto-test to verify
the new behaviour.
Change-Id: I8499701f5a161ce1e90a70303aa7ca4ccf2f0b6f
Reviewed-by: Andras Becsi <andras.becsi@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Mon, 6 Feb 2012 15:40:55 +0000 (16:40 +0100)]
Warnings in the before/afterRender docs
Change-Id: I2311e574b45d518893ef868fdcf51053dc43bb13
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Tor Arne Vestbø [Fri, 3 Feb 2012 13:11:27 +0000 (14:11 +0100)]
Don't start timers in the QDeclarativePixmapStore destructor
Timers use global static data, which might have been torn down at the
point where we start the timer.
Change-Id: Id11de05ae92b9a3652f9b1d7c3d5ca4947ffe065
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>