Kent Hansen [Wed, 18 Jan 2012 13:01:39 +0000 (14:01 +0100)]
Add QJSValue::callWithInstance() function
With the deprecated call() overload, it was confusing what the first
argument was (the this-object or an actual argument passed to the
function). Introduce a dedicated function for the
"explicit this-object" case. This makes code more readable, and
eliminates the need to pass a "dummy" this-object to call() in the
quite common case where you don't care about the this-object.
Task-number: QTBUG-23604
Change-Id: I18f8be6592a848436351516bea266fc7e9195777
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Fri, 20 Jan 2012 07:00:27 +0000 (08:00 +0100)]
Add QJSValue::call() overload
This overload takes only an argument list, not a this-object, since
that is a very common way of calling stand-alone ("non-member")
functions. Now there is no longer a need to pass a dummy value for
the this-object.
Task-number: QTBUG-23604
Change-Id: Iae952d91fce5bcaa62a05b9978c15f32802da90a
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Wed, 18 Jan 2012 12:23:16 +0000 (13:23 +0100)]
Add QJSValue::isCallable() function
This replaces the isFunction() function. isFunction() will be
removed. It's possible that objects are callable even if they aren't
Function instances. Also, "isCallable" is consistent with call().
Task-number: QTBUG-23604
Change-Id: I42e0ab2ad9dc84e7793199254bbd89d5c9466e6a
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Wed, 18 Jan 2012 12:12:00 +0000 (13:12 +0100)]
Add QJSValue::toInt() and toUInt()
These replace toInt32() and toUInt32(), which are obsolete and will
be removed.
Task-number: QTBUG-23604
Change-Id: I83c055dbbe399fa7242889cee8a177440a693d9a
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Wed, 18 Jan 2012 09:00:02 +0000 (10:00 +0100)]
Add QJSValue::deleteProperty() function
This makes it possible to delete a property without relying on passing
a QJSValue of invalid type to setProperty() (the invalid type is going
to be removed).
Task-number: QTBUG-23604
Change-Id: I653b3349050ad1aac1cf6ccc8547c753abbb9f1d
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Wed, 18 Jan 2012 08:50:31 +0000 (09:50 +0100)]
Add QJSValue::hasProperty() and hasOwnProperty() functions
These functions provide a way of querying whether a property exists,
without relying on the QJSValue invalid type (which will be removed).
Task-number: QTBUG-23604
Change-Id: I2efd53a1e54cc202ecc022d12730b2775384cf53
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Jędrzej Nowacki [Fri, 20 Jan 2012 20:23:45 +0000 (21:23 +0100)]
Build fix.
QBool was removed from QtBase in change I6642f43f
(Remove QBool and use bool instead)
Change-Id: Ia4c5d12fae8779d7e8c880755cd16e215f073a6d
Reviewed-by: David Faure <faure@kde.org>
Anselmo L. S. Melo [Fri, 20 Jan 2012 21:00:16 +0000 (18:00 -0300)]
QtDeclarative Tests build fix
QBool was removed from QtBase in change I6642f43f: "Remove QBool and use bool instead".
Change-Id: Icc037d4201a007f9df0f7c79b19808dc174c218f
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Alan Alpert [Thu, 19 Jan 2012 06:03:13 +0000 (16:03 +1000)]
Document toys examples
Change-Id: I376c4169ffff19e06b55e578e57101a476500b04
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Thu, 19 Jan 2012 05:14:06 +0000 (15:14 +1000)]
Adhere to examples standards more consistently
Example subfolders should be named 'content'
Change-Id: I23f5b0ef44108f54f9b1703f04faf02cafc78efb
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Gunnar Sletta [Fri, 20 Jan 2012 09:26:17 +0000 (10:26 +0100)]
Added a few material flags
Change-Id: Id324ebb82df985f1a7380761cc4923f60c7d1f20
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Jan-Arve Saether [Thu, 19 Jan 2012 11:01:55 +0000 (12:01 +0100)]
Use queryAccessibleInterface instead of new QAccessibleQuickItem
In some cases this could prevent us from actually returning the
expected QAccessibleQuickItemValueInterface.
This is also more future-proof in case we add more QAI subclasses.
Change-Id: Id66dc21418671a3045d93c0a44dc74aa0aff30af
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Martin Jones [Thu, 19 Jan 2012 23:24:56 +0000 (09:24 +1000)]
Doc: Improve Qt.locale docs.
Change-Id: I3ef5c4a0bedbaa346b001852bba8e9ff9347e9e0
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Gunnar Sletta [Mon, 9 Jan 2012 08:02:12 +0000 (09:02 +0100)]
Remove the use of QT_MODULE()
Change-Id: I1c07231b0bf412fe490a44b9a060bb2e2ef11154
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Andrew den Exter [Wed, 18 Jan 2012 04:43:43 +0000 (14:43 +1000)]
Update TextInput.acceptableInput on component complete.
QValidator doesn't notify when it's validation criteria changes so is
susceptible to order of evaluation issues. Deferring the initial
validation will ensure validators with static criteria are correctly
applied. Notification from QValidator on changes would solve this
for all cases: QTBUG-23694.
Task-number: QTBUG-21103
Change-Id: I920f36645fd18ce809db56b5daf73545f1d603dc
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 20 Jan 2012 03:21:29 +0000 (13:21 +1000)]
Add quick module to .pro file
Change-Id: I1d07613f8588b48aa7fc9ebe0c09e78ba43a9e02
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Martin Jones [Wed, 18 Jan 2012 06:21:50 +0000 (16:21 +1000)]
Fix lockup in views due to endless polish loop.
It was possible to cause an endless polish loop in some rare cases.
Eliminate all calls to polish() within existing polish() code paths.
Cleanup delegate creation and cancelling in the cacheBuffer area.
Adjust first item position correctly when inserting/removing before
visibleItems list.
Change-Id: I508a2e6de8cb09d904466cbf5fb6b5dfd1e89c49
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Matthew Vogt [Thu, 19 Jan 2012 05:54:24 +0000 (15:54 +1000)]
Assigning empty object to Q_PROPERTY(QVariantMap)
Correct the evaluation of an empty javascript object during assignment
to a QVariantMap property.
Task-number: QTBUG-23586
Change-Id: Ifa891a017690a36bd5837bc6b4dd0e47eb515a46
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 18 Jan 2012 01:59:56 +0000 (11:59 +1000)]
Extend the documentation on DoubleValidator.
Elaborate on what is valid, intermediate, and invalid.
Task-number: QTBUG-22081
Change-Id: If0ef270eaee60b530fdf6275e36b2208d41c7639
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 17 Jan 2012 00:42:26 +0000 (10:42 +1000)]
Add a baseUrl property to Text and TextEdit.
Specifies the base URL which embedded links in rich text are resolved
against. By default this is the URL of the item.
Task-number: QTBUG-23655
Change-Id: Ib51b8503a18d9ac4e1801c77b77b3595d8f4912a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Mon, 16 Jan 2012 06:40:13 +0000 (16:40 +1000)]
Don't load embedded images from the current working directory.
Override QTextImageHandler's image loading as it will attempt to resolve
relative paths and load the image itself if the document returns an
invalid image from loadResource, which we don't want as it bypasses the
pixmap cache and resolves against the application and current working
directory instead of the Text items context.
Change-Id: Ia1d3633036f96d902e1ac03dae5d5b203fba7ff1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Matthew Vogt [Wed, 18 Jan 2012 23:51:18 +0000 (09:51 +1000)]
Fix range checking in AbstractItemModel examples
Fix range checking in AbstractItemModel examples
Task-number: QTBUG-23574
Change-Id: I6f2d4c18e1fb33ee369ebc75f501e524e8e63615
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jason McDonald [Tue, 17 Jan 2012 06:12:02 +0000 (16:12 +1000)]
Change testlib skipAll function to failure.
Be more insistent that tests using the obsolete skipAll() function
should change to using skip() by treating calls to skipAll() as test
failures. After a further grace period the skipAll() function will be
removed.
Change-Id: Ic2448af2f8176909afa151b6e8c29587dfd17f1f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Yoann Lopes [Thu, 12 Jan 2012 15:13:49 +0000 (16:13 +0100)]
Use mediump in distance field shaders for the alpha threshold.
lowp or highp cause some problems depending on the hardware.
Change-Id: I2762c04548656de8fdb34711f52e5cf05d8c2ac5
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Gunnar Sletta [Wed, 18 Jan 2012 10:13:21 +0000 (11:13 +0100)]
The rendering signals must be direct connections.
Change-Id: I6fd492096e21dfe1580d003cd9165a2d4c7f37dc
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Wed, 18 Jan 2012 09:17:33 +0000 (10:17 +0100)]
Compile since recent API changes
Change-Id: Id8f8b238661a46cf071f671d5d40e5c683c8ccc9
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Frederik Gladhorn [Fri, 13 Jan 2012 10:47:48 +0000 (11:47 +0100)]
Move accessibility test to QtQuick 2.
The test now only depends on Quick 2 and no longer a mix of
widgets, Quick 1 and 2.
Change-Id: I3120e11dadb8bb7d7635e6baa1cb905d917353ea
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Matthew Vogt [Mon, 16 Jan 2012 01:05:23 +0000 (11:05 +1000)]
Allow QML URLs to contain pre-encoded octets
Use QUrl Tolerant parsing mode to permit user-supplied URLs to contain
pre-encoded octets which are not mangled by string conversion.
Task-number: QTBUG-22756
Change-Id: I4b160b04340b95221d1eb3336bda8c0b38d2e232
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Bea Lam [Fri, 13 Jan 2012 04:35:04 +0000 (14:35 +1000)]
Insertions were calculating wrong insertion pos
After removes, and after each insertion, the view must adjust the
visibleItems.first() position and call layoutVisibleItems() to ensure
that the correct insertion position is calculated for insertions that
follow.
When applyInsertionChange() in GridView and ListView calculates the
position for item insertion, it looks at the current positions of the
items in visibleItems, so these positions must be updated prior to
this calculation. Otherwise, insertions that follow a remove may not
calculate this position correctly and will neglect to add some items,
and multiple insertions may unnecessarily create items at positions that
are not actually visible.
resetFirstItemPosition() is changed to take a set position and it
replaces resetItemPosition() since it can do the same thing.
Task-number: QTBUG-23610 QTBUG-23609
Change-Id: I8839ee7d15853301435e80c0dc563f93fc3605cf
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Pekka Vuorela [Mon, 9 Jan 2012 11:41:36 +0000 (13:41 +0200)]
Made QQuickTextInput follow input direction changes
Cursor of empty field should align based on input method
direction. Now input method allowed to change direction
on run time.
Also earlier cursor wasn't properly drawn on correct alignment
at all.
Change-Id: I4601f10e6b5dde09591bd484b05f001add6c1573
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Pekka Vuorela [Mon, 9 Jan 2012 14:31:54 +0000 (16:31 +0200)]
QQuickTextEdit to follow input method direction changes
Change-Id: I458f85452a2ffe1c43438f9588cfc271461a42c6
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Kai Koehne [Mon, 16 Jan 2012 13:11:53 +0000 (14:11 +0100)]
Debugger: Simplify protocol of QDebugMessageService
Change-Id: I3f97a344b8d0e0d73a75e84310c1e8ed59573ee7
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Glenn Watson [Thu, 12 Jan 2012 00:19:32 +0000 (10:19 +1000)]
Fix crash when using namespaces for JS module APIs.
Fix unitialized variable in constructor.
Change-Id: Ibc39d7512990ad293789280e26797be1ecd1ade1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Mon, 16 Jan 2012 01:22:34 +0000 (11:22 +1000)]
Doc: fix QML Examples link
Change-Id: Id4637a7953f05ee9eac712116f68218a0c8b9ff9
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Alan Alpert [Thu, 12 Jan 2012 10:32:56 +0000 (20:32 +1000)]
Connection was accidentally of the Queued variety
This connection needs to be direct, because right after that signal is
emitted the next frame is drawn (before we return to the event loop at
least). The sprite updating needs to happen in time for the frame or the
sprites get confused.
Task-number: QTBUG-23407
Change-Id: Ie56465145461486456462154dfafe546fedaaaaa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Mon, 16 Jan 2012 03:44:41 +0000 (13:44 +1000)]
Update Screen example
DPI API never made it into the final API, because there were more issues
than valid usecases.
Change-Id: Ie56465145461486456462154dfafe546fedaddee
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Jason McDonald [Tue, 10 Jan 2012 05:19:47 +0000 (15:19 +1000)]
Update copyright year in Nokia copyright headers.
Update copyright headers from before 2011, and a couple of new ones that
were merged after the previous change to copyright headers.
Change-Id: Ia76e08e2734afa4ef3f1207dbcda5ff3bc81b366
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Alan Alpert [Tue, 17 Jan 2012 04:27:31 +0000 (14:27 +1000)]
Match QRect change
3b973971fb1e483b9b3514358a415781c3c24ba8 changes the order of data
members on mac, the struct we're using to fake QRect needs to match.
Change-Id: Id2ecf1726e64514e12dd72980a0c0ad2b693c483
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kim Motoyoshi Kalland [Wed, 11 Jan 2012 16:34:58 +0000 (17:34 +0100)]
Added log and status properties to ShaderEffect.
Task-number: QTBUG-23531
Change-Id: I136f6d9642ff9d4074fe8dae1f5714a05349107a
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Kai Koehne [Mon, 16 Jan 2012 12:44:34 +0000 (13:44 +0100)]
Console API: Add console.info
Add console.info for the sake of completeness. It's mapped to qDebug(),
just like console.log, console.debug, print.
Change-Id: Ife1cfbfe810d4e5e9175343778dff734a56f4a80
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Mon, 16 Jan 2012 12:35:07 +0000 (13:35 +0100)]
Console API: Autotest reshuffling
Move the console tests from qdeclarativeqt to qdeclarativeconsole,
and the test for the QML_CONSOLE_EXTENDED property to
debugger/qdebugmessageservice.
Change-Id: I704bd0a4a28aa1b0eb51df67d32fd6865b114d41
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Jan-Arve Saether [Mon, 16 Jan 2012 12:56:29 +0000 (13:56 +0100)]
Remove all reimplementations of relationTo() returning Unrelated.
QAccessibleInterface::relationTo() already return
QAccessible::Unrelated by default. No need to duplicate that code.
Change-Id: Ie64e798a1935619af32ae41d7e14ae26bd9bf523
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Jiang Jiang [Fri, 13 Jan 2012 10:06:10 +0000 (11:06 +0100)]
Fix preedit text visibility for TextEdit
For an empty TextEdit with preedit text, we need to add the text
separately since the blockIterator will not go through that case.
Also fixed preedit text appended at the end of any commited text.
Move the code for adding text into SelectionEngine so that we can
reuse it for adding preedit text.
Task-number: QTBUG-22647
Change-Id: Id4fe04099b16949ff5de0747881c6dc96ef0673f
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Christiaan Janssen [Wed, 11 Jan 2012 16:50:51 +0000 (17:50 +0100)]
QDeclarativeExpression: storing column number in expression location
Change-Id: I2d69738158abfc76f80b1cfc0e0ccb145fda2245
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Andrew den Exter [Wed, 11 Jan 2012 01:00:36 +0000 (11:00 +1000)]
Avoid creating unnecessary copies of TextEdit's text data.
Delay rebuilding the text data from QTextDocument until it is actually
requested rather than everytime the contents of the document change.
Change-Id: Ibfdc9e9e0372010f0731fb02a223c8b59a67f2c3
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Mon, 16 Jan 2012 03:01:19 +0000 (13:01 +1000)]
Test more of QQuickImageParticle
Now the color variance properties are tested, as is the debug code.
Just running the debugging code is valid testing, as it contains
pointer derefernces that could cause runtime errors, and this codepath
is not always enabled at runtime.
Additionally, debug mode control has been consolidated in the
ParticleSystem. However, this was not necessary for this test addition.
Change-Id: Ie56465145461486456462154dfafe546fedabcba
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Mon, 16 Jan 2012 08:30:58 +0000 (18:30 +1000)]
Wait for polish at the start of addOrRemoveBeforeVisible
Change-Id: I1cf13af7e9b854cee7754b31643438eab3085084
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Martin Jones [Thu, 12 Jan 2012 05:31:00 +0000 (15:31 +1000)]
Handle views with negative width/height
A view with a negative d->size() would get stuck in an infinite
loop. Also make sure item layout/visibility is updated when
the view size changes.
Change-Id: I1f16a714ecebe1c4b71902c460e27fb0f1c4406f
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Matthew Vogt [Fri, 13 Jan 2012 00:16:05 +0000 (10:16 +1000)]
lower case QML components are accepted when used with 'as' import
If an Object Binding is in a namespace, ensure that the Component name
begins with a capital letter.
Task-number:QTBUG-20786
Change-Id: Id4a0c0fdb0c9b9516bea597a4994bb7519339bc9
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Xizhi Zhu (Steven) [Sat, 14 Jan 2012 06:57:04 +0000 (08:57 +0200)]
Fix build break in qmlviewer.
It's introduced by commit
14b929e9c448f2cc74fa047aaf8af283b81fbaf9 in QtBase.
Change-Id: Iacb5350b5f42a09b7419bf491ac9620a406422e6
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Samuel Rødal [Fri, 13 Jan 2012 15:58:47 +0000 (16:58 +0100)]
Stabilized tst_qquickcanvas
For some reason the mouseFiltering() and headless() cases fail
if the touch test cases run first.
Change-Id: I30839b09e9f7b287c88e6983424add5cf40a6d1a
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Samuel Rødal [Fri, 13 Jan 2012 09:15:35 +0000 (10:15 +0100)]
QTouchEvent::TouchPoint::isPrimary() is gone.
Change-Id: I6fbaac28a060fd527e0226d55419a9055125368a
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Gunnar Sletta [Mon, 9 Jan 2012 07:43:34 +0000 (08:43 +0100)]
Reintroduce plugin support for asynchronous hardware specific textures
Change-Id: Iad36542d2137e7a6470009c308ece3de389907c1
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Bea Lam [Fri, 6 Jan 2012 04:02:10 +0000 (14:02 +1000)]
Add tests for item polish bug on Mac
On Mac OS X, if a QQuickItem triggers a polish request from
Component.onCompleted, its updatePolish() function is not called.
The tst_qquickitem::polishOnCompleted() test demonstrates this.
If a running animation is added to the polishOnCompleted.qml in the
test, the test will pass.
Task-number: QTBUG-23481, QTBUG-23480, QTBUG-21590
Change-Id: I172b12e784aa458c43c23e0ee43f034f0bd332ee
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Fri, 13 Jan 2012 00:47:25 +0000 (10:47 +1000)]
Don't delete global app
Sometimes delete the global GUI app causes crash, this is a work around
fix.
Change-Id: Ic2406e7a085483de5d96321de8257663925b7e5e
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Damian Jansen [Fri, 13 Jan 2012 02:08:20 +0000 (12:08 +1000)]
Use QGuiApplication, not QApplication, in tests
Change-Id: I7802293e6cafb90686c103972bc036cf74184714
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Gunnar Sletta [Thu, 12 Jan 2012 15:52:21 +0000 (16:52 +0100)]
Disable an unstable test.
Change-Id: I2f346ce26bfb23e148cb5b0ad73a934930a4fdf7
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Jiang Jiang [Thu, 12 Jan 2012 15:28:22 +0000 (16:28 +0100)]
Fix preedit text visibility when TextInput is empty
Task-number: QTBUG-22646
Change-Id: I5162ffdebdee6f956a9a79b2307a2ac53cc4890b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Gunnar Sletta [Thu, 12 Jan 2012 09:42:07 +0000 (10:42 +0100)]
initialize variable
Change-Id: I4841dce8e85df608fd0e38f661301797a3857176
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Robin Burchell [Fri, 6 Jan 2012 18:20:55 +0000 (19:20 +0100)]
Remove out-of-line uses of qMalloc/qFree/qRealloc.
Per http://codereview.qt-project.org/#change,11562, we are trying to remove these
in favour of direct allocation, or (in the case of inline code) specialised
out-of-line wrappers.
Change-Id: I113609c4f97dc5c8020a72cbd398572cdb5b7505
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Pekka Vuorela [Thu, 5 Jan 2012 14:33:56 +0000 (16:33 +0200)]
Adapt to QInputPanel::inputDirection() API
Information moved from QGuiApplication into QInputPanel.
Change-Id: Idd80609f4b67bffae7222a1fa27918724ebf60f6
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Frederik Gladhorn [Mon, 9 Jan 2012 15:06:23 +0000 (16:06 +0100)]
Accessibility: indexOfChild is 0-based.
Also test for it to work.
Change-Id: I3be913984e2dddce241b538c7801f3376acdd1fa
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Jan-Arve Saether [Tue, 10 Jan 2012 13:56:09 +0000 (14:56 +0100)]
Remove unnecessary reimplementation of invokeMethod()
invokeMethod() is not pure virtual, and the implementation
inherited from the baseclass is the same
Change-Id: I073ab3a0dc3477f66b82535c1898430f601acee8
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Jan-Arve Saether [Tue, 3 Jan 2012 08:40:16 +0000 (09:40 +0100)]
Make QAccessibleQuickView::childAt() work properly with overlapping items
The previous code did not consider items that were overlapped due to
having different z coordinates.
The approach used is now the same as found in
QQuickCanvas::mousePressEvent().
Strictly speaking, this is a violation of childAt (since it will
disregard the implementation of childAt of all the descendants along
the path down to the item actually returned.)
However, I don't see any good reason for that the implementation for
childAt() would be different than how mousePressEvent behaves.
It should also perform better than any other solution I managed to
think of.
Change-Id: I2d3fa2282437c7b5533c6149c62fc456ccf2ccfa
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Andrew den Exter [Tue, 10 Jan 2012 06:51:22 +0000 (16:51 +1000)]
Fix validators not allowing backspace or delete.
TextInput will allow non-valid changes to already invalid text, when
a validator is changed update the current validity so changes can
be made to bring the text back to a valid state.
Task-number: QTBUG-22080
Change-Id: I501961b473f58c317bce474b1df8d91fd1f967d4
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 10 Jan 2012 01:52:43 +0000 (11:52 +1000)]
Add undo and redo functions to TextInput and TextEdit.
The functionality already existed and was usable through keyboard short
cuts but was not accessible through API.
Task-number: QTBUG-16191
Change-Id: I080fa2ddb76668a7a632aa7477004f99037ea68b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 10 Jan 2012 01:07:43 +0000 (11:07 +1000)]
Remove QEXPECT_FAIL from TextEdit test.
Test doesn't assert.
Task-number: QTBUG-22058
Change-Id: I28ca74884ed9f42ff35789be82e99dbdf84055c3
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Andrew den Exter [Tue, 10 Jan 2012 00:28:11 +0000 (10:28 +1000)]
Fix restarting timer from onTriggered handler.
Set the running property to false before calling the triggered handler
when a timer finishes so it does not appear to still be running and
can be restarted by setting the running property to true.
Task-number: QTBUG-22004
Change-Id: I840efa30f5b7ad7d0cda96803d4898be3f390705
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Fri, 6 Jan 2012 05:39:51 +0000 (15:39 +1000)]
Fix failing tst_qquicktextinput::horizontalAlignment_RightToLeft test.
How the text is laid out is dependent on the horizontalAlignment so
that needs to be determined before updating the display text and doing
the layout.
Task-number: QTBUG-23485
Change-Id: I1872b1bfc60fd829a0d69c21a19cd3b2b4dc8340
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 3 Jan 2012 02:07:25 +0000 (12:07 +1000)]
Add Two MultiPointTouchArea examples
Bear-whack and multi-flame. Still missing an example using a custom
gesture and the signals.
Change-Id: Ie75c57e34adab3a62f66eba586a1b2de51dbe100
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Tue, 10 Jan 2012 04:48:47 +0000 (14:48 +1000)]
Fix QQuickAge test
With the consistent timing bug fixed (ages ago), test should be stable.
A problem leading to failures in sustained has also been fixed (assumed
that the particle group size would be approximately 500, but this is not
necessarily true).
Task-number: QTBUG-22088
Change-Id: Ifdb0f0e08266f9e44782c6b8fc8c56200c0a1d46
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Fri, 6 Jan 2012 05:42:51 +0000 (15:42 +1000)]
Update text autotests.
QTBUG-18040 has been fixed for Qt 5, we no longer need to skip these
tests on Mac.
Change-Id: Ie1883a75b105ca321388b3c4483110306e2a387c
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Andrew den Exter [Wed, 11 Jan 2012 02:05:34 +0000 (12:05 +1000)]
Skip crashing test on Mac.
Task-number: QTBUG-23010
Change-Id: I0e0513e50664421522c104163a28c3fa88b5c469
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Thu, 12 Jan 2012 01:21:42 +0000 (11:21 +1000)]
Stabilize test.
There appears to be an issue with showing before setting the source,
if qWaitForWindowShown is not used. The show() is not required for this
test, so remove it.
Change-Id: I423a9572c8ee0dde9cbf9bc8fbf98aede97a79a7
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Simon Hausmann [Mon, 9 Jan 2012 11:08:18 +0000 (12:08 +0100)]
Remove obsolete toBoolean() and isBoolean() QJSValue getters
We should use "toBool" and "isBool" for consistency with QVariant.
Change-Id: I266f2a36a034a5b323e614777ceacbc0d2ffec16
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Friedemann Kleint [Fri, 6 Jan 2012 12:25:51 +0000 (13:25 +0100)]
QMLTest: Fix output of file names, make output more verbose.
- Check command line arguments thoroughly.
- Change all QuickTestResult functions taking file names to
accept QUrls and format them using QUrl::toLocalFile() in case
of local file names in order to display Windows drive
letters correctly.
- Introduce a template function (for QDeclarativeView, QQuickView)
that dumps out all available information when compilation goes
wrong.
- Skip 'Debug', 'Release' folders for Windows builds.
Change-Id: Ibdd92867870a2b05494de8a0adbe0910d4897ba2
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Frederik Gladhorn [Sat, 7 Jan 2012 00:47:06 +0000 (01:47 +0100)]
Improve Accessibility documentation.
Change-Id: I41a48a69c1de34b37bcb4a703f844647d8c61456
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Frederik Gladhorn [Wed, 4 Jan 2012 13:37:27 +0000 (14:37 +0100)]
Accessibility: Checked state for check boxes and radio buttons.
Also adapt to new api in qtbase - state is now a bit field.
Change-Id: Ia4266f3d5094a6c32e0ace3499910b57c3e71c25
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Simon Hausmann [Thu, 5 Jan 2012 09:46:37 +0000 (10:46 +0100)]
Remove the pin to qtbase and depend on the new qtjsbackend module
This module contains our V8 dependency.
Change-Id: I72b0b64fe61fe10139725d24711ea24a8a035eb4
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Gunnar Sletta [Fri, 6 Jan 2012 09:57:12 +0000 (10:57 +0100)]
Fix tst_qdeclarativestates::anchorsRewindBug failure
maybeUpdate() has an optimization to void locking the Gui thread
on every QQuickItem::update() call, which was faulty. When the
render thread was done rendering the flag should have been reset
which would have meant another locked sync between render and GUI.
Solve it slightly differently by posting an event to ourselves in GUI
and resetting the state once the event is processed. This batches all
update calls made until the GUI thread returns to the event loop, aka
all animation updates, all responds to one touch event, etc.
The isExternalUpdatePending variable, written from maybeUpdate, was
accumulated per canvas, but is used per render thread only, so this
change simplifies the variable to be per render thread only.
Task-number: QTBUG-23478
Change-Id: I067a9918383e3e05e2feebcc6dfa3163b032eb5b
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Mon, 9 Jan 2012 15:54:23 +0000 (16:54 +0100)]
QQuickListView is unstable when run as parallel
Change-Id: I4d7e31e69f4b71d5ecf2113b90343e10320e8056
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Gunnar Sletta [Fri, 6 Jan 2012 16:11:11 +0000 (17:11 +0100)]
Avoid storing a deep copy of the image in the texture object
Change-Id: I605445ea23493fd562a7fe2b3cc841ad21e5b08b
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Aurindam Jana [Tue, 8 Nov 2011 10:47:33 +0000 (11:47 +0100)]
QDeclarativeDebug: Add a debug message service.
QDeclarativeDebugMsgService installs a QtMsgHandler which forwards
debug output to a client defined port only if the service is Enabled.
It also forwards the debug output to the previous message handler.
Effectively, this service just eavesdrop on debug output, forwarding
it to a port only if a client is connected.
Change-Id: Ie0ee7bab57ef8f03a2de34d91921f054a7ec147f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Simon Hausmann [Thu, 5 Jan 2012 09:45:37 +0000 (10:45 +0100)]
Pin qtdeclarative to a version of qtbase that still contains QtV8
This is a temporary measure until the new qtjsbackend module is fully in
place.
Change-Id: I5cfe277ee6a14680f378dd4d4c0f94dfa56fbac3
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Bea Lam [Wed, 4 Jan 2012 23:59:30 +0000 (09:59 +1000)]
Fix positioning issues and change content y repositioning behaviour
Refactor the code for re-positioning the visibleItems.first() in
QSGItemView::applyModelChanges() and fix various positioning issues.
The positioning behaviour for removing items at the start of the view
has changed. This action will no longer cause the content y to move
down; previously the content y would always move down unless another
item was moving backwards to the first visible position. This will make
it easier to implement built-in removal transitions for the views, since
removed items cannot be animated if the content y jumps down past them.
Additionally, moving items from before a GridView should not cause the
top item in the view to move upwards and out of the view.
This also adds additional remove tests and fixes the
tst_QQuickGridView::moved() test which wasn't waiting for the polish
event after setting the content y, which caused some of the tests to
pass even though their test data was wrong.
Change-Id: Idad11a73a18f88208e73a52111ed839458e05f2d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Mon, 9 Jan 2012 00:26:35 +0000 (10:26 +1000)]
Fix QQuickItemParticle timing issues
It was possible for m_loadables to be reset before the items were
loaded, and the datum pointer was lost. This was exacerbated by another
bug where reset was called every frame for no reason. Both bugs are now
fixed.
Task-number: QTBUG-23491
Change-Id: I9b60858621b697fc46de1e964cb27ddc0d2dbc65
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Mon, 9 Jan 2012 03:07:04 +0000 (13:07 +1000)]
Remove QSKIPs from border image autotest.
The fix for QTBUG-23484 also fixed this issue.
Task-number: QTBUG-23479
Change-Id: If55e623432b9ad620cad91e5083b1f94382acec6
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Mon, 9 Jan 2012 02:04:04 +0000 (12:04 +1000)]
Remove QSKIPs from font loader autotest.
The fix for QTBUG-23484 also fixed this issue.
Task-number: QTBUG-23477
Change-Id: Ie25339e17a079d7e67a92ad8db76f0305399277e
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Bea Lam [Mon, 9 Jan 2012 02:55:52 +0000 (12:55 +1000)]
Fix failing tst_QQuickPathView::undefinedPath()
Test was failing on Mac because QPainterPath only prints the relevant
warnings if QT_NO_DEBUG is not defined, which is not the case for
standard builds on Mac.
Task-number: QTBUG-23482
Change-Id: Ied4d263a1ce7503b573ecc3c53787dac2b57cc74
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Aaron Kennedy [Fri, 6 Jan 2012 12:30:04 +0000 (12:30 +0000)]
Un-QSKIP an autotest
QTBUG-23484 has now been fixed.
Task-number: QTBUG-23484
Change-Id: I30252c9203c5c1348377a84518da816b1c15ff6d
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Friedemann Kleint [Fri, 6 Jan 2012 14:00:52 +0000 (15:00 +0100)]
Fix importing of files on Windows.
Do not create local file Urls by adding 'file://' + path, use
QUrl's logic to correctly add missing slashes for Windows drive
letters.
Change-Id: I1a8a58a0d88ef291bb814303747ce53093be17a2
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Frederik Gladhorn [Fri, 6 Jan 2012 17:01:41 +0000 (18:01 +0100)]
Make accessibility interface functions const.
Follow the change in qtbase.
Change-Id: I43427369235585e9fb628d1a8f62891d44107cc9
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Friedemann Kleint [Thu, 5 Jan 2012 15:59:16 +0000 (16:59 +0100)]
QDeclarativeEngine: Polish code for file name case check.
- Use Q_OS_WIN instead of Q_OS_WIN32
- const-correctness
- Use QString::fromWCharArray()
Change-Id: I67aa4bb69240cf187832ea456dd74d2909e7ae62
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Jan-Arve Saether [Fri, 6 Jan 2012 13:56:40 +0000 (14:56 +0100)]
Reuse the OObject* in QAccessibleObject
Saves a few bytes per interface....
Change-Id: I2d66a563d28b94e08179bc43d4465509e0cb88f2
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Aaron Kennedy [Fri, 6 Jan 2012 12:16:24 +0000 (12:16 +0000)]
Improve QML error messages
Point at the actual property and method name when raising errors about
them.
Change-Id: Id36df4850b91ae0d225fcda4d101f4b2a073a72e
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Frederik Gladhorn [Wed, 4 Jan 2012 12:02:10 +0000 (13:02 +0100)]
Create a value interface for qml accessibles.
Change-Id: I472052c6d61a3a32033544ebb5afc5b11fb093e2
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Frederik Gladhorn [Wed, 4 Jan 2012 12:01:23 +0000 (13:01 +0100)]
Hide more children of accessible objects.
Change-Id: Ie8874b3b5a354f7f0586efb601b217e4d296af5c
Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
Martin Jones [Fri, 6 Jan 2012 06:14:53 +0000 (16:14 +1000)]
Flickable now emits contentX/YChanged after the content is updated
Currently view content is not created until after onContentYChanged
handlers are called, which is not what the user would expect
This change moves the contentX/YChanged emission to
after the content update and also removes the need for a
connect() in Flickable init.
Task-number: QTBUG-23462
Change-Id: I11e87a78160033e3ec6a9e7de733474f8345050d
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Martin Jones [Thu, 5 Jan 2012 23:58:27 +0000 (09:58 +1000)]
Add itemAt(x,y) function to GridView and ListView.
Task-number: QTBUG-21592
Change-Id: I3169e789da701ce261250421239584abd7f29b57
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Michael Brasser [Thu, 5 Jan 2012 23:37:03 +0000 (09:37 +1000)]
Smooth join point for closed Paths starting and ending with PathCurve.
Change-Id: I6d416e7d794271c10c9eb19de9678b0fe45b083d
Reviewed-by: Bea Lam <bea.lam@nokia.com>