profile/ivi/qtdeclarative.git
12 years agoMerge IR::Module and IR::Function.
Roberto Raggi [Mon, 25 Jul 2011 06:31:21 +0000 (08:31 +0200)]
Merge IR::Module and IR::Function.

V4 compiles one function at time. There is no reson to keep
IR::Module and IR::Function as separate classes.

Change-Id: Ia6bf971d0d499b14847c3ca725f9cdf5c7e3916c
Reviewed-on: http://codereview.qt.nokia.com/3784
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoSet the name of the default property
Roberto Raggi [Tue, 9 Aug 2011 13:04:14 +0000 (15:04 +0200)]
Set the name of the default property

Change-Id: I4f69b9e4e33a789215941f8021b8937c8aa2e7c1
Reviewed-on: http://codereview.qt.nokia.com/3783
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoFix wrong usage of QStringHash iterators.
Roberto Raggi [Thu, 4 Aug 2011 09:21:19 +0000 (11:21 +0200)]
Fix wrong usage of QStringHash iterators.

The code was creating circular lists of overloads.

Change-Id: I126140dae90fbdf71a53fc8163fe2b56bb069312
Reviewed-on: http://codereview.qt.nokia.com/3782
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoRecompute the token length after the scan of a regexp.
Roberto Raggi [Tue, 2 Aug 2011 07:57:01 +0000 (09:57 +0200)]
Recompute the token length after the scan of a regexp.

Change-Id: I9042f261b374bee1a3f9cb8d2dc40e381a66732b
Reviewed-on: http://codereview.qt.nokia.com/3781
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoFix visit of list-like AST nodes.
Roberto Raggi [Mon, 1 Aug 2011 16:04:30 +0000 (18:04 +0200)]
Fix visit of list-like AST nodes.

