Roberto Raggi [Thu, 15 Sep 2011 14:56:49 +0000 (16:56 +0200)]
Add the method tokenKind() to the QML/JS lexer.
The method returns the last token recognized by the lexer.
Change-Id: I9464e96c1276852737ddc8330d08d57326b48888
Reviewed-on: http://codereview.qt-project.org/5015
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Thu, 15 Sep 2011 14:54:33 +0000 (16:54 +0200)]
Add support for QML/JS pragma directives.
The lexer can now recognize the following pragma directives:
.pragma library
.import <URI> <Version> as <Identifier>
.import <file.js> as <Identifier>
Change-Id: I2c44140818f356419640266a46b5e172474819ee
Reviewed-on: http://codereview.qt-project.org/4897
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Mon, 12 Sep 2011 12:09:31 +0000 (14:09 +0200)]
Add auto tests for the QML minifier.
Change-Id: Iba821eb490ea791e9c375565985af62cef91d1f3
Reviewed-on: http://codereview.qt-project.org/4671
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Wed, 14 Sep 2011 12:50:24 +0000 (14:50 +0200)]
Fix automatic semicolon insertion.
The parser should insert a T_SEMICOLON token when it reaches an
error state and the lookahead token is following a closing brace.
Change-Id: Ib849e7fbfe50c2a3e679ae0794f5780cc0b94de5
Reviewed-on: http://codereview.qt-project.org/4896
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Wed, 14 Sep 2011 12:59:09 +0000 (14:59 +0200)]
Fix compile when the parser is included in non GUI applications.
Change-Id: I63d910f0f63cd88d919b5487d5b48f6019eca9bd
Reviewed-on: http://codereview.qt-project.org/4895
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Tue, 13 Sep 2011 13:49:11 +0000 (15:49 +0200)]
Added --verify-only option to qmlmin.
qmlmin has three different stages. In the first stage
it generates the QML/JS minified code. In the second
stage we verify that minified code is equivalent
to the original code and in the final stage we
produce the output. With --verify-only you can tell
qmlmin to quit after the verification step.
Note that this option is pretty much equivalent to
the unix command qmlmin file.qml -o /dev/null.
Change-Id: I91373bc1c1db8c35af2e301ad13d7b34fc384529
Reviewed-on: http://codereview.qt-project.org/4670
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Thu, 8 Sep 2011 11:40:28 +0000 (13:40 +0200)]
Introduced qmlmin.
qmlmin is a simple minifier for QML and Javascript files. It removes
comments and layout characters.
Change-Id: I387a683cd9b73e8fd225e10a75b3fcec50949938
Reviewed-on: http://codereview.qt-project.org/4442
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Thu, 8 Sep 2011 10:23:16 +0000 (12:23 +0200)]
Fix the implementation of Lexer::tokenText().
Lexer::tokenText() should return the contents of the
string literal without the quotes.
Change-Id: I968ca2e5142d8c55c75990c24380d2faa9b313a3
Reviewed-on: http://codereview.qt-project.org/4440
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Roberto Raggi [Fri, 9 Sep 2011 08:58:52 +0000 (10:58 +0200)]
Introduced a QML scanning mode.
In QML mode, the lexer will recognize the extra QML keywords, e.g.
readonly, as, on, and so on.
Change-Id: I148ff857e201f99d41e0265bcfc480a94a1085a0
Reviewed-on: http://codereview.qt-project.org/4518
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Rohan McGovern [Wed, 14 Sep 2011 01:33:25 +0000 (11:33 +1000)]
Re-enable QtQuickTest.
This was disabled in refactor, but it seems to be working OK, so turn it
back on.
Change-Id: I35d97342c6ef7be358d9cb593a1eab27c711247c
Reviewed-on: http://codereview.qt-project.org/4846
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Kent Hansen [Thu, 15 Sep 2011 12:11:55 +0000 (14:11 +0200)]
Get rid of QDeclarativeUtils
All the QChar methods needed by QtDeclarative have now
been optimized to achieve at least as good performance
as the QDeclarativeUtils versions.
Change-Id: I5b8dd58f9b597f716b53563d07d39d894c5dd666
Reviewed-on: http://codereview.qt-project.org/5059
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Chris Adams [Thu, 8 Sep 2011 05:13:42 +0000 (15:13 +1000)]
Fix QDeclarativeListProperty assignment
This commit ensures that a QDeclarativeListReference can be
assigned to another QDeclarativeListProperty, by retrieving
each element in the list reference and converting to the appropriate
type before appending to the target list property.
Task-number: QTBUG-16316
Change-Id: Id8858058f052a53bf43eadc085fd278654478d77
Reviewed-on: http://codereview.qt-project.org/4388
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Michael Brasser [Mon, 19 Sep 2011 03:50:03 +0000 (13:50 +1000)]
Make cellWidth/cellHeight reals rather than ints.
When they were ints, it was relatively easy to end up with a different
row or column count than expected, because of rounding.
Change-Id: Ifc5eba2b5598cbc0220df25f91f031581c3b51a5
Reviewed-on: http://codereview.qt-project.org/5112
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Damian Jansen [Thu, 8 Sep 2011 02:11:11 +0000 (12:11 +1000)]
QtQuick 2.0 elements system test
Added an application to browse elements. A very basic acceptance
test method that each can be performed in under a minute.
Added the .qtt for formal usage.
Also moved qsgimage system test.
Change-Id: Iada9804e2efe1339a072935647962e54aa3b4c6f
Reviewed-on: http://codereview.qt-project.org/4380
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Wed, 7 Sep 2011 02:39:58 +0000 (12:39 +1000)]
PathAnimation updates.
Allow smooth orientation changes, smooth interruptions,
and implicit "from" in PathAnimation.
Change-Id: I2191f6df89ec25d78b1d498827281803a07129c9
Reviewed-on: http://codereview.qt-project.org/4378
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Michael Brasser [Fri, 16 Sep 2011 02:51:26 +0000 (12:51 +1000)]
Test fixes and reenables.
Change-Id: I85e3493855b6fefb682ddb120b15abd003fb00fd
Reviewed-on: http://codereview.qt-project.org/5045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Aurindam Jana [Tue, 13 Sep 2011 10:05:21 +0000 (12:05 +0200)]
JSDebugging: Enable break on events.
The user can request Javascript break on event. The user can provide
this info in the Breakpoints Window and provide the slot which will
be called when the event occurs. For example: specify "onTriggered" if
you need to break on Timer triggerred event.
Change-Id: I09f869a5301a9c1f92a8b8c0f3df7f74b1027b4b
Reviewed-on: http://codereview.qt-project.org/4751
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Jędrzej Nowacki [Fri, 16 Sep 2011 14:34:27 +0000 (16:34 +0200)]
Re-enable commented tests.
The tests used QWidget class so widgets library have to be added to pro
file. QDeclarativestates works fine.
Change-Id: I55c0798a37c3a894b774ba71671569fe007a49d7
Reviewed-on: http://codereview.qt-project.org/5104
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Jędrzej Nowacki [Fri, 16 Sep 2011 12:49:57 +0000 (14:49 +0200)]
Re-enable commented QJS tests.
The tests used QWidget class so widgets library have to be added to pro
file. QJSValue test already had it.
Change-Id: Ib93b2e9b84dea76f5121378c13cc0e1921a4ebd9
Reviewed-on: http://codereview.qt-project.org/5101
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Aaron Kennedy [Fri, 16 Sep 2011 06:02:03 +0000 (16:02 +1000)]
Remove QmlChanges.txt file
Somehow I don't think changes prior to Qt 4.7.0 RC are that interesting
anymore.
Change-Id: I42d8bbb5de8ab04796b9f6f313fbb93d0a9c7794
Reviewed-on: http://codereview.qt-project.org/5055
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Kent Hansen [Fri, 16 Sep 2011 10:07:14 +0000 (12:07 +0200)]
Get rid of autotests dependencies on QtWidgets
Change-Id: I19936b7f8173eff9fc0bc3e19b0a61830dc5a440
Reviewed-on: http://codereview.qt-project.org/5097
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Lars Knoll [Fri, 16 Sep 2011 11:47:45 +0000 (13:47 +0200)]
Fix an assertion in QDeclarativeNotifierEndpoint
The code in toNotifier() tried to convert to a
Notifier, and called asNotifier() before setting
the type correctly.
Change-Id: I2d4c41c6bf43422587111ae4e0c57a3905f159e0
Reviewed-on: http://codereview.qt-project.org/5089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Lars Knoll [Fri, 16 Sep 2011 11:47:08 +0000 (13:47 +0200)]
Initialize variable
Change-Id: I2aa261ed85136df33f678a9279f7f9c833c925cd
Reviewed-on: http://codereview.qt-project.org/5088
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Kent Hansen [Fri, 16 Sep 2011 10:55:36 +0000 (12:55 +0200)]
Disable autotests temporarily on Mac
Change-Id: Ib34fdbdce2b088e0f79034342ab1fc9c94ea10f9
Reviewed-on: http://codereview.qt-project.org/5080
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Alan Alpert [Wed, 14 Sep 2011 08:15:17 +0000 (18:15 +1000)]
Add Age example
Also added advancePosition property to Age, as it was needed for even this
simple example.
Change-Id: I614a719280efc1bc5140d07ab91ec0f1bc345788
Reviewed-on: http://codereview.qt-project.org/4871
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Thu, 15 Sep 2011 08:52:27 +0000 (18:52 +1000)]
Fix aliasing bug when compiled with gcc 4.6
Change-Id: I50dbeaed501ae498cd5c46e6e5929789b373b932
Task-number: QTBUG-21265
Reviewed-on: http://codereview.qt-project.org/4957
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Thu, 15 Sep 2011 08:46:26 +0000 (18:46 +1000)]
Reference V4 program data
Change-Id: I84d520da16def8e48ac8bbfaab654450f776abc8
Task-number: QTBUG-21265
Reviewed-on: http://codereview.qt-project.org/4956
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Fri, 16 Sep 2011 03:26:50 +0000 (13:26 +1000)]
Fill out examples a little more
Adds an example of colorized ImageParticle, and an example comparing
the particle system to dynamically created Images (which don't do too
badly when they're kept really simple).
Change-Id: Id9e8d0575a38ddde1c73d694bd5c062d56cbed42
Reviewed-on: http://codereview.qt-project.org/5047
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 13 Sep 2011 10:25:11 +0000 (20:25 +1000)]
Particles examples shuffle
Recast as examples, not demos. Fewer licking face usages.
Change-Id: I02a03fb9af513cbc3dc2a94aa0843220f162593b
Reviewed-on: http://codereview.qt-project.org/4754
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Fri, 16 Sep 2011 02:40:19 +0000 (12:40 +1000)]
Hotfix docs
While QtQuick 1 and 2 aren't clearly separated yet, some of the more
drastic differences (like the separate particle systems) need to be
explained a little in the interim. Or at least visible.
Change-Id: I60321bcb90a34730ed3e0862a049540ea36f8c5b
Reviewed-on: http://codereview.qt-project.org/5044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Fri, 16 Sep 2011 01:55:01 +0000 (11:55 +1000)]
rename threadRendering to renderInThread
Change-Id: I21d2492288adc84d3ef99633752e78a3ea232a4a
Reviewed-on: http://codereview.qt-project.org/5042
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Alan Alpert [Fri, 16 Sep 2011 01:50:15 +0000 (11:50 +1000)]
Fix qsgpositioners autotest
A waitForWindowShown now takes long enough of the animations to make
progress, which had been confusing the initial state checks.
Task-number: QTBUG-21414
Change-Id: I3e01f804d6bca7f627012da6cc69b0baabaabaaa
Reviewed-on: http://codereview.qt-project.org/5041
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Thu, 15 Sep 2011 12:17:28 +0000 (22:17 +1000)]
update canvas item documentations
Change-Id: I66cc6550a7d8eb054c70b6f17fee05976e0a32c6
Reviewed-on: http://codereview.qt-project.org/5040
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Charles Yin [Thu, 15 Sep 2011 10:15:53 +0000 (20:15 +1000)]
fix context2d composition bug, lighter should map to qt ligten composite mode
Change-Id: Iacc9cb4bd9196869b9947f919b7748ab5ad9610f
Reviewed-on: http://codereview.qt-project.org/5039
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Charles Yin [Tue, 13 Sep 2011 03:53:25 +0000 (13:53 +1000)]
fix broken canvas blur after merging refactor branch
Change-Id: If145f1d02566f839abeb50df167db2b237499290
Reviewed-on: http://codereview.qt-project.org/4857
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Michael Brasser [Fri, 16 Sep 2011 00:44:23 +0000 (10:44 +1000)]
Fix warnings.
Change-Id: I7f066550fa2e1799f1c44b787da84c882f549b03
Reviewed-on: http://codereview.qt-project.org/5036
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Toby Tomkins [Tue, 13 Sep 2011 07:05:42 +0000 (17:05 +1000)]
Add exception for qpa, xcb platform for failing test
Task-number: QTBUG-21416
Change-Id: I69986ea120d908d20a4ef73bf137ca0906dc4351
Reviewed-on: http://codereview.qt-project.org/4729
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Alan Alpert [Thu, 15 Sep 2011 04:04:36 +0000 (14:04 +1000)]
Update system offset every frame
May be expensive if large systems animate painters, but seems safer than
messing with the tranformation matrix.
Change-Id: Ie5b21e9f238b5305bef44c48027a3337c70b2aaa
Reviewed-on: http://codereview.qt-project.org/4933
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Wed, 14 Sep 2011 08:23:11 +0000 (18:23 +1000)]
Friction and Gravity examples
Change-Id: Ie816f1209711aae3b9cd1465f874919370c26028
Reviewed-on: http://codereview.qt-project.org/4875
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Wed, 14 Sep 2011 07:26:59 +0000 (17:26 +1000)]
Documentation Augmentation
Change-Id: I662526a9c0f9c8694ec39aa0d5ad9286d1c9f208
Reviewed-on: http://codereview.qt-project.org/4863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Wed, 14 Sep 2011 07:11:25 +0000 (17:11 +1000)]
Update Turbulence on noiseSource change
Change-Id: Ib730bcad0a345df8e4cd45aa5b8ab892d3de16f7
Reviewed-on: http://codereview.qt-project.org/4860
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Tue, 13 Sep 2011 03:44:23 +0000 (13:44 +1000)]
Remove invalid ASSERT
There is a possibility for it to have been updated already if newDatums
are requested before emittersChanged is reached. This became possible
when emitters stopped having strict particle emission limits.
Change-Id: I45d1564f56547418127446e3138ff21deec891c3
Reviewed-on: http://codereview.qt-project.org/4753
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jason McDonald [Thu, 15 Sep 2011 04:28:46 +0000 (14:28 +1000)]
Fix missing/outdated license headers.
Change-Id: Ib5f244a61cb65db829ee83ec9e4d5e4189319a9f
Reviewed-on: http://codereview.qt-project.org/4936
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Martin Jones [Tue, 13 Sep 2011 02:50:48 +0000 (12:50 +1000)]
Velocities reported by Flickable in onFlickStarted can be 0
Change
55cfbdb7c64068ae68f7baaceb8acfb96cb0c07e manually applied
from Qt 4.7
Ensure the smoothed velocity is set at the start of the flick. Ensure
that the smoothed velocity animation isn't restarted unless there is
new valid data.
Change-Id: Ia77249be9980aba268a1bfa0ea3f69c49fa09e5e
Reviewed-by: Bea Lam
Reviewed-on: http://codereview.qt-project.org/4712
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Gunnar Sletta [Thu, 15 Sep 2011 13:28:24 +0000 (15:28 +0200)]
When we create textureprovider, initialize it with the texture if we got it
Change-Id: Ia3ab1a75db947a67c610e664051f73bf84b079c1
Reviewed-on: http://codereview.qt-project.org/5008
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Eskil Abrahamsen Blomfeldt [Thu, 15 Sep 2011 09:49:12 +0000 (11:49 +0200)]
Support preedit text in QSGTextInput
We need to support merged additional formats with backgrounds
in the QSGTextInput as well, so that code has been separated
into its own function. We also need to account for the position
in the bounding rect, so that the decorations are painted at
the correct location when there text input is scrolled.
Task-number: QTBUG-21261
Change-Id: I0799a62bf26e6a7a2c1a6eef9bbdf889c1c8e870
Reviewed-on: http://codereview.qt-project.org/4964
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Gunnar Sletta [Thu, 15 Sep 2011 10:35:27 +0000 (12:35 +0200)]
Use QWindow's surface format for QSGCanvas' GL context
Change-Id: Ibca3b126405e2c7a0deaad55151c1bd2b284cf93
Reviewed-on: http://codereview.qt-project.org/4972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Eskil Abrahamsen Blomfeldt [Wed, 14 Sep 2011 10:13:28 +0000 (12:13 +0200)]
Fix pre-edit text in in QSGTextEdit
We need to include the preedit text when getting the glyphs
for the fragment, and we need to support background formats.
Note: This assumes that the pre-edit text will not span several fragments,
which seems like a reasonable assumption.
Task-number: QTBUG-21261
Change-Id: I7dd28f1221f931893ba1c51cc9e8b9771b2e46c3
Reviewed-on: http://codereview.qt-project.org/4906
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Jędrzej Nowacki [Wed, 7 Sep 2011 08:56:25 +0000 (10:56 +0200)]
Separate declarative builtin functions from QV8Engine class
Function like md5(), darker(), createQmlObject()... should not belong
to QV8Engine class
This is an attempt to balance size of source files.
Change-Id: If36405ad5359e11e992bb4f17764be6c18e94a6a
Reviewed-on: http://codereview.qt-project.org/4351
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Jędrzej Nowacki [Tue, 6 Sep 2011 14:39:05 +0000 (16:39 +0200)]
Remove some unused includes.
Change-Id: I5090b0d3c88f3c972b1f1d2a56a954138f8d02ca
Reviewed-on: http://codereview.qt-project.org/4283
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Jędrzej Nowacki [Tue, 13 Sep 2011 14:23:57 +0000 (16:23 +0200)]
Fix QJSValue autotest.
The test depends on widgets library.
Change-Id: I22cd3cbf9b3a2e3ed8d5c28cd8d5e44b6e33c4f1
Reviewed-on: http://codereview.qt-project.org/4792
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Jędrzej Nowacki [Thu, 8 Sep 2011 07:45:55 +0000 (09:45 +0200)]
Split qjsconverter_p header.
Change-Id: I7495cfe5932cdd226e6e8c550fff421e3705184a
Reviewed-on: http://codereview.qt-project.org/4411
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Jędrzej Nowacki [Mon, 5 Sep 2011 15:14:21 +0000 (17:14 +0200)]
Remove dead code.
Last time when I checked using ExternalStringResources was slower then
normal strings. Probably in future we may reevaluate this idea.
Change-Id: I9e8d971be146a29256d4e01e4fae6e50cfe42c80
Reviewed-on: http://codereview.qt-project.org/4245
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Jędrzej Nowacki [Mon, 5 Sep 2011 13:36:19 +0000 (15:36 +0200)]
Fix potential memory corruption.
The code exploited information that most of types in union use d
pointers and that size of d pointer is less or equals then
sizeof(QVariant) or sizeof(double). Still the code may suffer
from an alignment issue on some exotic platforms.
Change-Id: I4ef331f4cdb7177337ddcc8696f78d85e9594d27
Reviewed-on: http://codereview.qt-project.org/4244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Jędrzej Nowacki [Mon, 5 Sep 2011 12:14:11 +0000 (14:14 +0200)]
Cleanup includes in QDeclarativeData.
QJSValue is not used in QDeclarativeData class, but QHash is.
Change-Id: Iae5cd7ed39ade04cb16afb4521978d527e97d878
Reviewed-on: http://codereview.qt-project.org/4242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Samuel Rødal [Wed, 14 Sep 2011 13:51:20 +0000 (15:51 +0200)]
We need to set the OpenGLSurface surface type on QSGCanvas.
Change-Id: Ib0ea343399b703c3437603918d97fc925e2adc4c
Reviewed-on: http://codereview.qt-project.org/4908
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
Joona Petrell [Mon, 12 Sep 2011 19:08:35 +0000 (22:08 +0300)]
Remove unnecessary updateInputContext function from QSGCanvasPrivate
Change-Id: Ibc64ef8a90854edf2c4b341ba01afdac19a813e1
Reviewed-on: http://codereview.qt-project.org/4742
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Joona Petrell [Mon, 12 Sep 2011 18:48:40 +0000 (21:48 +0300)]
Pass Qt::ImQueryInput instead of Qt::CursorRectangle in QSgItem::updateMicroFocus function
QPlatformInputContext::update() function takes QInputMethodQueries flag as a parameter.
When cursor rectangle changes many input method query attributes like
cursor rectangle, cursor position, surrounding text, current selection and a
position change as well. New composite query ImQueryInput encapsulates this.
Change-Id: I83b17507f22fcbec0d8ed50588c67794d62f9495
Reviewed-on: http://codereview.qt-project.org/4741
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Martin Jones [Thu, 15 Sep 2011 03:34:19 +0000 (13:34 +1000)]
Update QtQuick 2 "What's New" docs.
Change-Id: I46714a94ea88436e90d7e3eafbc2953940c5fa94
Reviewed-on: http://codereview.qt-project.org/4932
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Rohan McGovern [Wed, 14 Sep 2011 01:39:54 +0000 (11:39 +1000)]
Fixed compile of qtdeclarative examples.
Change-Id: I3a982de8eaf31267a4d90e3cc3bedbf87400d34a
Reviewed-on: http://codereview.qt-project.org/4847
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Michael Brasser [Thu, 15 Sep 2011 00:09:10 +0000 (10:09 +1000)]
Fix anchorRewindBug test failure.
Task-number: QTBUG-21396
Change-Id: Ie4397242a953a3b1504873b7fbc63719d0e99081
Reviewed-on: http://codereview.qt-project.org/4927
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Michael Brasser [Thu, 15 Sep 2011 04:11:49 +0000 (14:11 +1000)]
Test fixes.
Change-Id: Icaf5f287ce5f8fe954c55ec7a60308659ccce547
Reviewed-on: http://codereview.qt-project.org/4935
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Rohan McGovern [Thu, 15 Sep 2011 04:35:08 +0000 (14:35 +1000)]
Fixed compile on mac (workaround for build system bug)
When using QT += somemodule, and using frameworks on mac, qmake refuses
to add `-framework somemodule' to the compiler flags unless the
framework can be found on disk. This can easily break when compiling
two frameworks out of the same source tree.
In this case, if QtQuick1 were qmake'd prior to QtDeclarative being
built (which is expected for a clean build), it would incorrectly put
-lQtDeclarative into the link line even if QtDeclarative should be
built as a framework. The problem would disappear if qmake was re-run.
Change-Id: I79cbfc454e0ab564ce6597b4f7e613c1ff39473f
Reviewed-on: http://codereview.qt-project.org/4938
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Rohan McGovern [Wed, 14 Sep 2011 01:32:02 +0000 (11:32 +1000)]
Disable compilation of tests/auto/qmltest
QtQuickTest has currently been disabled, so this test cannot be
compiled.
Change-Id: I93171125fafe58d925925aa6575290dab9122d4a
Reviewed-on: http://codereview.qt-project.org/4845
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Matthew Cattell [Tue, 13 Sep 2011 14:55:58 +0000 (16:55 +0200)]
commented out broken autotests
Change-Id: I8bc382afc90c0a1bda0aaab6ab5284560fdfa7d4
Matthew Cattell [Tue, 13 Sep 2011 13:46:57 +0000 (15:46 +0200)]
marked some tests as insignificant for now
Change-Id: I2c309d3a8da30ce2c2fa8529c76e1b3a26226d54
Matthew Cattell [Tue, 13 Sep 2011 09:09:31 +0000 (11:09 +0200)]
Fixed failing test in QSGFocusScope.
added some waits and removed unnecessary lines from autotest
Change-Id: I847bde6db5222b12d0f0b88a8c323fd09aad9d7c
Matthew Cattell [Tue, 13 Sep 2011 08:56:17 +0000 (10:56 +0200)]
fixed broken test
Change-Id: I75655620bcd12b9a59eedde0bad489c4d31bbb2e
Gunnar Sletta [Tue, 13 Sep 2011 10:23:27 +0000 (12:23 +0200)]
fix declarative to work after broken refactor
Change-Id: I5a30f8c45e21344060ea6e61d440d6fea822f9de
Gunnar Sletta [Tue, 13 Sep 2011 08:21:53 +0000 (10:21 +0200)]
Merge branch 'refactor'
Conflicts:
src/declarative/items/context2d/qsgcanvasitem.cpp
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/context2d/qsgcontext2d_p_p.h
src/declarative/particles/qsgcustomparticle.cpp
src/declarative/particles/qsgparticlesystem.cpp
Change-Id: I24e81d3652368c5031305ffa7f969f9f2c249c6c
Alan Alpert [Tue, 13 Sep 2011 02:03:13 +0000 (12:03 +1000)]
Reset on system change
Otherwise it tried to maintain its data, which is not useful when we
should just reset anyways.
Change-Id: Id7bbabed67d8549d4842c1e5e6bf87ba93508d62
Reviewed-on: http://codereview.qt-project.org/4705
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Toby Tomkins [Tue, 13 Sep 2011 01:57:58 +0000 (11:57 +1000)]
Fixed tst_qgstextinput
In commit
e71904e231e27e6f6f88b35c4a7e2d7cf8ba2640, this was commented
out, this does not relate to the removal of v8 from declarative.
(related http://codereview.qt-project.org/#change,3093)
Change-Id: Idcc23e27577df6f53ddf256c1ea74bf7ecc5c351
Reviewed-on: http://codereview.qt-project.org/4621
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Alan Alpert [Mon, 12 Sep 2011 23:39:11 +0000 (09:39 +1000)]
Refactor SpriteEngine out of StochasticEngine
Also add ParticleGroups which use only StochasticStates
Simplistic change for now, just to focus the API for the
particle system. ParticleGroup elements replace the particleStates
property on the system, and the term "group" is now used more
consistently.
Change-Id: I6456f9c521b8166ccd94ea953275557bcfbf6423
Reviewed-on: http://codereview.qt-project.org/4699
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Fri, 9 Sep 2011 07:21:14 +0000 (17:21 +1000)]
Implement Turbulence properly
Or at least closer to. Now uses curl noise off of a source noise image,
documented as usable, and not an immense performance drain (just a
normal one).
Change-Id: Iac11c98cd9589cbe6a41b2b30893ab40d541d18f
Reviewed-on: http://codereview.qt-project.org/4510
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Wed, 7 Sep 2011 02:19:01 +0000 (12:19 +1000)]
Document Particle type
Change-Id: I22db94cd55f02461cbe8e56b4fb6d3c1db0180a1
Reviewed-on: http://codereview.qt-project.org/4297
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 9 Sep 2011 02:09:42 +0000 (12:09 +1000)]
Reduce compile warnings
Also change QSGDirection::sample to pass by value.
Change-Id: I878649158b78da22afdf77b5f3ce3263ce1070cd
Reviewed-on: http://codereview.qt-project.org/4497
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 9 Sep 2011 04:44:04 +0000 (14:44 +1000)]
Order of operations fix
Recycling needs to be done always, and currently here is the only time
it's supposed to happen each tick.
Change-Id: Ia03b2a6d1d884bdee784b47c447745c7e3aee2c6
Reviewed-on: http://codereview.qt-project.org/4508
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 9 Sep 2011 04:45:20 +0000 (14:45 +1000)]
Make activeGroups usable.
It actually relied on functionality inside the affectSystem method,
when it was intended to be used in subclass reimplmentations. That
functionality is now in the function itself.
Change-Id: Ie01f5a5d18a15ca207422869d221d75d63b17789
Reviewed-on: http://codereview.qt-project.org/4509
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Matthew Cattell [Mon, 12 Sep 2011 15:29:06 +0000 (17:29 +0200)]
fixed failing autotest
Change-Id: I3a21821ce870af75741afcb3219a552e2fc5a155
Reviewed-on: http://codereview.qt-project.org/4688
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Charles Yin [Tue, 9 Aug 2011 06:44:38 +0000 (16:44 +1000)]
canvas item refactors
1.Supports tiled canvas with canvasSize, tileSize and canvasWindow
2.Supports different rendering targets: Canvas.Image and
Canvas.FrameBufferObject by renderTarget property
3.Supports thread rendering when possible by threadRendering property.
4.Refactors QSGContext2D code, move some logic to
QSGContext2DCommandBuffer,QSGContext2DTexture,QSGContext2DTile, etc
5.Updates/adds some canvas examples
6.Some improvements for context2d API
6.1 drawImage() now loads image asynchoronously and draw images
automatically when they are ready
6.2 adds fillRule supports
6.3 add svg path supports
6.4 Pixel operations (getImageData/putImageData/createImageData)
now have better performance by using V8 indexed array accessors
6.5 Uses QTransform instead of QMatrix
6.6 Gradients/patterns now are V8 values, not QObjects
6.7 Supports measureText and TextMetrics interface
6.8 Gives not support warnings for unimplemented functions
(drawFocusRing,setCaretSelectionRect,caretBlinkRate)
6.9 Better error handling, throw standard DOM exceptions according
to the HTML5 context2d spec.
6.10 Adds shear, resetTransform to matrix operations
6.11 Adds roundedRect, ellipse, text to path operations
6.12 Adds new features to CanvasImageData interface
1) adds mirror() function
2) adds filter() function, include the following filters:
Threshold
GrayScale
Brightness
Invert
Blur
Blend
Opaque
Convolute
7. Adds documentations
Change-Id: Id19224260d6a3fdc589d1f9681c34a88a7e7b3e5
Reviewed-on: http://codereview.qt-project.org/3621
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Joona Petrell [Mon, 12 Sep 2011 14:20:53 +0000 (17:20 +0300)]
Fix QtDeclarative refactor branch clean compilation
Change-Id: I6a5d6cc4de7a7b50cbf49a535cd764cb07ce3c40
Reviewed-on: http://codereview.qt-project.org/4684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com>
Matthew Cattell [Mon, 12 Sep 2011 13:43:09 +0000 (15:43 +0200)]
changed include to use newly public qsgvertexcolormaterial header
Change-Id: I701b573b6c93d6e69ea6f8fc16b5913162bf9ace
Reviewed-on: http://codereview.qt-project.org/4680
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Gunnar Sletta [Sun, 11 Sep 2011 07:26:05 +0000 (09:26 +0200)]
Implement QSGVertexColorMaterial::compare and make the class public
Since the opaque state is just as easily settable through the
Blending flag, we ditch it
Change-Id: I92598e3305bd056fdf0711f1fbd6c1be8bf88275
Reviewed-on: http://codereview.qt-project.org/4628
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Gunnar Sletta [Sun, 11 Sep 2011 06:54:05 +0000 (08:54 +0200)]
orient the fbo rendering the same way as other fbo rendering and enable multisampling
Change-Id: Ibfb3bd9577efc50ca7654019638d22b9077df6bb
Reviewed-on: http://codereview.qt-project.org/4627
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Takumi ASAKI [Fri, 9 Sep 2011 13:23:20 +0000 (15:23 +0200)]
Clang build fix: Add "this->" to avoid undeclared identifier
Change-Id: I0957e61b34c4b43fd50b6051db599adf7ebb4306
Reviewed-on: http://codereview.qt-project.org/4549
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Gunnar Sletta [Mon, 12 Sep 2011 06:12:58 +0000 (08:12 +0200)]
Merge branch 'master' into refactor
Conflicts:
examples/declarative/cppextensions/qwidgets/qwidgets.pro
examples/declarative/minehunt/main.cpp
examples/declarative/minehunt/minehunt.pro
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/qsgflickable.cpp
src/declarative/items/qsgtextedit.cpp
src/declarative/items/qsgtextinput.cpp
src/declarative/particles/qsgangleddirection.cpp
src/declarative/particles/qsgcumulativedirection.cpp
src/declarative/particles/qsgcumulativedirection_p.h
src/declarative/particles/qsgfollowemitter.cpp
src/declarative/particles/qsgmodelparticle.cpp
src/declarative/particles/qsgparticlesystem.cpp
src/qtquick1/util/qdeclarativeview.h
tests/auto/declarative/examples/examples.pro
tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp
Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
Martin Jones [Mon, 12 Sep 2011 02:40:20 +0000 (12:40 +1000)]
Port change
67ed1849 from Qt 4.7
Flickable could flick in wrong direction if given too few touch samples
If we got <= QML_FLICK_DISCARDSAMPLES the previous velocity was not
cleared, so the view would continue flicking with the previous
velocity, and therefore the previous direction.
Task-number: QT-4903
Change-Id: Ie4c2a3829026c0bf7d94cf5b60c0b7ff9833f725
Reviewed-on: http://codereview.qt-project.org/4618
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Fri, 9 Sep 2011 06:48:03 +0000 (16:48 +1000)]
Experimental 'pixelAligned' property for Flickable.
Change-Id: I671af87c4d2db3403ab506ae32608c91d6982338
Reviewed-on: http://codereview.qt-project.org/4506
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Toby Tomkins [Fri, 9 Sep 2011 04:12:53 +0000 (14:12 +1000)]
Restructure test to use QTRY_ macro for instability.
Restructure test to use QTRY_ for asynchronous gui functions. Remove
reference to specific X11 and generalise event queue processing for
all platforms.
Change-Id: I38d8b7419d644ea1d8558f88b48f8b4004804c32
Reviewed-on: http://codereview.qt-project.org/4495
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Michael Brasser [Fri, 9 Sep 2011 04:03:31 +0000 (14:03 +1000)]
Make state a public property of QSGItem.
The property type is QString, so doesn't need to be private.
Change-Id: If1d1a740be451331e8142fbe1d89fda2eeff4509
Reviewed-on: http://codereview.qt-project.org/4499
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Matthew Cattell [Thu, 8 Sep 2011 14:46:54 +0000 (16:46 +0200)]
fixed autotest
removed debug statements
Change-Id: Id09e3a6a43b5d5170d8b50b10cc35eb8c4e1f3d0
Reviewed-on: http://codereview.qt-project.org/4472
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Paul Olav Tvete [Fri, 9 Sep 2011 13:03:01 +0000 (15:03 +0200)]
Make QSGItem::update() work when called from inside QSGCanvasPlainRenderLoop::paint()
If update was called in a function triggered by rendering, it would set
the dirty flag without posting an update event. Subsequent render calls
would just return without doing anything because the dirty flag was set.
This could cause the applications UI to freeze up.
Change-Id: Ib50403c1d9e22cc4680379f0c90fb2fcaa29c1d6
Reviewed-on: http://codereview.qt-project.org/4550
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Matthew Cattell [Fri, 9 Sep 2011 12:53:01 +0000 (14:53 +0200)]
partial build fix of qtquick1 autotests
Change-Id: Ic2106ec80e1e5402f4f9bf71cc4cf23ec4657046
Reviewed-on: http://codereview.qt-project.org/4546
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Matthew Cattell [Fri, 9 Sep 2011 12:50:48 +0000 (14:50 +0200)]
fixup tests to build with refactor
Change-Id: Iab4adc9e19fab67402918bb737fff2fce6c292bd
Reviewed-on: http://codereview.qt-project.org/4545
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Matthew Cattell [Fri, 9 Sep 2011 12:43:33 +0000 (14:43 +0200)]
make quicktest build and modify to use qwindow
Change-Id: Idebb00b828307421bcbd89d8abaa9ea1d903af47
Reviewed-on: http://codereview.qt-project.org/4542
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Jason McDonald [Wed, 7 Sep 2011 06:57:21 +0000 (16:57 +1000)]
Fix missing and outdated license headers.
Change-Id: I940ced2e84a86daabc5158d348b05b7532cb1c22
Reviewed-on: http://codereview.qt-project.org/4314
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Gunnar Sletta [Thu, 8 Sep 2011 14:00:07 +0000 (16:00 +0200)]
Only polish once pr frame
Change-Id: I7295d0936dd220c092ed6c78b19fdf8ee3a3ce23
Reviewed-on: http://codereview.qt-project.org/4465
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
Michael Brasser [Fri, 9 Sep 2011 02:06:36 +0000 (12:06 +1000)]
Update images in falling leaves particle demo.
Original images were causing warnings with libpng.
Change-Id: I697f20ee3968b0e27f12dc55eb20ea46f809a46e
Reviewed-on: http://codereview.qt-project.org/4496
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Alan Alpert [Fri, 9 Sep 2011 01:49:32 +0000 (11:49 +1000)]
Missed an example in previous name changes
One non-essential varaible still had the old name, leading to a
non-fatal warning. It is now rectified.
Change-Id: I4ebcf92b3521aeff92e4da89f41b8c81c2f6ab96
Reviewed-on: http://codereview.qt-project.org/4494
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Michael Brasser [Fri, 9 Sep 2011 00:42:05 +0000 (10:42 +1000)]
Compile fix.
Change-Id: Iac8fd75a805a7f62638275fe05123a13198d5260
Reviewed-on: http://codereview.qt-project.org/4489
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>