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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Kent Hansen [Fri, 20 Jan 2012 07:00:50 +0000 (08:00 +0100)]
tst_qdeclarativedebugjs: Use new QJSValue::call() overload
The old QJSValue::call() function that takes a this-object as the
first argument is going away. The new overload simply takes a list
of arguments, so that the "dummy" this-object doesn't have to be
explicitly passed.
The new function callWithInstance() can be used to call a function
where you want to use a specific this-object.
Change-Id: I2d9bd79f8e5d00a2b89568171ccc5ffcee52686c
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kent Hansen [Fri, 20 Jan 2012 06:54:06 +0000 (07:54 +0100)]
tst_qdeclarativedebugjs: Don't use QJSValue::isValid()
The QJSValue::isValid() function is being removed.
!value.isUndefined() can be used to check if a value is defined.
Change-Id: I91e96bb7f76a5c31edaa409aaf4a1b1fffbc5317
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Charles Yin [Wed, 25 Jan 2012 03:48:46 +0000 (13:48 +1000)]
Add dummy test column for data driven test in qmltest
Normally, data driven test with QTest requires add columns before
adding new data rows, otherwise QTest might results into warning
or error. However, qmltest does the data driven test in its own way
so no columns info needed. So add a dummy column here to make QTest happy.
Task-number:QTBUG-23845
Change-Id: I1bfed663fa7b58d71e0cf898db6bd8ae61dae46b
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Charles Yin [Tue, 24 Jan 2012 06:07:24 +0000 (16:07 +1000)]
Move sqldatabase into a module API plugin
Change-Id: Icd0bbfe16804abf1bbadbabddf3a30b5b18df30c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Matthew Vogt [Wed, 18 Jan 2012 07:12:25 +0000 (17:12 +1000)]
Allow JS API in modules
Allow modules to export verisoned javascript code into specified
namespaces.
Task-number: QTBUG-20857
Change-Id: Ic968c697ba36cbc4535870ed5eed2fe7f01af11d
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Martin Jones [Mon, 23 Jan 2012 03:58:22 +0000 (13:58 +1000)]
Fixed crash in QDeclarativeGridView
Inserting new items used a different threshold than removing items
outside the view in refill.
Change-Id: I3712837820a1e1a6af280d33d29bd9e01e559691
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Jiang Jiang [Mon, 23 Jan 2012 14:17:21 +0000 (15:17 +0100)]
Update for glyphMargin() migration in qtbase
glyphMargin() has been moved from QTextureGlyphCache to QFontEngine
in qtbase. Update private API usage for that.
Change-Id: Ia74c1387eaad4cb961ca0fe36905254edb351258
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Samuel Rødal [Tue, 24 Jan 2012 09:04:45 +0000 (10:04 +0100)]
Adapted QQuickScreenAttached to orientation API changes in QScreen.
Change-Id: Ic2cb008b989780e297f03ddd5bdef466bb230c74
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Stephen Kelly [Thu, 12 Jan 2012 17:33:43 +0000 (18:33 +0100)]
Add missing include.
Fixes build after requirement for Q_DECLARE_METATYPE(T*) to
be fully defined.
In QtBase (
4b8ceb41aed352f10d36db5284453f425dbc5f3f)
Change-Id: I7ea42ec45797fafdde94ea5b58c6c71640710196
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Aurindam Jana [Tue, 17 Jan 2012 13:38:06 +0000 (14:38 +0100)]
Console API: Add console.exception
console.exception writes a message to the console
and prints the JavaScript stack trace at the point
where it is called.
Change-Id: Idd2ff5982826accae0895db44c7ecf6130338cc7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Aurindam Jana [Tue, 17 Jan 2012 11:37:07 +0000 (12:37 +0100)]
Console API: Add console.assert
console.assert tests if an expression is true. If it is false,
it writes a message to the console and prints the JavaScript
stack trace at that point.
Change-Id: I5487552cb8a947e1947914166834e0bdedba3354
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Eskil Abrahamsen Blomfeldt [Thu, 24 Nov 2011 12:48:19 +0000 (13:48 +0100)]
Add support for shared glyph cache
Use a shared graphics cache to back the distance fields if
it is available.
Change-Id: Id5e6e7a28e38e349d787e66016b2d0faebc791d7
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Charles Yin [Wed, 18 Jan 2012 01:22:31 +0000 (11:22 +1000)]
Don't hang the worker script engine
1. Wake up the syncDone wait condition when delete the QDeclarativeListModelWorkerAgent,
otherwise the the whole worker script engine thread will hang at the sync() call
and can't exit gracefully.
2. Call QCoreApplication::processEvents() before delete the worker script engine to
cleanup all pending events in main thread to release wait conditions which
some worker scripts/agents are waiting for (QDeclarativeListModelWorkerAgent::sync() for example)
Change-Id: Ia3712318771633e68238b4d629ba870ff7ce45b9
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
Xizhi Zhu (Steven) [Mon, 23 Jan 2012 21:02:57 +0000 (22:02 +0100)]
Remove Symbian specific code.
Change-Id: Ifbcc92f1d44d46760ac7c5be24a997384fa22266
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Kent Hansen [Fri, 20 Jan 2012 13:35:29 +0000 (14:35 +0100)]
Remove deprecated QtDeclarative (now QtQuick) headers
The QtQuick module has been around for a while now, and the need to
port to it was duly announced, coupled with a qmake warning (which
has now been removed).
Users who haven't ported their includes over will have to do so as
of this commit.
The fixqt4headers script in qtbase can be used to automatically
update the stale include statements in existing projects.
Change-Id: I9745723246f65ef726e51b8551d18b378085689d
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Damian Jansen [Tue, 24 Jan 2012 06:53:22 +0000 (16:53 +1000)]
TextInput documentation fix
A few instances where TextEdit is indicated
Change-Id: I6d6a6c1f92d673978856befb9c2581b657cdb0f7
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
Jason McDonald [Mon, 16 Jan 2012 05:36:00 +0000 (15:36 +1000)]
Call new pass/fail/skip count function in QTestLog.
The passCount, failCount and skipCount functions have moved from
QTestResult to QTestLog.
Change-Id: I0dbf8b43521f81dc29e20bb7547ff9f213487007
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Fri, 13 Jan 2012 03:13:35 +0000 (13:13 +1000)]
Avoid using QTestResult::ignoreMessage().
QTestResult::ignoreMessage() is just a wrapper around
QTestLog::ignoreMessage(). Both are private API, so just call the latter
directly so that the former can be removed from the API.
Change-Id: Icf77e2bf656afc556205ddf0dda5bb48fdbdfbbf
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Alan Alpert [Mon, 23 Jan 2012 01:48:20 +0000 (11:48 +1000)]
Doc fixes
Change-Id: Ic7cf1596b060ed1a006907d26cf6720dc8bc134d
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kai Koehne [Mon, 16 Jan 2012 14:40:27 +0000 (15:40 +0100)]
Console API: Add console.count
console.count can be handy to check how often code snippets
are executed.
Change-Id: I0eaf17ab893c76e7b8956122aa31e218745e92bf
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Andrew den Exter [Tue, 24 Jan 2012 02:31:59 +0000 (12:31 +1000)]
Stabalize SpriteImage test.
Use a QTRY_COMPARE to allow a little more time for the required frames
to be rendered as needed.
Change-Id: If60aeaa3af42476c19582c5efc3f96f7db1b148d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Pekka Vuorela [Fri, 20 Jan 2012 12:53:22 +0000 (14:53 +0200)]
Avoid compiler warnings
Change-Id: Iedc015e4be2fe80cef7a3e26c0a0747615891f7b
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
Andras Becsi [Mon, 23 Jan 2012 16:38:25 +0000 (17:38 +0100)]
QQuickCanvas::event should return true if the touch event was accepted
If QQuickCanvas::event delivers a touch event and it is accepted
the control ends up in QWindow::event which invalidates the event.
These touch events end up as if they were unhadled which causes Qt to
automatically synthesize mouse events even for accepted touch events.
Add a unit test for testing this behavior.
Change-Id: I83d4aeafee1ea7ec5d219e4b45aae699188717c3
Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Yann Bodson [Tue, 24 Jan 2012 03:14:56 +0000 (13:14 +1000)]
Doc fix for QML Global Object
Change-Id: I2b55a2aeaee1012123e671ad4d854f25539231e1
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Rohan McGovern [Tue, 24 Jan 2012 00:30:57 +0000 (10:30 +1000)]
Fixed compile.
QEventLoop::DeferredDeletion was deprecated long ago, and finally has
been removed. Replace it with
QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete)
Change-Id: Ic03f26a57efeb35aefab67a913f56001303aa3e4
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Tue, 17 Jan 2012 10:52:35 +0000 (20:52 +1000)]
Add some internal docs for the particle system and sprite engine
They're both large internal structures with extensive logic. Should have
at least a basic attempt at documentation (beyond inline comments).
Change-Id: I7d48ebf821fa759c11fa35889dbff8971644d23e
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 17 Jan 2012 10:02:30 +0000 (20:02 +1000)]
Per-frame Sprites patch three
interpolation bools work with the new sprite rendering approach. Giant
sprite images that get split into multiple rows now work with the new
sprite rendering approach (or even at all).
Change-Id: I7f3e09684622f523564802c7634361b6fe363676
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Mon, 16 Jan 2012 09:01:36 +0000 (19:01 +1000)]
Remove unecessary asserts
They would also trigger when the user gives invalid input, which is not
an assert worthy circumstance.
Change-Id: Ifa5697d411793a55b6895945e751a73841b1ba3f
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Mon, 16 Jan 2012 05:34:52 +0000 (15:34 +1000)]
Per-frame Sprites patch two
Implements CPU sprite advancement in SpriteImage, and covers the manual
sprite advancement codepath in an autotest.
Task-number: QTBUG-22236
Change-Id: I52a8ca3f923e88232238f9e158863b1ba7c0441b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Fri, 13 Jan 2012 03:54:29 +0000 (13:54 +1000)]
Per-frame Sprites patch one
To allow for sprites to be advanced by the rendering framerate, two
minor redesigns were needed.
A) Sprite texture location is now calculated on the CPU and passed to
the GPU per frame.
B) Stochastic State engine now supports states that do not advance on a
timer, and states can be advanced manually.
This patch implements B and A for ImageParticle. A for SpriteImage will
be done in a separate patch.
Task-number: QTBUG-22236
Change-Id: If1c54a6a03fa48b95bb1e672283292859656457b
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Matthew Vogt [Thu, 19 Jan 2012 06:39:53 +0000 (16:39 +1000)]
Encode user input before insertion into URLs
Encode user input strings used to formulate URLs, to ensure they do not
cause the structure of the URL to be subverted.
Task-number: QTBUG-19925
Change-Id: I6173f4df67a4bc1676ac32be6072763fc16f9720
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jason McDonald [Fri, 20 Jan 2012 04:04:27 +0000 (14:04 +1000)]
Update obsolete contact address.
Replace Nokia contact email address with Qt Project website.
Change-Id: I6a730abc0c396fb545a48b2d6938abedac2e3f1c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Fri, 20 Jan 2012 04:35:27 +0000 (14:35 +1000)]
Avoid anchor/positioning loops
Task-number: QTBUG-23740
Change-Id: I84922ac2dc6e499fc22b923298ca31eda382c622
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Mon, 16 Jan 2012 08:50:16 +0000 (18:50 +1000)]
Add a simple SpriteImage example
Also shows the full framerate mode.
Task-number: QTBUG-22236
Change-Id: I42790029c4b799f916dac1a183a5cef1724448c5
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Kent Hansen [Fri, 20 Jan 2012 07:35:06 +0000 (08:35 +0100)]
Don't use deprecated functions in QJS benchmarks
Remove benchmarks for functions that are going away.
Task-number: QTBUG-23604
Change-Id: Ia65c7981652011f89f2131ff14f63aae410013cf
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Mon, 16 Jan 2012 11:47:58 +0000 (12:47 +0100)]
Mark deprecated functions in QJSEngine and QJSValue
This functionality will be removed or renamed in the final Qt 5 API.
From this commit and with deprecated warnings enabled
(DEFINES += QT_DEPRECATED_WARNINGS), it's easy to see how existing
users of this API (e.g. qtjsondb) are affected.
Task-number: QTBUG-23604
Change-Id: I242c43377bb34ddcca84b6ed5b7ef9fbf2017a83
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Wed, 18 Jan 2012 13:15:59 +0000 (14:15 +0100)]
Add QJSValue::callAsConstructor() function
The old name, construct(), was bad. This name is more descriptive
and consistent with the other callXXX() functions.
Task-number: QTBUG-23604
Change-Id: Ie205b0c52721782101e665f7dfedcac9051a00d0
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
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>