| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
It should not add visibleIndex to the returned value.
(regression from 9b5f9c8056186c9cf3c40dbac66e5f90369339dc when ListView
and GridView implementations were merged). GridView used to do this and
so did ListView at one point but the ListView implementation was
changed.
Change-Id: I94c02034580506d4b431126f1b857977e401c27a
Reviewed-on: http://codereview.qt.nokia.com/3450
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch change the code to also skip invisible items (it was
done for disabled already) when deciding whether or not deliver the
wheel event to an item. The rationale here is to follow the same
rule as the other mouse events.
An autotest was added to verify and maintain this behavior.
Change-Id: If0fe6d64d1f7cfb8679ce11edda7c02dc3783f94
Reviewed-on: http://codereview.qt.nokia.com/3429
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I4e1deb5a5430af79430e3c1fc22f16461672586d
Reviewed-on: http://codereview.qt.nokia.com/3389
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
| |
Also clean up the shader code a little
Change-Id: I98062ae729c145901e1d218a698672672ca1bf26
Reviewed-on: http://codereview.qt.nokia.com/3298
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Implementation for tabled and above is different, coming in a later
commit.
Change-Id: I7ad16a173521bdcef4ddb68f594be7c942ddb505
Reviewed-on: http://codereview.qt.nokia.com/3280
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Only for the simpler particles, at least for now.
Change-Id: If777cf301894553849b78060aa23980aee7fb807
Reviewed-on: http://codereview.qt.nokia.com/3240
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
| |
Also simplifies the use of multiple shaders.
Change-Id: Ib4e16406865407626e4e736e7daeba4855dc0574
Reviewed-on: http://codereview.qt.nokia.com/3174
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
| |
Enable with the environment variable QML_PARTICLES_DEBUG.
Change-Id: I8aee2702e17f4ec6d18d8def9d57c5238d4c28ae
Reviewed-on: http://codereview.qt.nokia.com/3136
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I5ae2859d15502b29e3a744e155ceabe50d83bcff
Reviewed-on: http://codereview.qt.nokia.com/3290
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
|
|
| |
This shader also implements sizeTable in a GL ES 2 compliant way.
Change-Id: If31ee01a521c1fe13f59f7d6376185bafcefedfc
Reviewed-on: http://codereview.qt.nokia.com/3132
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
reload() did not disconnect the model from an aborted reply's
signals, and if it received a finished() signal from the aborted
reply it crashed when trying to access the deleted d->reply.
Task-number: QTBUG-20842
(cherry-picked from commit d3599ab224f00915045562562c7fd4d6b9b9aeb4
in 4.8)
Change-Id: I09a4b04ccdcf04d0ad19052475376e4d1910b7b9
Reviewed-on: http://codereview.qt.nokia.com/3282
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Use the general QSGTextNode class as back-end for all text
elements in QML to make all text elements look the same and
use the same text rasterization back-end. This requires a
few rewrites in the text node to support e.g. selections.
Crashes seen with threaded renderer in TextEdit and TextInput on
Mac are also fixed by this.
Reviewed-by: Jiang Jiang
Task-number: QTBUG-18019, QTBUG-20017
Change-Id: I4207faf180c83422e5f8b726741321af395bd724
Reviewed-on: http://codereview.qt.nokia.com/2865
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|
|
|
|
|
|
|
| |
The setting of breakpoints is delayed till the complete filepath of the script is determined.
Change-Id: I8875eea3cecf5093c5d43741e26222e03123af84
Reviewed-on: http://codereview.qt.nokia.com/3169
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I90951ab817230e0160831db3ce2e91ceceab1352
Reviewed-on: http://codereview.qt.nokia.com/3235
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I6e5fe3fa4459f99a50e3aa79c3a87106600f083a
Reviewed-on: http://codereview.qt.nokia.com/3231
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
|
|
|
|
|
|
|
|
|
| |
exception definitions
Change-Id: I05ab8d87de636944585f4113f07c7d07fe9a79aa
Reviewed-on: http://codereview.qt.nokia.com/3233
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Spacing was being incorrectly applied in circumstances where invisible
items existed at the end of a positioner.
Task-number: QTBUG-20961
Change-Id: I49ebc8e96a1564c0ff2bde1c1bb3f91d3c441488
Reviewed-on: http://codereview.qt.nokia.com/3232
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ib5090348cefa955caa54c5e4fff8cb961ddb8e52
Reviewed-on: http://codereview.qt.nokia.com/3147
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QVector4D is a value-type which is supported but was not able to be
constructed using a Qt object function. This commit allows properties
of vector4d type to be constructed, and adds a function to the global
Qt object and adds unit tests to ensure that it behaves correctly.
Task-number: QTBUG-18559
Change-Id: I96509a4f496b644d20fdb1d977d0afe430d89e13
Reviewed-on: http://codereview.qt.nokia.com/1626
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This commit allows direct access to the r, g, b and a components
of a color (in floating point format: 0 <= v <= 1). Since conversion
from color to string is a common operation, this commit also adds
unit tests to ensure that the previous behaviour is maintained in
other cases (comparison with toString value, etc).
Task-number: QTBUG-14731
Change-Id: I87b521dd4f9c1e96dfe5b20cf8053293cb14cfe4
Reviewed-on: http://codereview.qt.nokia.com/2527
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Added an attached property type to the base positioner class.
This allows items within a positioner (Row, Column, Grid, Flow) to
determine their index inside the positioner, as well as whether
they are the first or last items. Non-visible items are ignored,
as in the positioner layout objects themselves. It may be useful
to expand this in the future to contain more information specific
to the positioner, for example row/column for Grid.
Task-number: QTBUG-19211
Change-Id: I10a8c9ca5528dd12811125cae8a9b4d2e3747972
Reviewed-on: http://codereview.qt.nokia.com/2983
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I16706049f0ff5a371b5fa95430ca6c2d2f1add96
Reviewed-on: http://codereview.qt.nokia.com/3086
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Javascript v8 debugging service replaces the QScript debugging service.
Change-Id: I25eea00eed3959b84a8f412e4c3484296d62e27b
Reviewed-on: http://codereview.qt.nokia.com/2614
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ib80f30afc72b6ef6a9cabb604656755e0b4dfff1
Reviewed-on: http://codereview.qt.nokia.com/3089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-20193
Change-Id: I45020c094c4a4892c055700f084fde7b219cdc10
Reviewed-on: http://codereview.qt.nokia.com/2972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
| |
It's unused, remove it :)
Change-Id: I75f352dd3e35626603658f78e00cf6b472075df4
Reviewed-on: http://codereview.qt.nokia.com/3074
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 038619bf2c5e7d2c18a6f463cd994d8b3831e61f.
The commit caused autotest failures.
Change-Id: I46009afde9eb290dda43258e4982b684a87f06d6
Reviewed-on: http://codereview.qt.nokia.com/2992
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Previously, attempting to set the source property of a border image
via a .sci file to a quoted filename would fail. This commit adds
support for quoted source filenames.
Task-number: QTBUG-20709
Change-Id: Ida54ef42bc07081457fd945bb279f3cc82c26e10
Reviewed-on: http://codereview.qt.nokia.com/2724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Was missed by initial script.
Change-Id: Ib5e6482f53bda25b516075b52eb71f87b9279655
Reviewed-on: http://codereview.qt.nokia.com/3057
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-19901
Change-Id: I1f6bd31f4afec3d9b199086a01ffe5e714a20efa
Reviewed-on: http://codereview.qt.nokia.com/2915
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
This is related to commit 31ebb4bfb0df83805c5d86b6773f11ba1145c7cd.
Task-number: QTBUG-20547
Change-Id: I6a5b6c56d440c7fa7f5546472305f62227b64c29
Reviewed-on: http://codereview.qt.nokia.com/2952
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Make sure all public classes and functions are documented.
Fix/remove broken references.
Add code snippets.
Add a minimal "Making Applications Scriptable" page based
on the QtScript docs.
Change-Id: I76a32bff776b478f01ff08b3276a0a020a1fa81f
Reviewed-on: http://codereview.qt.nokia.com/2863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I8498b2e574a32bfbab9f139e718424572b1258a0
Reviewed-on: http://codereview.qt.nokia.com/2855
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
| |
Set the DynamicMetaObject flag when constructing an extended type.
Fixes failure introduced in 038619bf2c5e7d2c18a6f463cd994d8b3831e61f.
Change-Id: Idbbbec8f9ec3792b2765639781dba1696fce0a49
Reviewed-on: http://codereview.qt.nokia.com/2927
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
|
|
|
|
|
|
|
|
|
| |
It's a new module, of course they're new in this version.
Change-Id: I8bce4d452161cd581c046fec62a41cac4e0609ed
Reviewed-on: http://codereview.qt.nokia.com/2854
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
|
| |
No real point having a separate class, and it makes the docs more
complex.
Change-Id: I48aa7bafce541b0b5b792351adb5edf77fc67de2
Reviewed-on: http://codereview.qt.nokia.com/2853
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Don't modify list of running jobs when a job is aborted since the job
may have just started. Wait till the next time processJobs() is invoked
for a new job and discard the aborted job at that time.
(cherry picked from commit f55ecc080d0c5eca4e65a235c63ab13867c86874
in 4.8)
Task-number: QTBUG-20841
Change-Id: Icb4cd089505c0634d3fec023b52c61bbc878404f
Reviewed-on: http://codereview.qt.nokia.com/2837
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
|
|
|
|
|
|
|
|
|
| |
QSGItem was setting its node pointer to 0 without deleting it.
Change-Id: I8b52d02069410b1dfc0057f926a52c946ef348a2
Reviewed-on: http://codereview.qt.nokia.com/2910
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Otherwise we'll get problems when compiling
on Windows.
Change-Id: I2a366da3cd4cd08ba8bc8d9c8c81409737bee697
Reviewed-on: http://codereview.qt.nokia.com/2752
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I13f95b415b28467617c4ca804e706082150d253e
Reviewed-on: http://codereview.qt.nokia.com/2870
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bjørn Erik Nilsen <bjorn.nilsen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Based on two texture samples instead of five.
Can be enabled with qmlscene --text-subpixel-antialiasing-lowq
Change-Id: I726f73d812b93aa9ca38ce142d1e97b9a40d200a
Reviewed-on: http://codereview.qt.nokia.com/2861
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
QIntrusiveList effectively does the same as
QScriptBagContainer, without the need to inherit a
Node class. Let's avoid the code duplication.
However, QIntrusiveList::remove() and insert()
are less strict than QScriptBagContainer; introduce
QScriptIntrusiveList that performs the same sanity
checks (no duplicate insertion, etc). Ideally these
checks would be merged into QIntrusiveList.
Also rename QJSValuePrivate::reinitialize() to
invalidate(), and make it not call
engine->unregisterValue(this) any more. Values are
only invalidated at engine destruction time, and
it's the engine's responsibility to erase the list.
Change-Id: I60fc61ee8f90a716a285b1dd1bf4d6a08a9349df
Reviewed-on: http://codereview.qt.nokia.com/2628
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The IsDirect flag was only set in
QDeclarativePropertyCache::append(), but it should be
set in create() as well.
Change-Id: I43c980e5f7e01e44ade662c11c2daf7a9a44d299
Reviewed-on: http://codereview.qt.nokia.com/2844
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
When using QJSEngine, there is no QDeclarativeEngine
associated with the QV8Engine, so check if it's there first.
This was causing the QJS qobject bindings autotest to crash.
Change-Id: If2c1d414d615bfbe93580d06555f5c17b0e41eef
Reviewed-on: http://codereview.qt.nokia.com/2845
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: Ie11a91034174b248b564fa5d8af8905a79b6eacf
Reviewed-on: http://codereview.qt.nokia.com/2841
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Remove duplicated code for QRegExp conversion.
Change-Id: Ic0a6b68a317404ac6d1695f0220f257046b4ba80
Reviewed-on: http://codereview.qt.nokia.com/2703
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Only an object can have a property.
Change-Id: I032cf3a08f777b6b47cb5a417fa796059bfc9ef5
Reviewed-on: http://codereview.qt.nokia.com/2702
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Unify string conversions when there is not any external string wrapper.
Change-Id: I6665e33c968b9d1c6ad86595639967ddcd257667
Reviewed-on: http://codereview.qt.nokia.com/2701
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
| |
Remove redundant else conditions.
Change-Id: I5795bd931d9204a31e0edfea0d3489c119db1020
Reviewed-on: http://codereview.qt.nokia.com/2700
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
According to comment the code was copied from QtScript. As the
implementation is merged to QtDeclarative we can use common code path.
Change-Id: Id603ef0207a1356f8c010a35fe601568a03aac48
Reviewed-on: http://codereview.qt.nokia.com/2699
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|