Kent Hansen [Mon, 24 Oct 2011 12:34:47 +0000 (14:34 +0200)]
Make qdeclarativeincubator test compile again
Change-Id: I6586a75f52964d9dc466e70a9115c17fb3838d62
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Kent Hansen [Mon, 24 Oct 2011 11:59:12 +0000 (13:59 +0200)]
Remove QtScript dependency from autotest
Change-Id: Icb6aaa95d97078101c88d4c4f821f246a98a6ab7
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Kent Hansen [Mon, 24 Oct 2011 11:58:01 +0000 (13:58 +0200)]
Remove insignificant test flag from qquickcanvasitem
Change-Id: I667f65bad25b0ec8d97dc7bd8b594a90609a7286
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Liang Qi [Wed, 19 Oct 2011 13:40:04 +0000 (15:40 +0200)]
Update calls for keyToValue and keysToValue
They are from QMetaEnum and changed recently
Task-number: QTBUG-21672
Change-Id: I46698ec7eb4a1b23068146593ee93f71fc53a815
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
Alan Alpert [Thu, 20 Oct 2011 07:48:40 +0000 (17:48 +1000)]
Fold Move into Affector
Since 'Move' was just a generic physics property affector, it makes
sense to fold it into the generic affector as an easier way of
implementing the common case of custom affector (and much faster, since
it doesn't hit JS).
For completeness in the Move behavior, 'once' now applies the effect of
affectors over a second in that one time, so as to avoid exposing the
simulation tick. This allows once to have actual meaning for continous
affectors.
Gravity is also going to be kept around as a convenience (although it
will change slightly), so just removing its deprecation warning.
Change-Id: Ieb52f8990445fe95f94070175a0f9beb6686324b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Thu, 20 Oct 2011 06:58:06 +0000 (16:58 +1000)]
Affectors now simulate with a minimum granularity
Since all time is sourced from the ParticleSystem, the easiest way is
to alter the common time point while doing the multiple simulation runs.
Also removes the experimental TargetAffector.
Change-Id: Ieb52f8990445fe95f94070175a0f9beb6686324a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Thu, 20 Oct 2011 11:01:28 +0000 (21:01 +1000)]
Add threshold property to Friction
So much easier than calculating exact counterbalancing acceleration.
Change-Id: I7cc43cc2e4d0ad39d1996d432f0e29ccf7bff554
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aurindam Jana [Sun, 23 Oct 2011 14:34:00 +0000 (16:34 +0200)]
QV8DebugService: QML Signal Handling
Store state of breakpoints of type "Break on QML Signal Handler" so
that such breakpoints can be edited (enabled/disabled).
Change-Id: Ic69bcd18b5e527af68190e7f18371ebb5e9e83fe
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Jędrzej Nowacki [Thu, 6 Oct 2011 11:31:49 +0000 (13:31 +0200)]
Return v8::Local instead v8::Handle in some functions.
Lets try to keep information about original handle type if possible.
Change-Id: I76484c688ee5605cc99687aa4a17c6ca5d1a3891
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Samuel Rødal [Fri, 21 Oct 2011 10:37:18 +0000 (12:37 +0200)]
Get rid of legacy glTexParameterf calls.
ES 1.0 didn't have glTexParameteri, which is why we sometimes used
glTexParameterf. However, we shouldn't use glTexParameterf because
that's treating integer values as floating point, which is not type
safe. ES 1.1+ and ES 2.x have glTexParameteri, and we don't really care
about supporting ES 1.0 in any case in Qt 5.
Change-Id: I12247e4ffc8cb0e18b0ffca5759d4655b5432008
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Martin Jones [Mon, 24 Oct 2011 07:00:34 +0000 (17:00 +1000)]
Fix BorderImage drawing when no borders are specified.
When no borders were specified the innerRect was calculated
based on the item size rather than the image size.
Change-Id: I764caca22aa8a0c6ed3babaad38a93764357cd00
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Andrew den Exter [Mon, 24 Oct 2011 03:57:12 +0000 (13:57 +1000)]
Fix item focus following canvas focus.
Restore canvas focus handling so that active item focus is added and
removed as the canvas focus changes.
Task-number: QTBUG-17320
Change-Id: Ief60f35da2f3a563f397ce026ca6fea289a200c4
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Friedemann Kleint [Fri, 21 Oct 2011 11:49:08 +0000 (13:49 +0200)]
Tests: Remove Q_WS_QPA
Prepare for compilation without -qpa.
Change-Id: I8ec76d4ea3d045be457e728391462a8b195c8883
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Damian Jansen [Fri, 21 Oct 2011 01:18:18 +0000 (11:18 +1000)]
Fix abstractitemmodel for QGuiApplication
Change-Id: If9117f54f0dbe1c05cc5b46b6a6e662613e1b38f
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Charles Yin [Mon, 24 Oct 2011 00:44:16 +0000 (10:44 +1000)]
Fix qmltestrunner hang bug when no TestCase item
Add a hasTestCase property to the global qtest object, set it to true
in each TestCase's onCompleted handler. qmltestrunner only enter the
event loop if this property is true to avoid infinite waiting.
Task-number:QTBUG-22281
Change-Id: Id609432210ae795d8c128901e64ba0aef4551f01
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Toby Tomkins [Sun, 23 Oct 2011 23:12:54 +0000 (09:12 +1000)]
Mark test as failing, remove insignificant test flag.
Task-number: QTBUG-21682
Change-Id: I2f6cbd65b0b364b5fbc014966817652e982f8564
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Toby Tomkins [Sun, 23 Oct 2011 23:17:59 +0000 (09:17 +1000)]
Remove insignificant test flag.
Change-Id: I1c22b3350add76f97c5268e2f6f2526d818b7556
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Sun, 23 Oct 2011 23:03:51 +0000 (09:03 +1000)]
Remove dependency on QDesktopServices deprecated API.
QDesktopServices::storageLocation() is deprecated in favor of
QStandardPaths::writableLocation().
Change-Id: I50f73e93f39ded555123656282cf5a02abb972d8
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Sarah Smith [Thu, 20 Oct 2011 00:01:39 +0000 (10:01 +1000)]
Provide a way to cheaply flip your painted FBO
After recent changes the painted images are upside down from previous
and there is no way to get at the texture coordinates to flip them back
without reimplementing QSGPainterNode and QSGPaintedItem.
This change adds only an enum and has minimal impact, while providing
useful functionality that also fixes this problem.
Change-Id: I6884da884d9303f6e08a984d4560cc7f7728d918
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Kent Hansen [Fri, 14 Oct 2011 08:51:42 +0000 (10:51 +0200)]
Rename Qt Quick-specific classes to QQuick*
The QSG (SceneGraph) prefix is too generic for
Qt Quick(2)-specific classes.
All the classes and files in the declarative/items
directory have been renamed.
In particular, for classes that are currently public,
the renaming is as follows:
QSGView --> QQuickView
QSGCanvas --> QQuickCanvas
QSGItem --> QQuickItem
QSGPaintedItem --> QQuickPaintedItem
The header files have been renamed accordingly
(e.g. qsgview.h --> qquickview.h).
Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Charles Yin [Thu, 20 Oct 2011 05:28:04 +0000 (15:28 +1000)]
Fix test fails related to QTBUG-22237
Task-number:QTBUG-22237
Change-Id: I933c2cbd9218c8a5403712aa9dafe4221791ce0d
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Thu, 20 Oct 2011 05:27:37 +0000 (15:27 +1000)]
Add file and lineno parameters to warn() method
Change-Id: I1ddfd4793a26a16bf85b72c50d84080cd0b26a87
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Charles Yin [Fri, 21 Oct 2011 04:30:03 +0000 (14:30 +1000)]
Fix build error for canvas stockchart example.
Change-Id: I82115738ada4fe6a77023a56e962c71284ebc91b
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Damian Jansen [Fri, 21 Oct 2011 01:01:39 +0000 (11:01 +1000)]
Test for changing bounds of validators and acceptableInput
Task-number: QTBUG-19956
Change-Id: I771477d99939ef986bf3fa53e64a372f23ef5593
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Alan Alpert [Thu, 20 Oct 2011 00:52:29 +0000 (10:52 +1000)]
Removing some stale comments.
Change-Id: If30a6e044c1e15dbbbd9dfca44fe64572099ea13
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Wed, 19 Oct 2011 08:17:55 +0000 (18:17 +1000)]
Replace Smiles with Starfish
And a bear.
Change-Id: I9809bca1664a7fe1aa6734edc986440b6ca2a63c
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Jason McDonald [Wed, 19 Oct 2011 03:24:34 +0000 (13:24 +1000)]
Remove SkipMode from qtestlib API.
The SkipMode parameter to QSKIP has been removed in qtbase, therefore it
must also be removed here.
Task-number: QTBUG-21851, QTBUG-21652
Change-Id: I8016f8c28338b1b532bdb593c796d699b99250dc
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Damian Jansen [Thu, 20 Oct 2011 02:44:43 +0000 (12:44 +1000)]
Unit test for QTBUG-21742
Test for crash when accessing a ListView in an odd way.
Change-Id: I47dd8f4eaa2990c6842cf95a62ce925edac26f9a
Reviewed-by: Glenn Watson <glenn.watson@nokia.com>
Damian Jansen [Thu, 20 Oct 2011 05:48:29 +0000 (15:48 +1000)]
Test for ASSERT on empty tags in TextEdit
Test for assert if user enters empty text, generally when binding
a Text element to a TextEdit.
Change-Id: I9d5ec511971eb823d1f2388de13eb5cdb82a4477
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Aaron Kennedy [Tue, 18 Oct 2011 04:56:25 +0000 (14:56 +1000)]
Allow QDeclarativeIncubator to be deleted within statusChanged() callback
Change-Id: I17621870b67d8a975545adc27ddaf9695e6a9428
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Tue, 18 Oct 2011 04:10:36 +0000 (14:10 +1000)]
Allow one incubator to start in the statusChanged() of another
Change-Id: I91cb7e2a8ecc67f34cdcadc0b71f819c2881e2da
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Tue, 18 Oct 2011 03:34:20 +0000 (13:34 +1000)]
Behave correctly when AsynchronousIfNested is nested
When AIN is nested within a synchronous AIN, it should behave
synchronously.
Change-Id: Ib3f8281667118d7787967f25e27797f67e581006
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Thu, 20 Oct 2011 08:20:10 +0000 (18:20 +1000)]
Mark qsgcanvasitem test as insignificant.
See QTBUG-22242.
Change-Id: I736455cff04bb4c88f0fd03ecb5fffe028687c12
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Martin Jones [Thu, 20 Oct 2011 05:49:54 +0000 (15:49 +1000)]
Skip failing tests.
Possibly due to V8 update.
Task-number: QTBUG-22238
Change-Id: Ide61c6693726e7b21766cac1166716a3af97e9d5
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Friedemann Kleint [Tue, 18 Oct 2011 09:00:02 +0000 (11:00 +0200)]
Declarative: Fix MSVC and g++ warnings
Potentially severe:
- Fix int/bool mismatches
- Use of uninitialized variable
- Do connectionMask shift operations in 64bit
- Enum type mismatch for QLineControl::EchoMode
Various:
- class/struct mismatches
- UnhandledEnumeration values
- Unused variables
- Constructor initialization order
Change-Id: Ieb52f8990445fe95f94070175a0f9beb66863240
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Jason McDonald [Mon, 17 Oct 2011 09:05:25 +0000 (19:05 +1000)]
Remove copy of tests/shared/util.h.
This module has a copy of qtbase's tests/shared/util.h, the contents of
which have been moved into qtestlib and are now accessible from the
QtTest/QtTest header.
Change-Id: I0be9e21dc9f30629dad283a740b9d80347e01140
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Toby Tomkins [Wed, 19 Oct 2011 03:34:24 +0000 (13:34 +1000)]
Skip test that crashes entire test suite.
Task-number: QTBUG-21995
Change-Id: Ic6b6d052f20e4d8c710e00f7b13bacdc146288d6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Toby Tomkins [Mon, 17 Oct 2011 05:52:18 +0000 (15:52 +1000)]
Correct behavior for passing test, ifdef out failing test.
Task-number: QTBUG-21005, QTBUG-21688
Change-Id: I2b6ada399e7d26045c7f0a767082892332a6a378
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Kai Koehne [Sat, 15 Oct 2011 14:05:13 +0000 (16:05 +0200)]
Debugger: Delete service if inspector plugin fails
Change-Id: Id782ddf17b04abd8efe1f504de7e55f4cc4262bb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Tue, 18 Oct 2011 11:21:27 +0000 (13:21 +0200)]
Debugger: Let inspector plugin compile again
Change-Id: Ic1db404c0a62da7f8f9e31c7b400fba654e92979
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kai Koehne [Tue, 18 Oct 2011 11:13:29 +0000 (13:13 +0200)]
Debugger: Remove visual toolbox from inspector
Change-Id: I8847d52a718a20a04cb23d8f0f5affdb7e038c57
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Martin Smith [Tue, 18 Oct 2011 08:04:30 +0000 (10:04 +0200)]
qdoc3: Remove several "QML:" qualifiers which should no longer be required
Task-number: QTBUG-22123
Change-Id: I78f755f978547685e77f4864bc47d1a2b2602343
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Laszlo Agocs [Mon, 17 Oct 2011 05:20:58 +0000 (08:20 +0300)]
Deliver touch event timestamps in QSGCanvas.
The timestamp in input events is new in Qt5. When making copies of a
touch event this field must be copied too otherwise the event received
by the items will contain a default timestamp of 0.
Change-Id: I87dd337c964f34a6da6db808d83b7311df64fcd5
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Friedemann Kleint [Mon, 17 Oct 2011 14:02:01 +0000 (16:02 +0200)]
Declarative: Give qmlscene top level window flags.
Add menu and close buttons on Windows as well.
Change-Id: Ie458f8f21b14583c1a02d48819ec797e6db7390e
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Mon, 17 Oct 2011 05:15:31 +0000 (15:15 +1000)]
Mark particles tests as significant
Believed to be stable enough for CI now. Except qsgage.
Change-Id: I49d52c3913bb4140de89b769777f9b6d67abbaaa
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Aaron Kennedy [Tue, 18 Oct 2011 03:19:57 +0000 (13:19 +1000)]
Fix assert
Change-Id: I6db293c278f10be7e998ed15fe93b9d328474e6a
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Bea Lam [Tue, 18 Oct 2011 01:09:25 +0000 (11:09 +1000)]
Fix reference to test data file
Change-Id: I04e220635487d76d2908572ceb0f0696f6876e9e
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Aaron Kennedy [Tue, 11 Oct 2011 04:21:42 +0000 (14:21 +1000)]
Simplify expression guard logic
Change-Id: I7d191bc8786452c5a1f14d024ff62d223adebd8b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Andrew den Exter [Wed, 12 Oct 2011 03:02:39 +0000 (13:02 +1000)]
Fix TextInput echoMode test failure.
The default input method hints for a QSGItem is Qt::ImhMultiline and
TextInput is a single line input so clear that default flag in init.
Task-number: QTBUG-21686
Change-Id: I3b57227ee4182bf89f6789f775b56efb156df85b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Wed, 12 Oct 2011 01:21:29 +0000 (11:21 +1000)]
Remove the InputContext module.
The input context module provided a bridge between QML and a
QInputContext which allowed an application to implement it's own input
method in-process. However since QInputContext has been replaced and
now only exists as a QWidget compatibility API this module no longer
works with the QtQuick 2 items and porting it to the new
QPlatformInputContext API does not seem to be an option as there is
no way to override the instance provided by the platform integration.
Change-Id: Ica602377436fcea42b9ffd05e1b347e2ee52acc8
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Tue, 11 Oct 2011 03:09:42 +0000 (13:09 +1000)]
Don't keep a cache of created QSGDragAttached objects.
It's unnecessary and can potentially return stale objects.
Change-Id: Ia04b9a58757ef06d3178e6a64e168f68abc1c9d8
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kai Koehne [Sat, 15 Oct 2011 15:15:45 +0000 (17:15 +0200)]
Debugger: Fix compilation warning
Change-Id: I22fc756ce29bba2834bbdcaa40a9769a5391e337
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Sat, 15 Oct 2011 14:56:40 +0000 (16:56 +0200)]
Fix QDeclarativeInspector when starting with ,block
Change-Id: I3797567f22f61abf59ec5332ebc74b3fa37ede93
(cherrypicked from commit
6cb43a9b72c67b71409a59fdeb419f390441f0c7)
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Sat, 15 Oct 2011 13:56:06 +0000 (15:56 +0200)]
Debugger: Create InspectorService only when debugging is enabled
Change-Id: Ie9704233012b0bd0e473c5ee6011e6382c61900f
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Kai Koehne [Mon, 17 Oct 2011 12:13:01 +0000 (14:13 +0200)]
Debugger: Make QDeclarativeDebugJS autotest more robust & faster
Also compile it by default (again).
Change-Id: I04537e29d48cd1918160fe57220eecf1a72a8e66
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Kent Hansen [Mon, 17 Oct 2011 11:03:58 +0000 (13:03 +0200)]
Fix coding style issues
Avoid Qt Sanity Bot noise when these files are moved.
Change-Id: I714e949837909883fe7e387ae336d2ffc4a1912b
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Kent Hansen [Fri, 14 Oct 2011 06:13:44 +0000 (08:13 +0200)]
Tidy up some more declarative includes
Remove file dependencies that aren't needed.
Change-Id: I0496ef9435141528f680bbd326da55c3a31e5978
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kent Hansen [Wed, 12 Oct 2011 06:26:22 +0000 (08:26 +0200)]
Clean up declarative includes
(This commit is in preparation of moving several files
to a separate library (QtQuick2).)
Don't add all subfolders to the includepath (from the
.pri files). There's no good reason to do that.
For headers (both public and private) that are in the
same folder as the file that includes them, prefer to use
#include "foo.h"
#include "bar_p.h"
For public headers that are outside the current folder
but have "unambiguous" names (e.g. qdeclarative prefix), use
#include <foo.h>
For private headers that are outside the current folder, use
#include <private/baz_p.h>
Also change
#include <QtDeclarative/private/foo_p.h>
to
#include <private/foo_p.h>
The header filenames already have a qdeclarative or qsg
prefix; there's no need to prefix by module name to
disambiguate.
Finally,
#include "private/foo_p.h"
should be avoided. private/ is used for auto-generated
(forwarding) headers, which never reside in the current
(source) directory. Use angle brackets instead.
Change-Id: I04f8477fdba043546064ee276475c09dc373f8f2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Kai Koehne [Sat, 15 Oct 2011 15:52:17 +0000 (17:52 +0200)]
Debugger: Remove outdated test stub
This stub is testing the QScriptEngineAgent interface, which is deprecated.
Change-Id: I192a7b9aed0fa49f413bd6048e874414dab8256b
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Kai Koehne [Sat, 15 Oct 2011 15:43:55 +0000 (17:43 +0200)]
Debugger: Move debugging autotests into own folder
This mirrors the source tree structure and
makes it easier to run them all in one go.
Change-Id: Ia191790eaec2c409857c41aff479d2ebd144aaf8
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Bea Lam [Mon, 17 Oct 2011 05:50:07 +0000 (15:50 +1000)]
Fix GridView to repaint when geometry changes
Task-number: QTBUG-22078
Change-Id: Ic0ad67832dad9a7b3a7e5501893befe2d30b6c94
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Toby Tomkins [Mon, 17 Oct 2011 04:46:07 +0000 (14:46 +1000)]
Remove insignificant flag from tests, some failing test cleanup.
Task-number: QTBUG-21054 QTBUG-21004
Change-Id: I9d1a3ca99363949eee952e1bd09aabef82fc1831
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Alan Alpert [Mon, 17 Oct 2011 04:17:41 +0000 (14:17 +1000)]
Add Affector Benchmark
Just for generic affector.
Change-Id: I62acf524eb2c6491bc88fd687a0065866d7ceaaa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Mon, 17 Oct 2011 02:02:22 +0000 (12:02 +1000)]
Stabilize Particles Tests
A couple of targeted fixes, plus enabling
QUnifiedTimer::consistentTiming.
Task-number: QTBUG-21867
Change-Id: I62acf524eb2c6491bc88fd687a0065866d7ce8aa
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Alan Alpert [Fri, 14 Oct 2011 03:06:41 +0000 (13:06 +1000)]
Initial particle system benchmark
Exposed another function on ParticleSystem in order to work.
Change-Id: I62acf524eb2c6491bc88fd687a0065866d7ce852
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Bea Lam [Mon, 17 Oct 2011 02:39:22 +0000 (12:39 +1000)]
Fix tests
Fix referenced test data file and don't wait so long for move
to process
Change-Id: I55571e99015f2799a231365532aa1778e148f9e5
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Martin Jones [Thu, 13 Oct 2011 07:41:51 +0000 (17:41 +1000)]
Cannot flick to the end of a horizontal ListView with LayoutMirroring
Forward port of fix for QTBUG-21756.
minXExtent calculated the offset due to highlight range incorrectly
(reversed) when mirroring enabled. Also us same algorithm for fixup()
in GridView and ListView uses.
For QtQuick 2, this change also reverses the beginning and end highlight
range, as it should be, i.e. the preferredHighlightBegin is from the
right side in RightToLeft mode. Also added snapping tests.
Task-number: QTBUG-21756
Change-Id: Ica0ba4ab5db0ce9c77f2da75e9f8293550bd37d1
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Tue, 11 Oct 2011 01:09:17 +0000 (11:09 +1000)]
Merge PropertyCache::Data and ValueTypeData
Change-Id: I22cbb159d009151dd77ecbcdad16f27ecb9d6dba
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Alan Alpert [Tue, 11 Oct 2011 04:16:33 +0000 (14:16 +1000)]
Allow sizing of TrailEmitter emit area based on particle size
Change-Id: I7ce2ba29459b9a66e62933f9bfb9e066baedaaef
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Rohan McGovern [Fri, 14 Oct 2011 00:34:04 +0000 (10:34 +1000)]
Eliminated usage of qttest_p4.prf.
Missed from
47e1b91b47dcf59dbeff2740add94ceda188c6bc.
Change-Id: I64d6174eb98eb45e1ba7c28ae5a122f58e2522a6
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Alan Alpert [Fri, 14 Oct 2011 07:06:39 +0000 (17:06 +1000)]
Add Move affector
Slated to replace the 'Gravity' affector which only did one specialized
gravity usecase anyways. This one is more generic.
Change-Id: I3cbb975bad24e8f6fca7e07b671aa8ba5a3a916c
Reviewed-on: http://codereview.qt-project.org/6657
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Bea Lam [Wed, 12 Oct 2011 04:30:18 +0000 (14:30 +1000)]
Fix insertions above the visible index
The first visible item was repositioned incorrectly after an insertion
above the visible index since any insertions above the position + cache
buffer were ignored and not considered for repositioning the first item.
GridView insertion code has changed to be similar to the ListView
implementation to fix various issues when inserting above the visible
index and to remove code that crossed indexes from visibleItems with
model indexes and visible indexes.
Also adds extra insertion tests for ListView and GridView.
Change-Id: I5e129c605fdad733b61bd29850465b3b752fb63f
Reviewed-on: http://codereview.qt-project.org/6485
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Friedemann Kleint [Wed, 12 Oct 2011 15:22:41 +0000 (17:22 +0200)]
Remove QMetaObjectBuilder from declarative.
Link on Windows.
Change-Id: Idca11c1a21ad5aebf79d6487692d912b4dea249f
Reviewed-on: http://codereview.qt-project.org/6553
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
juhvu [Wed, 12 Oct 2011 04:05:38 +0000 (14:05 +1000)]
(private-) export QSGShaderEffectTexture
QtLocation maps need to be able to render standard QML elements
as Map items (for example a convenience store logo and text).
Prior to Qt5 this was achieved with Qt graphics view framework.
This export is needed in order to be able to ask QML engine
to generate/update/render textures as needed.
Only private symbol really used is the updateTextures().
This commit complements the related earlier commit
1780033cb259bbb166fe9b4b14c92829a8e1800e
Change-Id: I98b2083b6a4d25fdd113ac4d95a9b9a2bb13a1f1
Reviewed-on: http://codereview.qt-project.org/6475
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Michael Brasser [Wed, 12 Oct 2011 06:16:09 +0000 (16:16 +1000)]
Add missing autotests to declarative.pro.
Change-Id: Icf43fc3aa69ac80fc077318d903becf3b78cc55b
Reviewed-on: http://codereview.qt-project.org/6492
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
Michael Brasser [Fri, 14 Oct 2011 02:02:43 +0000 (12:02 +1000)]
More use of TESTDATA macro.
Change-Id: I65ff7aa44e18a60e431d30efec2717d2ce5f95e4
Reviewed-on: http://codereview.qt-project.org/6641
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Charles Yin [Fri, 14 Oct 2011 03:07:37 +0000 (13:07 +1000)]
only use one QSGView instance for all qml test cases
Change-Id: I9296e30d216b57d8cf2a11e94030781f03594aa6
Reviewed-on: http://codereview.qt-project.org/6646
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Damian Jansen [Fri, 14 Oct 2011 01:37:25 +0000 (11:37 +1000)]
Tst_qsgitem2 test update inline with refactor
Change widget to window based code
Make compile and pass
Add license header
Change-Id: Id0826bf644836654de7eff559a8ff40a55d02616
Reviewed-on: http://codereview.qt-project.org/6635
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Aaron Kennedy [Fri, 14 Oct 2011 01:45:09 +0000 (11:45 +1000)]
QDeclarativeIncubator wasn't calling statusChanged() for nested cases
Change-Id: I1811951bdcdd69d4ad1643ed54a8ea097fa718b5
Reviewed-on: http://codereview.qt-project.org/6638
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Bea Lam [Fri, 14 Oct 2011 00:20:08 +0000 (10:20 +1000)]
Fix creation context for delegates
As per
cdf868033bbd7bf5a996c67fa56f8ac15e755115 for ListView and
GridView.
Change-Id: I6928a1fd4df51265124925530e81704dbdc5af46
Reviewed-on: http://codereview.qt-project.org/6629
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Kent Hansen [Wed, 12 Oct 2011 05:31:48 +0000 (07:31 +0200)]
Remove unneeded include
Change-Id: I8db00cee46dfb7f2a3bc4e73d093be3d766a8f7c
Reviewed-on: http://codereview.qt-project.org/6486
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Michael Brasser [Wed, 12 Oct 2011 03:46:02 +0000 (13:46 +1000)]
Use TESTDATA macro in declarative tests.
Includes a few other minor cleanups as well.
Task-number: QTBUG-21721
Change-Id: I5b1c2c116e63748c6b4199183212de8a00037af1
Reviewed-on: http://codereview.qt-project.org/6473
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Jason McDonald [Wed, 12 Oct 2011 05:44:20 +0000 (15:44 +1000)]
Don't build empty tests.
These tests need the xmlpatterns module. If that module is not in the
Qt build, then avoid building the test rather than building an empty
test.
Change-Id: Id0f72cfc9f818096361ecbc439196d2d5c64322e
Reviewed-on: http://codereview.qt-project.org/6487
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Kai Koehne [Tue, 11 Oct 2011 15:08:26 +0000 (17:08 +0200)]
QDeclarativeDebugTrace: Speed up appending elements to trace
Using a QVector with a Q_MOVABLE_TYPE with QVector should speed up
appending stuff by a magnitude.
Change-Id: Icf5cee87a0f35d81bf85f833f5656a9b296c80fd
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Mikko Harju [Wed, 12 Oct 2011 06:41:10 +0000 (09:41 +0300)]
Fix V8 heap snapshot in profiler service
Fixes the message parsing (use the option also for heap snapshot
commands).
Do not directly serialize the snapshot to the QByteArray under
QDataStream.
Change-Id: I3ad15a2debd6c2f912854610b6434744e0acd788
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Simon Hausmann [Wed, 12 Oct 2011 08:50:50 +0000 (10:50 +0200)]
Fix compilation on Harmattan
Fix issues with QString::QString(const char*)' being private
Change-Id: Ie3152d5fe952976dbda0ecb9dc28f9b6b5a1fab4
Reviewed-on: http://codereview.qt-project.org/6508
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Rohan McGovern [Wed, 12 Oct 2011 05:08:14 +0000 (15:08 +1000)]
Removed references to unused PULSE_TESTS variable
This has not been used for a very long time (since before QtDeclarative
was merged into Qt4).
Change-Id: Ie5b4578582d7b04784f11db3d8ce92ba258b782d
Reviewed-on: http://codereview.qt-project.org/6484
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Toby Tomkins [Wed, 12 Oct 2011 01:37:14 +0000 (11:37 +1000)]
Modify existing behavior to explicitly test functionality.
Task-number: QTBUG-21001
Change-Id: I63d0d56cc05328350804ad03cbc9a943a84d03c3
Reviewed-on: http://codereview.qt-project.org/6377
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Andrew den Exter [Fri, 30 Sep 2011 07:17:49 +0000 (17:17 +1000)]
Provide a context when constructing a TextInput cursor delegate.
Without a context the delegate won't be able to refer to any external
properties.
Task-number: QTBUG-21780
Change-Id: I7171787e677ce67466b311796693ed88bcacb718
Reviewed-on: http://codereview.qt-project.org/5837
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Mon, 10 Oct 2011 06:38:07 +0000 (16:38 +1000)]
Rename QDeclarativeV4 -> QV4
Change-Id: Ic35e0ad1663cafe4aa535594dc3999a2d317ce0e
Reviewed-on: http://codereview.qt-project.org/6301
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
Toby Tomkins [Tue, 11 Oct 2011 07:53:10 +0000 (17:53 +1000)]
Remove insignificant test status and explicitly mark failing test.
Task-number: QTBUG-21946
Change-Id: If1837a23041b52dc1f148821f483281975626d79
Reviewed-on: http://codereview.qt-project.org/6374
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Toby Tomkins [Tue, 11 Oct 2011 23:49:53 +0000 (09:49 +1000)]
Remove insignificant flag for passing tests.
Change-Id: Ic8c5e7871b240572b882825c91e0a544856da687
Reviewed-on: http://codereview.qt-project.org/6384
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Charles Yin [Tue, 11 Oct 2011 01:37:49 +0000 (11:37 +1000)]
fix crash bug when unloading canvas
Task-number:QTBUG-21935
Change-Id: If4a2a92b2f53cf81a48d023df8a1e6d11e522e0d
Reviewed-on: http://codereview.qt-project.org/6370
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Charles Yin [Tue, 11 Oct 2011 06:23:50 +0000 (16:23 +1000)]
fix several canvasitem bugs
Change-Id: I6a6d97253fe66184736f8ac089e97aa114f0e83a
Reviewed-on: http://codereview.qt-project.org/6405
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Andrew den Exter [Wed, 28 Sep 2011 23:58:42 +0000 (09:58 +1000)]
Allow view items to be preserved.
Do not destroy items that are members of the VisualDataModel
persistedItems group when they are released by the view.
The create function on VisualDataGroup will return a reference to
an instantiated item within that group, any item returned by this
function is automatically added to the persistedItems group and can
be released by removing it from the group. Uninstantiated items added
to the persistedItems group by any other means are not instantiated
until requested by a view or create.
Task-number: QTBUG-21518
Task-number: QTBUG-20854
Change-Id: I59554711208504c8f20a3ebe783bddab9b21a558
Reviewed-on: http://codereview.qt-project.org/5831
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Aaron Kennedy [Tue, 11 Oct 2011 00:51:06 +0000 (10:51 +1000)]
Remove aggregated heap snapshots
Newer versions of v8 only support full snapshots.
Change-Id: I2c6778579bdb2ec1cc38868bf4fa76ce3fbc1633
Reviewed-on: http://codereview.qt-project.org/6406
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Mon, 10 Oct 2011 03:52:34 +0000 (13:52 +1000)]
Optimize signal handling
Bindings connect to lots of signals that are never emitted. By managing
signal connection lists ourselves, we can do a much better job than Qt's
generic signal/slot connection logic.
Also, by connecting to QDeclarativeNotifierEndpoint's rather than QObject
slots, we can eliminate the need to instantiate a QObject for the V4 and
V8 binding managers.
Change-Id: I598667deaefdbd2860227bd74378a1b196761686
Reviewed-on: http://codereview.qt-project.org/6278
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
Aaron Kennedy [Fri, 7 Oct 2011 03:16:47 +0000 (13:16 +1000)]
Component.incubateObject() autotest
Change-Id: I37f76d5b273ae4f032c4de5ac8fcbff4204b78fe
Reviewed-on: http://codereview.qt-project.org/6200
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Sanity-Review: Aaron Kennedy <aaron.kennedy@nokia.com>
Yann Bodson [Thu, 22 Sep 2011 01:34:58 +0000 (11:34 +1000)]
Improvements to text layouting in QML
Allow more control over the text layouting process in QML.
Give access to every text line through a hook, this gives the
opportunity to position and resize a line as it is being laid out.
It is then possible to lay out the text in columns or around other
objects.
Task-number: QTBUG-21367
Change-Id: I56dc0c1c4b575dc06360c135098024d0324d3656
Reviewed-on: http://codereview.qt-project.org/5351
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
Sanity-Review: Yann Bodson <yann.bodson@nokia.com>
Christiaan Janssen [Fri, 7 Oct 2011 15:35:53 +0000 (17:35 +0200)]
QmlProfiler: send end of trace event
Change-Id: I2e857028bde15145d5d01c6f5325a4ceabb37e27
Reviewed-on: http://codereview.qt-project.org/6434
Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>