The method finish() of a list-like node will convert the circular
list to a single-list. The right way to iterate is by looking
at the member `next' and by invokign finish().

Change-Id: I85a45b691a6c7089cd1a765871a11a7c60c3cdff
Reviewed-on: http://codereview.qt.nokia.com/3780
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoFix possible crash when using the QML lexer without an engine.
Roberto Raggi [Mon, 1 Aug 2011 16:03:41 +0000 (18:03 +0200)]
Fix possible crash when using the QML lexer without an engine.

Change-Id: Ia7d820cf1a63eaf42041ab78e1f111d31358e4dd
Reviewed-on: http://codereview.qt.nokia.com/3779
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoFix initialization of QDeclarativeVMEMetaData::PropertyData for variant properties.
Roberto Raggi [Mon, 1 Aug 2011 15:08:06 +0000 (17:08 +0200)]
Fix initialization of QDeclarativeVMEMetaData::PropertyData for variant properties.

The propertyType member for variant properties needs to be initialized to -1 (at least
according to QDeclarativeVMEMetaObject::metaCall).

Change-Id: I44f226f2bce3732f3a4220fe24617b5cb2292f97
Reviewed-on: http://codereview.qt.nokia.com/3778
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoFix comparison.
Roberto Raggi [Mon, 1 Aug 2011 14:49:08 +0000 (16:49 +0200)]
Fix comparison.

Change-Id: I58ae5237f3458ee4bada89d1d676645e575d681f
Reviewed-on: http://codereview.qt.nokia.com/3777
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoCompile.
Roberto Raggi [Mon, 1 Aug 2011 14:48:33 +0000 (16:48 +0200)]
Compile.

Change-Id: Id8af2a65e54317a9300289a034c042d59b2c69bd
Reviewed-on: http://codereview.qt.nokia.com/3776
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoRemove deprecated QChar to ushort conversions.
Roberto Raggi [Thu, 28 Jul 2011 11:20:49 +0000 (13:20 +0200)]
Remove deprecated QChar to ushort conversions.

Change-Id: I2411d2221e70685d1a1518e2f5eb2e693261e00d
Reviewed-on: http://codereview.qt.nokia.com/3775
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoFaster check for revisioned properties.
Martin Jones [Fri, 22 Jul 2011 07:23:16 +0000 (17:23 +1000)]
Faster check for revisioned properties.

Change-Id: I8122c15d0467019bcd333ca111d2b248c5ca2d91
Reviewed-on: http://codereview.qt.nokia.com/3774
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoSpecial case integers and strings in lexer
Aaron Kennedy [Fri, 22 Jul 2011 06:18:06 +0000 (16:18 +1000)]
Special case integers and strings in lexer

Reduces the amount of copying for integer numbers and uses a raw
QStringRef for unescaped strings.

Change-Id: I2ad29f4c67be72495e3209081761b9a1bb503f26
Reviewed-on: http://codereview.qt.nokia.com/3773
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoReduce allocations
Aaron Kennedy [Fri, 22 Jul 2011 04:40:37 +0000 (14:40 +1000)]
Reduce allocations

Change-Id: I230424147ad195239d725359fcd6dc5568f102a7
Reviewed-on: http://codereview.qt.nokia.com/3772
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoless toUtf8()
Martin Jones [Fri, 22 Jul 2011 06:08:51 +0000 (16:08 +1000)]
less toUtf8()

Change-Id: I9c4b599511e755b8f93d8bb8a7cd3732ca380de0
Reviewed-on: http://codereview.qt.nokia.com/3771
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoRemove some QString <-> utf8 conversions.
Martin Jones [Fri, 22 Jul 2011 04:52:08 +0000 (14:52 +1000)]
Remove some QString <-> utf8 conversions.

Change-Id: I4478ec805f5b1e05025baafaf7035b8fb57f9854
Reviewed-on: http://codereview.qt.nokia.com/3770
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoOptimize default property resolution in compiler
Aaron Kennedy [Fri, 22 Jul 2011 03:32:47 +0000 (13:32 +1000)]
Optimize default property resolution in compiler

Change-Id: I90b677a190c0c59ba681a7643a9b13cfb938d5a1
Reviewed-on: http://codereview.qt.nokia.com/3769
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoUse the cached property data when possible
Aaron Kennedy [Fri, 22 Jul 2011 01:51:41 +0000 (11:51 +1000)]
Use the cached property data when possible

Change-Id: I6690208b9a4d99e485874c5253d69cb82938c8a6
Reviewed-on: http://codereview.qt.nokia.com/3768
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoIntroduce QHashField for use in "contains" tests.
Aaron Kennedy [Thu, 21 Jul 2011 13:08:53 +0000 (23:08 +1000)]
Introduce QHashField for use in "contains" tests.

Change-Id: I35aadace15b71b44c1b9e30a76eadf79fe03afad
Reviewed-on: http://codereview.qt.nokia.com/3767
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoUse QFieldList to manage dynamic properties, signals and slots
Aaron Kennedy [Thu, 21 Jul 2011 07:38:30 +0000 (17:38 +1000)]
Use QFieldList to manage dynamic properties, signals and slots

Change-Id: I27282a035a631dde30ee97412d3968ab525b2502
Reviewed-on: http://codereview.qt.nokia.com/3766
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoCalculate the hash inside QHashedString
Aaron Kennedy [Thu, 21 Jul 2011 10:01:07 +0000 (20:01 +1000)]
Calculate the hash inside QHashedString

This avoids calling into V8 to calculate the hash.  This improves
performance and removes the dependency on V8.

Change-Id: I8ccb405cba15c7eda51a1d56652784164789de7f
Reviewed-on: http://codereview.qt.nokia.com/3765
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoUse strings more conservatively
Aaron Kennedy [Thu, 21 Jul 2011 04:20:05 +0000 (14:20 +1000)]
Use strings more conservatively

Also adds the ability to efficiently estimate the length of, and
write out to, UTF8 from QHashedStringRef.

Change-Id: I8b6226ba41d855246ddf7d6268f8045c92ae219e
Reviewed-on: http://codereview.qt.nokia.com/3764
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoAdd QFastMetaBuilder
Aaron Kennedy [Wed, 20 Jul 2011 07:47:57 +0000 (17:47 +1000)]
Add QFastMetaBuilder

This is a faster, but less convenient, version of QMetaObjectBuilder.
The aim is to reduce allocations made during building the meta object
by doing it in two passes - first you reserve all the strings needed
and then you provide their data.

Change-Id: Id9caf9c9c6c2ab6a5219e5cea9363463a4ebf822
Reviewed-on: http://codereview.qt.nokia.com/3763
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoInline a couple of often used methods.
Martin Jones [Fri, 22 Jul 2011 00:40:01 +0000 (10:40 +1000)]
Inline a couple of often used methods.

Change-Id: I6fdcebd45835e7700fc470790a259e256fa68066
Reviewed-on: http://codereview.qt.nokia.com/3762
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoCompile
Roberto Raggi [Thu, 21 Jul 2011 13:09:15 +0000 (15:09 +0200)]
Compile

Change-Id: Id7a5520d0e344b708aabacd0b0aefa705b47b197
Reviewed-on: http://codereview.qt.nokia.com/3761
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoSpeedup the V4 code generation.
Roberto Raggi [Thu, 21 Jul 2011 12:47:26 +0000 (14:47 +0200)]
Speedup the V4 code generation.

Skip discarded code and use QVarLengthArray instead of
QByteArray to store the bytecode.

Change-Id: I4c574e7a817595bc8942ed9a927e79339a2d7b40
Reviewed-on: http://codereview.qt.nokia.com/3760
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoUse QDeclarativePool to allocate the V4 instructions.
Roberto Raggi [Wed, 20 Jul 2011 10:51:12 +0000 (12:51 +0200)]
Use QDeclarativePool to allocate the V4 instructions.

Change-Id: Ib4a9748bf81392a901c8ae94a8746f2e52f7284e
Reviewed-on: http://codereview.qt.nokia.com/3759
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoChange the V4 IR so it can be stored in a memory pool.
Roberto Raggi [Tue, 19 Jul 2011 13:12:40 +0000 (15:12 +0200)]
Change the V4 IR so it can be stored in a memory pool.

That is, remove members with a non-trivial destructor from IR::Stmt
and IR::Expr (that's because we don't destroy the objects
allocated in the pool).

Added the method MemoryPool::reset() so we can clear the pool
without disposing the allocated memory.

Change-Id: I126332be387c016578c086db8b3aa8098b2507f6
Reviewed-on: http://codereview.qt.nokia.com/3758
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoRemoved QDeclarativeJS::NodePool
Roberto Raggi [Tue, 19 Jul 2011 09:16:33 +0000 (11:16 +0200)]
Removed QDeclarativeJS::NodePool

Change-Id: I69d39ef005900803f6c620ea8f1ca00d054dc8d2
Reviewed-on: http://codereview.qt.nokia.com/3757
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoSome lexer improvement, mostly by avoiding QChar::isWhatever()
Martin Jones [Thu, 21 Jul 2011 09:05:45 +0000 (19:05 +1000)]
Some lexer improvement, mostly by avoiding QChar::isWhatever()

Change-Id: I330a45a2f611a594d9b0e9bb24ebef028654a8d8
Reviewed-on: http://codereview.qt.nokia.com/3756
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoImproved parsing of numeric literals
Roberto Raggi [Wed, 20 Jul 2011 13:08:05 +0000 (15:08 +0200)]
Improved parsing of numeric literals

Change-Id: Id02b5b0b0ab590b7ea5d20098472459e1fd986a6
Reviewed-on: http://codereview.qt.nokia.com/3755
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoOptimizations to imports.
Martin Jones [Wed, 20 Jul 2011 04:03:03 +0000 (14:03 +1000)]
Optimizations to imports.

Change-Id: If4a51ad3b7c0ecc2261eea1d07a949119c3ad860
Reviewed-on: http://codereview.qt.nokia.com/3754
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoDon't unnecessarily construct QMetaPropertys
Aaron Kennedy [Mon, 18 Jul 2011 06:21:21 +0000 (16:21 +1000)]
Don't unnecessarily construct QMetaPropertys

As we store everything as a QDeclarativePropertyCache::Data internally
anyway, operate exclusively against this structure.

Change-Id: Id963bc001ce56ebf07b9b13082bb082d5d93ddd2
Reviewed-on: http://codereview.qt.nokia.com/3753
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoClearing a hash makes its length 0.
Martin Jones [Mon, 18 Jul 2011 04:28:10 +0000 (14:28 +1000)]
Clearing a hash makes its length 0.

Change-Id: Ie5b1251212b504d7a7621abdd7fe4e9305790846
Reviewed-on: http://codereview.qt.nokia.com/3752
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoRemove unnecessary toString()
Aaron Kennedy [Fri, 15 Jul 2011 08:08:51 +0000 (18:08 +1000)]
Remove unnecessary toString()

Change-Id: I0c39bf9c96d65ba1ed4faffffebfd9b89016b3d7
Reviewed-on: http://codereview.qt.nokia.com/3751
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoImprove performance of the QML front-end
Aaron Kennedy [Fri, 15 Jul 2011 07:46:43 +0000 (17:46 +1000)]
Improve performance of the QML front-end

Introduced a new lexer and a more efficient representation of
the AST. Instead of creating unique name ids, we simply use
QStringRef(s).

Change-Id: I403472fa2bb74d2c87dd6314065306499677a3bf
Authored-by: Roberto Raggi
Reviewed-on: http://codereview.qt.nokia.com/3750
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoRemove invalid assert
Martin Jones [Fri, 15 Jul 2011 07:37:23 +0000 (17:37 +1000)]
Remove invalid assert

Change-Id: Ia0544cf8c1d236977f193ad4c5726217035cabcb
Reviewed-on: http://codereview.qt.nokia.com/3749
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoCache QML import directories and qmldir files.
Martin Jones [Fri, 15 Jul 2011 07:19:17 +0000 (17:19 +1000)]
Cache QML import directories and qmldir files.

Also a little less toUtf8().

Change-Id: Iefb255fad9e27553f29b184418e66ce317f1cd89
Reviewed-on: http://codereview.qt.nokia.com/3748
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoRemove some QHash and QLists.
Aaron Kennedy [Thu, 14 Jul 2011 07:34:06 +0000 (17:34 +1000)]
Remove some QHash and QLists.

Change-Id: I153fa1abbe27f0724e453c5c979f740e956819c9
Reviewed-on: http://codereview.qt.nokia.com/3747
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoQStringHash improvements
Aaron Kennedy [Fri, 15 Jul 2011 06:28:40 +0000 (16:28 +1000)]
QStringHash improvements

Change-Id: I1844460095f4de4980d458dc696c0aab8b504c23
Reviewed-on: http://codereview.qt.nokia.com/3746
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoImprove QStringHash
Aaron Kennedy [Thu, 14 Jul 2011 05:35:39 +0000 (15:35 +1000)]
Improve QStringHash

We now support reserving nodes, and keys that are ASCII strings.

Change-Id: I9cc04438a1e9ceee1081cb1216e0273227551222
Reviewed-on: http://codereview.qt.nokia.com/3745
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoUse memory more conservatively during QML compilation
Aaron Kennedy [Wed, 13 Jul 2011 04:12:21 +0000 (14:12 +1000)]
Use memory more conservatively during QML compilation

Change-Id: I63af79e575345bce00d724f1e7c87606156d1479
Reviewed-on: http://codereview.qt.nokia.com/3744
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoMove tools classes into their own directory
Aaron Kennedy [Tue, 12 Jul 2011 05:22:40 +0000 (15:22 +1000)]
Move tools classes into their own directory

Change-Id: Ic8a3a35f36259659cb83b5e11641af47bd8b18a9
Reviewed-on: http://codereview.qt.nokia.com/3743
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoRemove some QByteArray<->QString conversions
Aaron Kennedy [Mon, 11 Jul 2011 01:03:31 +0000 (11:03 +1000)]
Remove some QByteArray<->QString conversions

Change-Id: Ieba3e1754d6438bb13fe7bf9963456a29d122129
Reviewed-on: http://codereview.qt.nokia.com/3742
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoMore efficient type name cache
Aaron Kennedy [Wed, 6 Jul 2011 03:43:47 +0000 (13:43 +1000)]
More efficient type name cache

Instead of creating completely separate hashes for all the types used
by every QML file, we simply link to the QDeclarativeTypeModule.  This
uses much less memory, and is faster to construct at startup.

Change-Id: I28bc2807074f9c6f38096d6e4ce8be744159d023
Reviewed-on: http://codereview.qt.nokia.com/3741
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoInclude v8-debug.h from the right location
Kent Hansen [Tue, 30 Aug 2011 10:19:32 +0000 (12:19 +0200)]
Include v8-debug.h from the right location

Now that V8 is its own module in Qt, the V8
headers are accessible as <private/v8*>.

Change-Id: Ieedf2e2618ec5fae62e6d277e469553f1b0f96f1
Reviewed-on: http://codereview.qt.nokia.com/3872
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoAdd more proportionality modes to PointAttractor
Alan Alpert [Tue, 30 Aug 2011 09:25:11 +0000 (19:25 +1000)]
Add more proportionality modes to PointAttractor

Inverse proportionality is now properly named, direct proportionality
is added, and constant as well (in case they all just draw towards a
point).

Change-Id: I6187c0df908fdf20e2bb0b0a1007ebcc38dd3ac2
Reviewed-on: http://codereview.qt.nokia.com/3868
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoQDeclarative::hasActiveFocus should return false for hidden items
Alan Alpert [Tue, 30 Aug 2011 08:07:24 +0000 (18:07 +1000)]
QDeclarative::hasActiveFocus should return false for hidden items

Forward-port of a1b2be3c8a64aee832c648c6dcdff003f22318a3 from 4.8

Task-number: QTBUG-21045
Change-Id: I055e4dd18e43ccce92d0cae96b10809adb4dcc3a
Reviewed-on: http://codereview.qt.nokia.com/3857
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix Attractor affector
Alan Alpert [Tue, 30 Aug 2011 01:41:16 +0000 (11:41 +1000)]
Fix Attractor affector

Wasn't simulating the physics right, interacted wrong with other
attractors when in Velocity mode.

Change-Id: I5883eb748b398494ad552e35f06d1167da6023a6
Reviewed-on: http://codereview.qt.nokia.com/3835
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix entryEffect for Sprite performance level
Alan Alpert [Thu, 25 Aug 2011 07:19:17 +0000 (17:19 +1000)]
Fix entryEffect for Sprite performance level

Change-Id: Icca2e6662a640242b4e676cd07b084a38dab5fb7
Reviewed-on: http://codereview.qt.nokia.com/3570
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdd an update flag to Custom Affectors
Alan Alpert [Thu, 25 Aug 2011 01:55:23 +0000 (11:55 +1000)]
Add an update flag to Custom Affectors

Slight optimization, as it doesn't have to reload the vertex buffer on
every particle every tick now.

Change-Id: I272ec79bfc80c00a1f08de4d81059d0e0b36fb29
Reviewed-on: http://codereview.qt.nokia.com/3543
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoUpdate ShaderEffect docs with module qualifiers
Alan Alpert [Thu, 25 Aug 2011 00:51:56 +0000 (10:51 +1000)]
Update ShaderEffect docs with module qualifiers

Change-Id: I603808ab4b7ce8326f6e94bad341d8a466785eff
Reviewed-on: http://codereview.qt.nokia.com/3541
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoImplement script module api property get and set
Chris Adams [Wed, 3 Aug 2011 01:04:01 +0000 (11:04 +1000)]
Implement script module api property get and set

This commit adds code for property get and set for script module
APIs, and also splits up the module API unit tests into QObject and
Script (QJSValue) parts.
Related to commit: 3ee8a19f5b7142b96e2df649ea0dac444b5622a2

Task-number: QMLNG-33
Task-number: QTBUG-17318
Change-Id: I4aaf5d1cc1d4774dd0f0999f0985439e4d76f0ca
Reviewed-on: http://codereview.qt.nokia.com/1472
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoRevert swap interval change in 107bf9e570e4d7ce1eb38452c9a5473b2455d9c7
Aaron Kennedy [Fri, 26 Aug 2011 04:33:00 +0000 (14:33 +1000)]
Revert swap interval change in 107bf9e570e4d7ce1eb38452c9a5473b2455d9c7

This was mistakenly checked in when trying to measure maximum framerate.

Change-Id: Ie0f4d0602bee10a61466f3239827cb4d54ecba27
Reviewed-on: http://codereview.qt.nokia.com/3626
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoPosition in updatePolish instead of using single shot timer
Alan Alpert [Mon, 29 Aug 2011 02:44:13 +0000 (12:44 +1000)]
Position in updatePolish instead of using single shot timer

Related to QTBUG-18919, but that was not reproduceable.

Rewrites a fair bit of the autotest to no longer rely on repositionings
happening immediately.

Change-Id: I80683d6e03a5543fc838cdd55b2d53e49a8a68bd
Reviewed-on: http://codereview.qt.nokia.com/3690
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoFix conversion of QAbstractItemModel::rowsMoved() parameters
Bea Lam [Mon, 29 Aug 2011 03:58:05 +0000 (13:58 +1000)]
Fix conversion of QAbstractItemModel::rowsMoved() parameters

VisualDataModel was emitting itemsMoved() signal with incorrect
"to" value when multiple items were moved forwards.

(change cherry picked from b64817858484db6e7c280d41ed81d4c87dff2275)

Change-Id: I684eb1716d2ad6e0f702e95d9c0cd5c6fe2c9cbb
Reviewed-on: http://codereview.qt.nokia.com/3694
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoAlways disconnect signals on aborted reply objects
Bea Lam [Fri, 12 Aug 2011 04:20:38 +0000 (14:20 +1000)]
Always disconnect signals on aborted reply objects

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.

(cherry picked from commit d3599ab224f00915045562562c7fd4d6b9b9aeb4)

Task-number: QTBUG-20842
Change-Id: I812ddc1feb03ee824aa0b32e1aca3fee9344c448
Reviewed-on: http://codereview.qt.nokia.com/2893
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoCompile fix for QML object creation benchmark.
Michael Brasser [Mon, 29 Aug 2011 22:17:48 +0000 (08:17 +1000)]
Compile fix for QML object creation benchmark.

Change-Id: I0a2948728796e72651c86f84f0a296b63e22044f
Reviewed-on: http://codereview.qt.nokia.com/3825
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoRemove V8 submodule from QtDeclarative
Kent Hansen [Tue, 16 Aug 2011 12:00:13 +0000 (14:00 +0200)]
Remove V8 submodule from QtDeclarative

QtDeclarative should now link against the QtV8 library
from qtbase.

The patch files have been moved to qtbase as well.

Applications that use the QtDeclarative private headers
may need to add the following to their .pro file:

QT += v8-private

This ensures that <private/v8.h> is found, which is
(indirectly) included by many QtDeclarative private
headers.

Task-number: QTBUG-20963

Change-Id: I31e973a6fcc0c416d3b258a61c26564cee3dcd4b
Reviewed-on: http://codereview.qt.nokia.com/3093
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoFix build break introduced by changes in QTestLog.
Xizhi Zhu [Mon, 29 Aug 2011 10:55:09 +0000 (13:55 +0300)]
Fix build break introduced by changes in QTestLog.

The mode parameter of QTestLog::addSkip() has been removed, more details at: http://codereview.qt.nokia.com/3547

Change-Id: Id5428a506d177ae9d4480a522ee492672048dad7
Reviewed-on: http://codereview.qt.nokia.com/3735
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
12 years agoUse the optimized QDeclarativeExpression constructor where possible.
Michael Brasser [Mon, 29 Aug 2011 05:06:14 +0000 (15:06 +1000)]
Use the optimized QDeclarativeExpression constructor where possible.

Pass in the QDeclarativeScriptString directly, to make use of the
precompiled binding. Also does some minor cleanup of the related
internal implementation.

Change-Id: I4b199298c9da3ee11c51c9c98b384c8324f62c26
Reviewed-on: http://codereview.qt.nokia.com/3696
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoqmlplugindump: Load QtQuick 1 plugin.
Christian Kamm [Fri, 26 Aug 2011 08:47:13 +0000 (10:47 +0200)]
qmlplugindump: Load QtQuick 1 plugin.

This allows the QtQuick1 types to be dumped with --builtin and to be
skipped when dumping other plugins that use them.

Change-Id: I23ecba5cea7c11e998861746f1c7056e8911abf3
Reviewed-on: http://codereview.qt.nokia.com/3650
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
12 years agoFix QSGItem::polish() at startup logic
Aaron Kennedy [Fri, 26 Aug 2011 06:35:57 +0000 (16:35 +1000)]
Fix QSGItem::polish() at startup logic

Change-Id: I4e3f81bd8e95d34fe59e39b1ae807211e00aaaa5
Reviewed-on: http://codereview.qt.nokia.com/3632
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
12 years agoRe-add QDeclarativeFontLoader autotest.
Michael Brasser [Mon, 29 Aug 2011 00:29:01 +0000 (10:29 +1000)]
Re-add QDeclarativeFontLoader autotest.

Was accidently removed in the qtquick1 work.

Change-Id: I511efa65e85858e22909257a95f635d5c06cb0a5
Reviewed-on: http://codereview.qt.nokia.com/3685
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoRemove unnecessary code.
Michael Brasser [Fri, 26 Aug 2011 00:56:46 +0000 (10:56 +1000)]
Remove unnecessary code.

QT_NO_LOCALFILE_OPTIMIZED_QML should never be defined, and we don't
need to manually resolve urls coming from QML.

Change-Id: I7cdeb2814385bcb9d6004ab43686f65d388620eb
Reviewed-on: http://codereview.qt.nokia.com/3684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoDeprecate QDeclarativeDebugHelper class
Kai Koehne [Wed, 24 Aug 2011 13:14:59 +0000 (15:14 +0200)]
Deprecate QDeclarativeDebugHelper class

This was a helper class for enable debugging in 4.7. Since Qt 4.8 you
should just say CONFIG += declarative_debug

Change-Id: I51dabaec36e175a097721570061aad38c3f828d1
Reviewed-on: http://codereview.qt.nokia.com/3507
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
12 years agoDon't enumerate Function.prototype.{connect,disconnect}
Kent Hansen [Thu, 25 Aug 2011 10:51:03 +0000 (12:51 +0200)]
Don't enumerate Function.prototype.{connect,disconnect}

QML/JS adds connect and disconnect methods to the standard
Function.prototype object.
Follow the convention of ECMA-262: Function properties should
be non-enumerable.
In particular, we don't want such built-in properties to show
up in user code "for-in" statements.

Task-number: QTBUG-21120
Change-Id: I416106badf35daddf32e16f757d37b2b09e58310
Reviewed-on: http://codereview.qt.nokia.com/3587
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoFix memory leak in ListModel custom parser
Bea Lam [Thu, 25 Aug 2011 07:03:10 +0000 (17:03 +1000)]
Fix memory leak in ListModel custom parser

ModelNodes created by the parser for ListElement definitions were not
deleted.

(cherry picked from commit c1491c356f3cca92a359468ce37f38bc1873eec4)

Task-number: QTBUG-21084
Change-Id: Ic55a054bb8e30cdabd11080e4f827df5deb1a014
Reviewed-on: http://codereview.qt.nokia.com/3567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoMove QSGViewPrivate to qsgview_p.h
Marco Bubke [Wed, 24 Aug 2011 13:47:35 +0000 (15:47 +0200)]
Move QSGViewPrivate to qsgview_p.h

For the qml designer we need access to the private class.

Change-Id: I2f368daf8e79baa433d11b69a29ef37d53a18a36
Reviewed-on: http://codereview.qt.nokia.com/3508
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoGet the image of the FBO of a effect texture
Marco Bubke [Wed, 24 Aug 2011 13:48:03 +0000 (15:48 +0200)]
Get the image of the FBO of a effect texture

The Qml Designer needs this image because every item in the text file is
rendered in an external process in an image and send over a socket to the
main process.

Change-Id: I73cbc798d783098d3e1937181259c227b008082e
Reviewed-on: http://codereview.qt.nokia.com/3509
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoqsgflickable test is unstable
Martin Jones [Thu, 25 Aug 2011 04:14:25 +0000 (14:14 +1000)]
qsgflickable test is unstable

Ensure that the flickable animation finishes before flicking in the
other axis is initiated.

Task-number: QTBUG-21096
Change-Id: I97bdbc539d9b5af999c0c3d186c35a75a029194d
Reviewed-on: http://codereview.qt.nokia.com/3553
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdd custom emission capability to FollowEmitter
Alan Alpert [Tue, 23 Aug 2011 10:37:39 +0000 (20:37 +1000)]
Add custom emission capability to FollowEmitter

Also implement speedFromMovement (a convenience now) and fix
a bug in QSGParticleData::curSize()

Change-Id: I831494f24f4b4afaee47524e4a4060f06fefdb0a
Reviewed-on: http://codereview.qt.nokia.com/3396
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoFix leak in tst_qsgitem::wheelEvent() autotest
Caio Marcelo de Oliveira Filho [Wed, 24 Aug 2011 23:45:41 +0000 (20:45 -0300)]
Fix leak in tst_qsgitem::wheelEvent() autotest

Change-Id: If0fe6d64d1f7cfb8679ce11edda7c02dc3783f95
Reviewed-on: http://codereview.qt.nokia.com/3539
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoUpdate v8
Aaron Kennedy [Thu, 25 Aug 2011 01:15:02 +0000 (11:15 +1000)]
Update v8

Change-Id: I576fb2215345aa6599cfb75c6a27544260b2c145
Reviewed-on: http://codereview.qt.nokia.com/3536
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
12 years agoupdate .gitignore
Charles Yin [Tue, 23 Aug 2011 01:30:43 +0000 (11:30 +1000)]
update .gitignore

Change-Id: I9265922f9c34437e712ff3e8033458daf202fe56
Reviewed-on: http://codereview.qt.nokia.com/3345
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoDebug Service: Synchronize with v8 debug client.
Aurindam Jana [Mon, 22 Aug 2011 10:54:26 +0000 (12:54 +0200)]
Debug Service: Synchronize with v8 debug client.

In "blocking" mode, the service waits till the client has
sent all initialization data.

Change-Id: Ia62ac46527911bc9c648abd6930cb6ea1474718b
Reviewed-on: http://codereview.qt.nokia.com/3306
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoSlightly reduce distance-field texture creation (and resizing) time.
Yoann Lopes [Wed, 24 Aug 2011 09:48:57 +0000 (11:48 +0200)]
Slightly reduce distance-field texture creation (and resizing) time.

Pass a null pointer to glTexImage2D instead of a zero-filled array.

Change-Id: I8428b26a83a3f88ad2ee07e56e5cdb09ee5de68a
Reviewed-on: http://codereview.qt.nokia.com/3492
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoFixed QSGPaintedItem updates when a contentsScale is set.
Yoann Lopes [Thu, 18 Aug 2011 13:38:25 +0000 (15:38 +0200)]
Fixed QSGPaintedItem updates when a contentsScale is set.

Change-Id: Iee9cd4503bcfdce39b6ee4beaccfed7da45cb8bc
Reviewed-on: http://codereview.qt.nokia.com/3192
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
12 years agoDeclarativeDebug: Clear service name when returning from waitForMessage
Aurindam Jana [Wed, 24 Aug 2011 10:13:39 +0000 (12:13 +0200)]
DeclarativeDebug: Clear service name when returning from waitForMessage

The service name is cleared in waitForMessage instead of receiveMessage
so that consequent packets can de delivered to the service. A flag is
used to check if the operation succeeded.

Change-Id: I45b94a6194026d22ffb75a394628c7497ce4704e
Reviewed-on: http://codereview.qt.nokia.com/3486
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoAbsorb CustomEmitter/Affector
Alan Alpert [Tue, 23 Aug 2011 10:03:43 +0000 (20:03 +1000)]
Absorb CustomEmitter/Affector

The signal is now on the Emitter/Affector base type, but only
emitted if connected to (to save creating the v8 object)

Change-Id: Ib5522e0f760caa17a6ad731b2dfbce9994a7664e
Reviewed-on: http://codereview.qt.nokia.com/3393
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoLift particle limits on desktop
Alan Alpert [Tue, 23 Aug 2011 03:08:08 +0000 (13:08 +1000)]
Lift particle limits on desktop

Change-Id: I65d897273cd0e3a2ea58c78b0cde08a388506f84
Reviewed-on: http://codereview.qt.nokia.com/3355
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoSwitch from textures to uniform arrays for size/opacity tables
Alan Alpert [Tue, 23 Aug 2011 08:20:58 +0000 (18:20 +1000)]
Switch from textures to uniform arrays for size/opacity tables

Change-Id: Iafc5eaa80f68345cc3b14fe0b2d997c1af435419
Reviewed-on: http://codereview.qt.nokia.com/3388
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoFix tst_qjsvalue::castToPointer test failure
Kent Hansen [Mon, 22 Aug 2011 11:15:52 +0000 (13:15 +0200)]
Fix tst_qjsvalue::castToPointer test failure

In order for casting the variant's data() to work,
we need to get at the actual QVariant wrapped in
the JS object; copying the variant caused a stale
pointer to be returned.

Task-number: QTBUG-21000
Change-Id: I1a32a70d5a043c94dbbd07ef2c8048e7df7fc7bf
Reviewed-on: http://codereview.qt.nokia.com/3309
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
12 years agomapFromModel() returned incorrect value
Bea Lam [Wed, 24 Aug 2011 06:47:35 +0000 (16:47 +1000)]
mapFromModel() returned incorrect value

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>
12 years agoreenable tst_examples
Alan Alpert [Wed, 24 Aug 2011 04:55:59 +0000 (14:55 +1000)]
reenable tst_examples

A potential culprit has been disabled pending investigation, testing may
proceed as normal.

Change-Id: I471d768e033b1e3fea1714983056ca4631baabd8
Reviewed-on: http://codereview.qt.nokia.com/3444
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agodisable the canvas svgpath example temporarily.
Charles Yin [Wed, 24 Aug 2011 04:49:07 +0000 (14:49 +1000)]
disable the canvas svgpath example temporarily.

Change-Id: I368acd65e9d352ecc04f4f7aaa3efc43d4530530
Reviewed-on: http://codereview.qt.nokia.com/3440
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoDo not deliver mouse wheel events when item is not visible
Caio Marcelo de Oliveira Filho [Tue, 23 Aug 2011 22:04:16 +0000 (19:04 -0300)]
Do not deliver mouse wheel events when item is not visible

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>
12 years agoCompile on Mac
Alan Alpert [Tue, 23 Aug 2011 08:34:46 +0000 (18:34 +1000)]
Compile on Mac

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>
12 years agoSwitch to using one shader and #ifdefs
Alan Alpert [Mon, 22 Aug 2011 09:00:16 +0000 (19:00 +1000)]
Switch to using one shader and #ifdefs

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>
12 years agoInitial entryEffect support for ImageParticle
Alan Alpert [Mon, 22 Aug 2011 01:55:51 +0000 (11:55 +1000)]
Initial entryEffect support for ImageParticle

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>
12 years agoUse point sprites
Alan Alpert [Fri, 19 Aug 2011 04:56:19 +0000 (14:56 +1000)]
Use point sprites

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>
12 years agotest: marked tst_examples as insignificant_test on x11
Rohan McGovern [Wed, 24 Aug 2011 00:41:06 +0000 (10:41 +1000)]
test: marked tst_examples as insignificant_test on x11

This test sometimes segfaults.

Task-number: QTBUG-21078
Change-Id: I3636063457fd78099fd471a1175bc2151ae178cc
Reviewed-on: http://codereview.qt.nokia.com/3426
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoRemove obsolete testlib files from .gitignore
Jason McDonald [Tue, 23 Aug 2011 05:56:33 +0000 (15:56 +1000)]
Remove obsolete testlib files from .gitignore

Change-Id: Id68d91dcf6c6d980e59aeb97ab9f8a57ffedb7b4
Reviewed-on: http://codereview.qt.nokia.com/3369
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoAdd the rest of the tiered shaders to QSGImageParticle
Alan Alpert [Thu, 18 Aug 2011 10:47:23 +0000 (20:47 +1000)]
Add the rest of the tiered shaders to QSGImageParticle

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>
12 years agoAdd console debugging for particles
Alan Alpert [Thu, 18 Aug 2011 06:01:58 +0000 (16:01 +1000)]
Add console debugging for particles

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>
12 years agotest: marked expected failure in tst_qsgtextinput
Rohan McGovern [Tue, 23 Aug 2011 00:33:58 +0000 (10:33 +1000)]
test: marked expected failure in tst_qsgtextinput

Part of this test was already marked as an expected failure.
Now it fails in a different place.

Task-number: QTBUG-21011
Change-Id: I15ce8be882b361fda8351900eb768acec01a7bac
Reviewed-on: http://codereview.qt.nokia.com/3343
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
12 years agotest: marked tst_qsgfocusscope as insignificant
Rohan McGovern [Mon, 22 Aug 2011 23:57:58 +0000 (09:57 +1000)]
test: marked tst_qsgfocusscope as insignificant

This autotest is unstable.

Task-number: QTBUG-21054
Change-Id: Ifeea19a842ccca9b086117345c889b8d6d0cc295
Reviewed-on: http://codereview.qt.nokia.com/3342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
12 years agotest: marked tst_qdeclarativebehaviors as expected failure
Rohan McGovern [Mon, 22 Aug 2011 06:11:31 +0000 (16:11 +1000)]
test: marked tst_qdeclarativebehaviors as expected failure

This was supposed to be marked in
e5166af2e4856668ea45d31e0d6fb044dc9ab1af, but was accidentally omitted
(note that there are two autotests named tst_qdeclarativebehaviors).

Task-number: QTBUG-21001
Change-Id: I0afeccff776a448e24d76f51cd9b761774067311
Reviewed-on: http://codereview.qt.nokia.com/3288
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
12 years agoQML Autotests: Use fuzzy compare for real numbers
Julian de Bhal [Mon, 22 Aug 2011 06:51:03 +0000 (16:51 +1000)]
QML Autotests: Use fuzzy compare for real numbers

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>
12 years agoAdd a deformable level shader for QSGImageParticle
Alan Alpert [Thu, 18 Aug 2011 04:31:35 +0000 (14:31 +1000)]
Add a deformable level shader for QSGImageParticle

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>
12 years agoAlways disconnect signals on aborted reply objects
Bea Lam [Mon, 22 Aug 2011 04:44:26 +0000 (14:44 +1000)]
Always disconnect signals on aborted reply objects

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>