profile/ivi/qtdeclarative.git
13 years agoDon't do run svg tests when no svg is available
Gunnar Sletta [Wed, 28 Sep 2011 08:32:19 +0000 (10:32 +0200)]
Don't do run svg tests when no svg is available

Change-Id: I6625a9e1542ffc962d5b2c414832575e450a9e61
Reviewed-on: http://codereview.qt-project.org/5690
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoBuild with qt-in-namespace
Kent Hansen [Wed, 28 Sep 2011 07:57:04 +0000 (09:57 +0200)]
Build with qt-in-namespace

Change-Id: Ia57e4f14d94ad63194dad52892bedf316a58a79a
Reviewed-on: http://codereview.qt-project.org/5693
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoDon't crash when Image.source change
Gunnar Sletta [Tue, 27 Sep 2011 15:04:03 +0000 (17:04 +0200)]
Don't crash when Image.source change

QDeclarativePixmap::clear() may result in the texture being
scheduled for deletion, so we need to make sure that our texture
provider is updated properly whenever the source changes.

Change-Id: Ie21c6fcba4b0cd438250dc4c263b513060cc026e
Reviewed-on: http://codereview.qt-project.org/5673
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoAdd support for onLinkActivated with Text.StyledText
Yann Bodson [Tue, 27 Sep 2011 02:56:17 +0000 (12:56 +1000)]
Add support for onLinkActivated with Text.StyledText

Change-Id: If7efa09e0e42970c6cb6ca8725713eb4a6f97ac8
Reviewed-by: Michael Brasser
Reviewed-on: http://codereview.qt-project.org/5665
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
13 years agoFix crash in String.arg()
Chris Adams [Mon, 19 Sep 2011 01:00:14 +0000 (11:00 +1000)]
Fix crash in String.arg()

This commit ensures that the String.arg() function works correctly,
by registering an anonymous function with the String Prototype object
which calls the StringArg function, ensuring that the "this" object
is valid (and passing the string as an argument to StringArg instead).

Change-Id: I0a8cbaa12b39beb03a237c3ab62c6e21fafdedbf
Reviewed-on: http://codereview.qt-project.org/4385
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoUse QBasicTimer rather than QTimer in SmoothedAnimation
Martin Jones [Wed, 28 Sep 2011 00:12:08 +0000 (10:12 +1000)]
Use QBasicTimer rather than QTimer in SmoothedAnimation

QBasicTimer does the same job for lower cost.

Change-Id: I11d7033b9c456129f3f984c8baafa717f5b25d99
Reviewed-on: http://codereview.qt-project.org/5649
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoEnable QSGTextEdit and QSGTextInput failures.
Andrew den Exter [Tue, 27 Sep 2011 05:53:46 +0000 (15:53 +1000)]
Enable QSGTextEdit and QSGTextInput failures.

Fix compilation errors and skip or expect fail any tests that don't
pass.  The following tasks have been created for failing tests:

QTBUG-21686
QTBUG-21689
QTBUG-21690
QTBUG-21691
QTBUG-21693

Change-Id: I3f5bb275e1a207ebdf86e3d523cdeda1f943eb63
Reviewed-on: http://codereview.qt-project.org/5583
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years ago[autotests] Added expected failure for developer build in currentIndex test.
Toby Tomkins [Tue, 27 Sep 2011 03:11:06 +0000 (13:11 +1000)]
[autotests] Added expected failure for developer build in currentIndex test.

Task-number: QTBUG-21682

Change-Id: Icbe3ef45c9c58b54c195993b837713aef1dd3ca2
Reviewed-on: http://codereview.qt-project.org/5571
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years ago[autotest] Abort an unstable test for developer build.
Toby Tomkins [Tue, 27 Sep 2011 04:20:49 +0000 (14:20 +1000)]
[autotest] Abort an unstable test for developer build.

Task-number: QTBUG-21688

Change-Id: I732c6dc8baa7942521cf3b9d4960a3f405d07aa2
Reviewed-on: http://codereview.qt-project.org/5577
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years ago[autotests] Added expected failures for developer build in a number of tests.
Toby Tomkins [Tue, 27 Sep 2011 03:42:45 +0000 (13:42 +1000)]
[autotests] Added expected failures for developer build in a number of tests.

Task-number: QTBUG-21683

Change-Id: I0cc6150daed38a8f2207fa848be79e8cc6c56b48
Reviewed-on: http://codereview.qt-project.org/5573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years ago[autotest] Abort an unstable test for developer build.
Toby Tomkins [Tue, 27 Sep 2011 03:57:07 +0000 (13:57 +1000)]
[autotest] Abort an unstable test for developer build.

Task-number: QTBUG-21685

Change-Id: I96abcc88d861ce2c5b8778b56f34d42b58c4eb53
Reviewed-on: http://codereview.qt-project.org/5574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years ago[autotests] Added expected failure for developer build.
Toby Tomkins [Tue, 27 Sep 2011 04:05:33 +0000 (14:05 +1000)]
[autotests] Added expected failure for developer build.

Task-number: QTBUG-21687

Change-Id: I46f8e9c693d0fe3de48ea0f3fd967cc5ca8d1d30
Reviewed-on: http://codereview.qt-project.org/5575
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoImproved testdata deployment.
Rohan McGovern [Tue, 27 Sep 2011 05:07:50 +0000 (15:07 +1000)]
Improved testdata deployment.

Don't embed the source path into the binary, instead find the testdata
relative to the test's binary at runtime.

Use DEPLOYMENT hints for installing testdata to a device.

Change-Id: I4005422bb76adf214166fe75d66e82fb18ded04e
Reviewed-on: http://codereview.qt-project.org/5578
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoManually apply SnapOneItem/Row changes from Qt 4.7
Martin Jones [Mon, 26 Sep 2011 03:13:02 +0000 (13:13 +1000)]
Manually apply SnapOneItem/Row changes from Qt 4.7

Apply following changes to Qt 5 for both QtQuick1 and QtQuick2 items:
cf23188de237009136fa1480ab8fd9e3ca364769
f85819fe083ae7c6804c884de68e906d153a6d11
09cd2f818208a83489fae034b80e6497b7cc83af

Task-number: QTBUG-20683
Change-Id: I974764e57e3004514bb4c9f46c5152ad07c136a7
Reviewed-on: http://codereview.qt-project.org/5484
Reviewed-by: Bea Lam <bea.lam@nokia.com>
13 years agoAdd QSGPaintedItem docs to module and fix non-standard wording.
Casper van Donderen [Wed, 21 Sep 2011 05:13:38 +0000 (07:13 +0200)]
Add QSGPaintedItem docs to module and fix non-standard wording.

Change-Id: I763b1fdabdac36935bd14005a9e38b2494319726
Reviewed-on: http://codereview.qt-project.org/5521
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
13 years agoAdd convenience macro for fast connects in declarative.
Michael Brasser [Thu, 22 Sep 2011 03:14:00 +0000 (13:14 +1000)]
Add convenience macro for fast connects in declarative.

We already follow this pattern several places, so
this commit creates a convenience macro for it, and replaces
previous usage where appropriate. Also adds the macro
several places as further optimization.

Change-Id: Ieff5ed6cc51c34d0a1c8aa42ac40314ea243477a
Reviewed-on: http://codereview.qt-project.org/5342
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years ago[autotests] Added expected failure for developer build in currentIndex test.
Toby Tomkins [Tue, 27 Sep 2011 03:02:25 +0000 (13:02 +1000)]
[autotests] Added expected failure for developer build in currentIndex test.

Task-number: QTBUG-21680

Change-Id: Ic33f4f4fc96529e0a3b2be4150829ab62fe078ff
Reviewed-on: http://codereview.qt-project.org/5565
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoPart of bug has re-occurred, relates to x{} behaviour.
Toby Tomkins [Tue, 27 Sep 2011 01:55:27 +0000 (11:55 +1000)]
Part of bug has re-occurred, relates to x{} behaviour.

Task-number: QTBUG-12295

Change-Id: Idcb9ceac1ad0b093e560ef793820a1ea2178c51e
Reviewed-on: http://codereview.qt-project.org/5483
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoDisable reordering as it is currently broken
Gunnar Sletta [Mon, 26 Sep 2011 08:45:28 +0000 (10:45 +0200)]
Disable reordering as it is currently broken

Change-Id: I28b622422aff62ea988a2918830338736df6fdbe
Reviewed-on: http://codereview.qt-project.org/5528
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoMake surface format plugable from the scene graph plugin
Gunnar Sletta [Fri, 23 Sep 2011 14:24:06 +0000 (16:24 +0200)]
Make surface format plugable from the scene graph plugin

Also enable depth, stencil and samples by default as our default
renderer requires both depth and stencil and our default rounded
rectangles require multisampling

The user should be able to override the default format, by getting
the QSGCanvas::format(), modify it and set it back, but this
is currently not supported in QWindow, so that will have to wait

Change-Id: I1869003705709987ab2e9a3cebbeeec4d45a2021
Reviewed-on: http://codereview.qt-project.org/5464
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoDon't give move ids to moved inserts.
Andrew den Exter [Mon, 26 Sep 2011 06:42:17 +0000 (16:42 +1000)]
Don't give move ids to moved inserts.

Move ids identify a paired remove and insert, an insert that has a
move id but no corresponding remove breaks anything relying on that
identity.

Change-Id: I9512e298bc518c5abf5bca7523a375baf8a39407
Reviewed-on: http://codereview.qt-project.org/5512
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoFix missing/outdated license headers.
Jason McDonald [Mon, 26 Sep 2011 04:55:21 +0000 (14:55 +1000)]
Fix missing/outdated license headers.

Change-Id: I381398b0c4f80db689a59797e2faeab5b14503eb
Reviewed-on: http://codereview.qt-project.org/5491
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoCall QWARN() instead of QTest::qWarn().
Jason McDonald [Mon, 26 Sep 2011 03:30:47 +0000 (13:30 +1000)]
Call QWARN() instead of QTest::qWarn().

The QWARN macro wraps QTest::qWarn(), but the former is the public API
and the latter is merely an implementation detail that is subject to
change.

Change-Id: I02ae5ea384875afb7f235ef8dff0768a56afaa53
Reviewed-on: http://codereview.qt-project.org/5486
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoAbort entire test as failures continue.
Toby Tomkins [Mon, 26 Sep 2011 01:50:19 +0000 (11:50 +1000)]
Abort entire test as failures continue.

Change-Id: Ibf9d53e9a2e2ec125760f9f0ffb5a126273df7f2
Reviewed-on: http://codereview.qt-project.org/5482
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoSupport margins in Flickable.
Martin Jones [Fri, 23 Sep 2011 06:13:51 +0000 (16:13 +1000)]
Support margins in Flickable.

It is sometimes desireable to leave a margin/add decoration around the
content of a Flickable.  This adds topMargin, leftMargin, bottomMargin
rightMargin, xOrigin and yOrigin properties to Flickable.

Task-number: QTBUG-21362
Change-Id: Ia24ea4c63e7a8de683b68100baac782c6f3a66bb
Reviewed-on: http://codereview.qt-project.org/5445
Reviewed-by: Bea Lam <bea.lam@nokia.com>
13 years agoFix QSGTextEdit::closeSoftwareInputPanel()
Joona Petrell [Thu, 22 Sep 2011 14:45:22 +0000 (17:45 +0300)]
Fix QSGTextEdit::closeSoftwareInputPanel()

Change-Id: If50486b3159a9e40b2808a2a18aff5668012ea76
Reviewed-on: http://codereview.qt-project.org/5400
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Pekka Vuorela <pekka.ta.vuorela@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoGet rid of redundant type member from V4 instructions
Kent Hansen [Thu, 22 Sep 2011 11:40:48 +0000 (13:40 +0200)]
Get rid of redundant type member from V4 instructions

When interpretation is threaded, the type member is
redundant, since we can obtain the type from the
instruction address.

Getting rid of the type member can save at least one
byte per instruction (possibly more because of
alignment). On ia32, the Noop and Block instructions
become 4 bytes smaller.

The compiler has been refactored to leave it up to
the Bytecode class to decide whether the instruction
address or type (enum) should be stored.

To achieve this, the "low-level" Instr union was
renamed to V4Instr, and the new Instr struct
used by the compiler provides typedefs for
instantiating the data used by each particular
instruction. Lastly, the gen() function (instruction
emitter) was made template-based to provide the
instruction type.

The instructions Bool, Int, Real, String were
renamed to Load{Bool,Int,Real,String} to make the
new code more readable.

This approach follows a similar refactoring in the
QML-VME interpreter.

Change-Id: I9bf16b099a85afdfb719a25fb18047408882d61e
Reviewed-on: http://codereview.qt-project.org/5393
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agodo not pollute the global namespace
Gunnar Sletta [Thu, 22 Sep 2011 19:23:07 +0000 (21:23 +0200)]
do not pollute the global namespace

Change-Id: I6a6bd1b9ff89535c7af0f11dd9c501945ee0718b
Reviewed-on: http://codereview.qt-project.org/5428
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years ago[tests] Fix unit test compilation, now uses QWidget.
Toby Tomkins [Fri, 23 Sep 2011 05:52:07 +0000 (15:52 +1000)]
[tests] Fix unit test compilation, now uses QWidget.

Fixed unit test, also enabled this autotest to run.

Change-Id: I92ad1a17d1fa4674a0746767d6a4100b21999a43
Reviewed-on: http://codereview.qt-project.org/5440
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoRemove all font examples from qpa platform tests
Toby Tomkins [Fri, 23 Sep 2011 01:12:22 +0000 (11:12 +1000)]
Remove all font examples from qpa platform tests

Remove all font examples, and re-enable all platform example tests.

Task-number: QTBUG-21415

Change-Id: I87448cedd7f03b9483e8ec4d90474afa4d62b9c2
Reviewed-on: http://codereview.qt-project.org/5417
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoDefensive Programming
Alan Alpert [Fri, 23 Sep 2011 03:24:35 +0000 (13:24 +1000)]
Defensive Programming

Task-number: QTBUG-21623
Change-Id: Ib906e6b50041d4e72034d6828d4dc7c503ec7bb4
Reviewed-on: http://codereview.qt-project.org/5426
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoMake delegates visible
Alan Alpert [Fri, 23 Sep 2011 03:03:20 +0000 (13:03 +1000)]
Make delegates visible

Change-Id: Ia932396419e41692431a9ce5e964331700810677
Reviewed-on: http://codereview.qt-project.org/5424
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoDoc: Added a simple introduction to Qt and fixed links.
David Boddie [Thu, 16 Jun 2011 18:24:11 +0000 (20:24 +0200)]
Doc: Added a simple introduction to Qt and fixed links.

Change-Id: I941bde15897e3ae51756d0ae4d3d011a7a3c4511
Reviewed-on: http://codereview.qt-project.org/1976
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Peter Yard <peter.yard@nokia.com>
13 years agoFix documentation
Alan Alpert [Thu, 22 Sep 2011 08:38:42 +0000 (18:38 +1000)]
Fix documentation

Had x in the y docs, and the pointX/Y weren't relative as the docs had
stated.

Change-Id: I709f3a30dc527d22abc2ab3987bea359c0e66214
Reviewed-on: http://codereview.qt-project.org/5376
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoUse m_pleaseReset more consistently
Alan Alpert [Thu, 22 Sep 2011 07:29:47 +0000 (17:29 +1000)]
Use m_pleaseReset more consistently

Everyone had their own, and so they could conflict or be randomly
un-initialized.

Change-Id: Ife2c5d9972b881235e4d3a5e2a33979174de2fbc
Reviewed-on: http://codereview.qt-project.org/5370
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFurther delay animation creation in Behavior.
Michael Brasser [Thu, 22 Sep 2011 23:44:09 +0000 (09:44 +1000)]
Further delay animation creation in Behavior.

Previously we always created the animation on the first call to write,
regardless of whether the Behavior was enabled. Now we delay until the
animation is needed.

Change-Id: I14a319a4f045050fe6a99427b7c3804ef078d48d
Reviewed-on: http://codereview.qt-project.org/5414
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoRemove fonts example from qpa platform tests
Toby Tomkins [Tue, 13 Sep 2011 06:26:21 +0000 (16:26 +1000)]
Remove fonts example from qpa platform tests

Task-number: QTBUG-21415

Change-Id: I82b1600fe74a50dee8651247fcd172f09ba45a64
Reviewed-on: http://codereview.qt-project.org/4724
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agopartial build fix replaced QApplication::setActiveWindow with requestActivateWindow...
Matthew Cattell [Thu, 22 Sep 2011 15:31:52 +0000 (17:31 +0200)]
partial build fix replaced QApplication::setActiveWindow with requestActivateWindow and added widgets-private

Change-Id: I6e2a3b51c10684de974a0954ca4182860d351eef
Reviewed-on: http://codereview.qt-project.org/5403
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoFix extra selection in QML TextEdit
Eskil Abrahamsen Blomfeldt [Thu, 22 Sep 2011 07:20:52 +0000 (09:20 +0200)]
Fix extra selection in QML TextEdit

QSGTextEdit::selectionEnd() interprets the selection end as the
first character after the selection, while QSGTextNode expects it
to be the end of the selection.

Task-number: QTBUG-21533
Change-Id: Ia928602f8a2f845f3990a443e62f640ea72aa1d4
Reviewed-on: http://codereview.qt-project.org/5363
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoMake the QML/VME interpreter threaded
Kent Hansen [Tue, 20 Sep 2011 09:38:26 +0000 (11:38 +0200)]
Make the QML/VME interpreter threaded

This gets rid of the two-level dispatch in the
interpreter loop, which gives a nice performance boost
when many VME instructions must be interpreted
(e.g., 40% faster for 100 StoreInteger instructions).

The threading is implemented in a similar way to the
V4 interpreter.

The way the compiler generates instructions has been
refactored, chiefly to get rid of the
QDeclarativeInstruction::setType() calls (when using
threading, we don't store the instruction type at all,
only the address).

As a nice bonus, the way instructions are defined now
(creating the specific instruction's data type, rather
than a generic (union) type) is more compact and less
error-prone.

Change-Id: If5cbd36b2526fd61b74854712711b06cd7e1ed7d
Reviewed-on: http://codereview.qt-project.org/5246
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoMake the QML-VME interpreter "threading"-friendly
Kent Hansen [Mon, 19 Sep 2011 11:21:54 +0000 (13:21 +0200)]
Make the QML-VME interpreter "threading"-friendly

Get rid of the while (something); use labels and gotos instead.
This is done in preparation of making the interpreter threaded
(i.e. using computed goto to chain instructions together).

Change-Id: I8f41e5e8295db939225547364dec3f7466f71a2b
Reviewed-on: http://codereview.qt-project.org/5245
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoStop managing lifetime of material
Alan Alpert [Thu, 22 Sep 2011 04:06:05 +0000 (14:06 +1000)]
Stop managing lifetime of material

Let scenegraph handle it in its own thread.

Task-number: QTBUG-21586
Change-Id: I5affcec4abbc79fff0c60e740d2c1cf04e3385f2
Reviewed-on: http://codereview.qt-project.org/5345
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
13 years agoChange burst to use ms instead of s
Alan Alpert [Thu, 22 Sep 2011 05:11:28 +0000 (15:11 +1000)]
Change burst to use ms instead of s

Also renames that variable, and adds a burst example.

Change-Id: I53787612f287e71d9afb5618bd445c8aa72fd39e
Reviewed-on: http://codereview.qt-project.org/5349
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoConstrain while loop on item count
Alan Alpert [Thu, 22 Sep 2011 04:34:57 +0000 (14:34 +1000)]
Constrain while loop on item count

pos won't necessarily change, but item count does like in the above loop

Task-number: QTBUG-21315
Change-Id: Iaedabeacf4ebe3cd0505193395047b3d65a09442
Reviewed-on: http://codereview.qt-project.org/5347
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoRecognize deformable performance level properly
Alan Alpert [Thu, 22 Sep 2011 03:48:19 +0000 (13:48 +1000)]
Recognize deformable performance level properly

Task-number: QTBUG-21305

Change-Id: I88cfe56f0f22abc92a083b2a0a8da059ebefc652
Reviewed-on: http://codereview.qt-project.org/5344
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoTighter bounding box check
Alan Alpert [Thu, 22 Sep 2011 03:42:21 +0000 (13:42 +1000)]
Tighter bounding box check

Because the gernic check works on floats and how .toPoint rounds, we
need to redo the bounds checking inside Turbulence

Task-number: QTBUG-21564
Change-Id: Ib56a8d420d9abf8035360b7908e89e28938799a8
Reviewed-on: http://codereview.qt-project.org/5343
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoWheel event support in qmltestlib + few fixes.
juhvu [Wed, 21 Sep 2011 03:04:11 +0000 (13:04 +1000)]
Wheel event support in qmltestlib + few fixes.

added unit test and orientaion support for mouseWheel

Change-Id: I9c26dc762281bc32965769c151414ac0e177ad0f
Reviewed-on: http://codereview.qt-project.org/5272
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Juha Vuolle <juha.vuolle@nokia.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoAdditional ListView section header placement options
Martin Jones [Tue, 20 Sep 2011 05:58:05 +0000 (15:58 +1000)]
Additional ListView section header placement options

Add a section.labelPositioning property which can be a combination
of:

- ViewSection.InlineLabels - section labels are shown inline between
  the item delegates separating sections (default).
- ViewSection.CurrentLabelAtStart - the current section label sticks to
  the start of the view as it is moved.
- ViewSection.NextLabelAtEnd - the next section label (beyond all visible
  sections) sticks to the end of the view as it is moved.

Task-number: QTBUG-12880
Change-Id: I4601828337412bd3a83769c9b8df3f6d4d7474b8
Reviewed-on: http://codereview.qt-project.org/5192
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
13 years agoFix compilation with QT_NO_*
Tasuku Suzuki [Mon, 2 May 2011 09:23:47 +0000 (11:23 +0200)]
Fix compilation with QT_NO_*

Merge-request: 1206
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit eb61f612fea1b76fe01ee237e5bd160f66aeca3d)

Conflicts:
src/network/access/qhttpthreaddelegate.cpp
src/network/access/qhttpthreaddelegate_p.h

Change-Id: Id4f8154d1b5f69ab490d9818facfdf5a733ec794
Reviewed-on: http://codereview.qt-project.org/4593
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoqmlplugindump: Describe meta object revisions of exported types.
Christian Kamm [Wed, 21 Sep 2011 10:54:10 +0000 (12:54 +0200)]
qmlplugindump: Describe meta object revisions of exported types.

Adds the exportMetaObjectRevisions property to generated qmltypes files.

Change-Id: Iafe2fe408c88bb6dd02cbb558404a5f654431248
Reviewed-on: http://codereview.qt-project.org/5311
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoFix processing of unary T_MINUS_MINUS tokens after semicolon insertion.
Roberto Raggi [Wed, 21 Sep 2011 08:18:40 +0000 (10:18 +0200)]
Fix processing of unary T_MINUS_MINUS tokens after semicolon insertion.

There was a typo in the code, instead of pushing a T_MINUS_MINUS token
the lexer synthesized a T_PLUS_PLUS.

Change-Id: I62dcf263ac363196231fe8f02e98f280899ef85a
Reviewed-on: http://codereview.qt-project.org/5293
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
13 years agoTest qmlmin using the QML/JS files from our test suite.
Roberto Raggi [Wed, 21 Sep 2011 09:00:30 +0000 (11:00 +0200)]
Test qmlmin using the QML/JS files from our test suite.

qmlmin was already tested using files from the
QtDeclarative examples. This patch adds all the files
from QtDeclarative test suite.

Change-Id: I2a7a0e4a45d53f70f53911a5985c860565f10b70
Reviewed-on: http://codereview.qt-project.org/5296
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoqdeclarativesystempalette test: Add missing dependency
Kent Hansen [Wed, 21 Sep 2011 10:58:25 +0000 (12:58 +0200)]
qdeclarativesystempalette test: Add missing dependency

Change-Id: Iefc44448feb621fda81eed6d243bc4a8ee474e7f
Reviewed-on: http://codereview.qt-project.org/5313
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoMake qdeclarativeapplication test compile again
Kent Hansen [Wed, 21 Sep 2011 11:02:38 +0000 (13:02 +0200)]
Make qdeclarativeapplication test compile again

It shouldn't depend on QtWidgets, but using
QGuiApplication doesn't work yet, so skip the
tests for now.

Change-Id: I79473a9ed0486d51c37f498a5e58c503f9533759
Reviewed-on: http://codereview.qt-project.org/5314
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoZero-initialize QSGParticleGroup::m_system.
Christian Kamm [Wed, 21 Sep 2011 07:58:43 +0000 (09:58 +0200)]
Zero-initialize QSGParticleGroup::m_system.

Change-Id: Iaa38e1816ff2f231f588bce155a7b1bf9b21a3e5
Reviewed-on: http://codereview.qt-project.org/5291
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoRestructure test to use QTRY_ macro for instability.
Toby Tomkins [Wed, 14 Sep 2011 03:02:16 +0000 (13:02 +1000)]
Restructure test to use QTRY_ macro for instability.

Restructure test to use QTRY_ for asynchronous gui functions. Remove
reference to specific X11 and generalise event queue processing for
all platforms.

Change-Id: I9aa27729d35cbf3c2e2a7986210f6128d22696ef
Reviewed-on: http://codereview.qt-project.org/4728
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoRemove expected failure for qpa platform
Toby Tomkins [Mon, 19 Sep 2011 01:23:36 +0000 (11:23 +1000)]
Remove expected failure for qpa platform

QTBUG-21011 has been resolved, hence the qpa platform can be enabled
for this test.

Change-Id: I1a1e76077eb102c389b09c79e069f6d9e25e2637
Reviewed-on: http://codereview.qt-project.org/4624
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoUse QDeclarativeChangeSet to communicate changes to views.
Andrew den Exter [Thu, 1 Sep 2011 05:24:34 +0000 (15:24 +1000)]
Use QDeclarativeChangeSet to communicate changes to views.

Allows QSGVisualDataModel to send multiple changes at a time. Changes
sets with multiple changes will be generated by VisualDataModels with
items that have been re-ordered or filtered.

Task-number: QTBUG-20107
Change-Id: I28f2620431cc89c61e1061635ffb68dc5801675c
Reviewed-on: http://codereview.qt-project.org/4034
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoRefactor QSGVisualDataModel.
Andrew den Exter [Tue, 30 Aug 2011 05:00:30 +0000 (15:00 +1000)]
Refactor QSGVisualDataModel.

Split the wrapper for Package models out into its own visual model
class, add a QSGVisualAdaptorModel class which encapsulates the
creation and maintenance of delegate context data, and move
QSGVisualDataModel to its own source files.

Task-number: QTBUG-20107
Change-Id: Icdea2756a119c327ec2c748be893daf622bc1356
Reviewed-on: http://codereview.qt-project.org/4033
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoCompress consecutive removals.
Andrew den Exter [Wed, 31 Aug 2011 08:03:43 +0000 (18:03 +1000)]
Compress consecutive removals.

If an applied list of changes has consecutive removals compress them
together before applying them to the change set.

Change-Id: I75f178a31bbc8480d76be745c62e824125dbd8ba
Reviewed-on: http://codereview.qt-project.org/4032
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoAugment Documentation
Alan Alpert [Tue, 20 Sep 2011 07:57:01 +0000 (17:57 +1000)]
Augment Documentation

Change-Id: Ie76de2631521cd3e50aa56f6b134fa33682b81cd
Reviewed-on: http://codereview.qt-project.org/5208
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Damian Jansen <damian.jansen@nokia.com>
13 years agoMake turbulence respect offset
Alan Alpert [Tue, 20 Sep 2011 07:52:45 +0000 (17:52 +1000)]
Make turbulence respect offset

Change-Id: Ife84b900cd9c99aff4f4cb5f860a0853c08a40a3
Reviewed-on: http://codereview.qt-project.org/5206
Reviewed-by: Martin Jones <martin.jones@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoAdd whitespace
Alan Alpert [Tue, 20 Sep 2011 07:16:36 +0000 (17:16 +1000)]
Add whitespace

Change-Id: Iad55228ffa86bbf63b12a33d0f00ce734807c071
Reviewed-on: http://codereview.qt-project.org/5199
Reviewed-by: Bea Lam <bea.lam@nokia.com>
13 years agoCustomEmitter/Affector now affect whole lists at once
Alan Alpert [Tue, 20 Sep 2011 05:28:14 +0000 (15:28 +1000)]
CustomEmitter/Affector now affect whole lists at once

Better performance potential (fewer drops to JS, possibility of more
optimzed JS).

Change-Id: If386f06ac8714162a5bfc6b5eef7f2e67f9dae95
Reviewed-on: http://codereview.qt-project.org/5189
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFixed compile of examples and tests.
Rohan McGovern [Wed, 21 Sep 2011 00:18:15 +0000 (10:18 +1000)]
Fixed compile of examples and tests.

6aad4122332c0291e2e3249b508c7583428177b9 in qtbase removed implicit
linking to libQtWidgets.  Projects which implicitly used that module
were broken.

Either remove the dependency where it is not required, or explicitly
opt-in to libQtWidgets where it is required.

Change-Id: I6f4fb1d98bdf5bb65b4f02a1d245d334314b163d
Reviewed-on: http://codereview.qt-project.org/5268
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoMake qdeclarativecomponent::creation() benchmark work again
Kent Hansen [Tue, 20 Sep 2011 06:30:29 +0000 (08:30 +0200)]
Make qdeclarativecomponent::creation() benchmark work again

The samegame files were out of date.

Change-Id: Idf25a3c1d327ae94a76717aa7dde9a9dd15af9bb
Reviewed-on: http://codereview.qt-project.org/5193
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoQDeclarativeDebug: Allow reconnects to QML debugger port
Kai Koehne [Mon, 19 Sep 2011 10:29:10 +0000 (12:29 +0200)]
QDeclarativeDebug: Allow reconnects to QML debugger port

Allow a new client to attach once the old one was disconnected.
Done by Aurindam Jana.

Change-Id: Id85045204cc011ec6e02db2658173e652b75c07e
Reviewed-on: http://codereview.qt-project.org/5132
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
13 years agoAdded PerformanceHints flags to QSGPaintedItem.
Yoann Lopes [Fri, 9 Sep 2011 11:00:58 +0000 (13:00 +0200)]
Added PerformanceHints flags to QSGPaintedItem.

At the moment only contains FastFBOResizing.
If this flag is set to true and when using a FBO as render target,
the FBO will use a larger texture than the size of the item to avoid
too many resizing.

Change-Id: I3b8a51a5a07329ff3ed010a35dc8235913201a8e
Reviewed-on: http://codereview.qt-project.org/4651
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoRefactor QSGParticleAffector internals
Alan Alpert [Tue, 20 Sep 2011 00:46:34 +0000 (10:46 +1000)]
Refactor QSGParticleAffector internals

Putting more of the logic in protected subroutines makes it a lot easier
for subclasses to reimplement affectSystem.

Change-Id: I07f6553228064f1c9b68c6f55628b12b5c78013b
Reviewed-on: http://codereview.qt-project.org/5172
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoMore ImageParticle sharing
Alan Alpert [Tue, 20 Sep 2011 02:56:12 +0000 (12:56 +1000)]
More ImageParticle sharing

Basic implementation of explicitAnimation, and RESET methods/docs added

Change-Id: Ic522153b5287a97ba35e931cc6bddcde5d139fe7
Reviewed-on: http://codereview.qt-project.org/5182
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoRemove QEXPECT_FAIL from QSGVisualDataModel test.
Andrew den Exter [Tue, 20 Sep 2011 03:56:42 +0000 (13:56 +1000)]
Remove QEXPECT_FAIL from QSGVisualDataModel test.

QTBUG-21416 has been resolved.

Task-number: QTBUG-21416
Change-Id: Ia8df8431bf429ff1c9d7956b9ed0ea9b95102549
Reviewed-on: http://codereview.qt-project.org/5185
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoFix QSGVisualDataModel test failure.
Andrew den Exter [Thu, 15 Sep 2011 08:03:32 +0000 (18:03 +1000)]
Fix QSGVisualDataModel test failure.

Because the list view isn't visible it won't trigger a relayout unless
forced by something like calling count() which means the test is
looking up a stale list of items.

VisualDataModel also wasn't clearing its cache when it changed the
root item and so could return an old item if the view didn't release
all items before querying a new one.

Task-number: QTBUG-21416
Change-Id: I71193e22965f30ea92d9861ccbeff30b64d58309
Reviewed-on: http://codereview.qt-project.org/4953
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoInitial ImageParticle sharing
Alan Alpert [Mon, 19 Sep 2011 05:27:49 +0000 (15:27 +1000)]
Initial ImageParticle sharing

This allows particles rendered by ImageParticle to share some of their
randomly generated state. Still to come are reset methods and animData
sharing (so animations can look synced)

Change-Id: Ia805e1b3735b15fba7bd14778ed7abd795b11f06
Reviewed-on: http://codereview.qt-project.org/5114
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoDebugger: Fix compilation warnings
Kai Koehne [Mon, 19 Sep 2011 11:20:41 +0000 (13:20 +0200)]
Debugger: Fix compilation warnings

Change-Id: I57d2360566eb35c90db82075851f153727712980
Reviewed-on: http://codereview.qt-project.org/5137
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
13 years agoMake declarative/creation benchmark build again
Kent Hansen [Mon, 19 Sep 2011 11:28:13 +0000 (13:28 +0200)]
Make declarative/creation benchmark build again

Change-Id: I9ecbdcfc373e95de38e432aa627f6ab93d92afe6
Reviewed-on: http://codereview.qt-project.org/5138
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoUnwrap QJSValue from QVariant in QV8Engine::fromVariant
Jędrzej Nowacki [Fri, 16 Sep 2011 12:06:02 +0000 (14:06 +0200)]
Unwrap QJSValue from QVariant in QV8Engine::fromVariant

When QML tries to unwrap real value from a QVariant and
the value is a QJSValue instance, then no conversion is needed,
QJSValue already contains a v8 handle.

This patch, for example, solves a problem of emitting QJSValue
instance in a signal that has QVariant as an argument. The QJSValue
can be unwrapped and used as a normal JS value in a connected slot.
This feature may be used also in a plugin model that stores QJSValues
internally. Then the model in data() function can return a QJSValue
which would be understood by QML.

Change-Id: I1d5ede40ce2637123b09839fd848b27ad3af3dda
Reviewed-on: http://codereview.qt-project.org/4451
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoMove JS RegExp flag definitions to header file
Kent Hansen [Tue, 13 Sep 2011 11:07:38 +0000 (13:07 +0200)]
Move JS RegExp flag definitions to header file

This way they can be used by tools that use the lexer
(e.g. qml minifier).

Change-Id: I226d1712089b01defd3b45ccb99db596955bff8b
Reviewed-on: http://codereview.qt-project.org/4762
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
13 years agoAdd install rule for qmlmin
Kent Hansen [Tue, 13 Sep 2011 14:14:52 +0000 (16:14 +0200)]
Add install rule for qmlmin

Change-Id: I7ea6e92e8fe54092bb16d92e69a83b0257a67acf
Reviewed-on: http://codereview.qt-project.org/4787
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoFix typo when recognizing escape characters
Roberto Raggi [Tue, 13 Sep 2011 11:28:16 +0000 (13:28 +0200)]
Fix typo when recognizing escape characters

Change-Id: Id97d5c12d271794fb9c7c752fd6535af90883eb4
Reviewed-on: http://codereview.qt-project.org/4770
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoFix automatic insertion of semicolons.
Roberto Raggi [Thu, 15 Sep 2011 15:08:22 +0000 (17:08 +0200)]
Fix automatic insertion of semicolons.

Use Lexer::canInsertAutomaticSemicolon() when recovering from errors
generated by missing T_SEMICOLON tokens.

Change-Id: Ie4011d8d3e02b02a7dccd0a09ffa28b1ec9e654d
Reviewed-on: http://codereview.qt-project.org/5017
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoAdd support for minimizing Javascript files containing pragmas.
Roberto Raggi [Thu, 15 Sep 2011 15:06:31 +0000 (17:06 +0200)]
Add support for minimizing Javascript files containing pragmas.

Change-Id: Ib61d5ea42ec810c36ba782b558461bc09be199dc
Reviewed-on: http://codereview.qt-project.org/5016
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoAdd the method tokenKind() to the QML/JS lexer.
Roberto Raggi [Thu, 15 Sep 2011 14:56:49 +0000 (16:56 +0200)]
Add the method tokenKind() to the QML/JS lexer.

The method returns the last token recognized by the lexer.

Change-Id: I9464e96c1276852737ddc8330d08d57326b48888
Reviewed-on: http://codereview.qt-project.org/5015
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoAdd support for QML/JS pragma directives.
Roberto Raggi [Thu, 15 Sep 2011 14:54:33 +0000 (16:54 +0200)]
Add support for QML/JS pragma directives.

The lexer can now recognize the following pragma directives:

  .pragma library
  .import <URI> <Version> as <Identifier>
  .import <file.js> as <Identifier>

Change-Id: I2c44140818f356419640266a46b5e172474819ee
Reviewed-on: http://codereview.qt-project.org/4897
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoAdd auto tests for the QML minifier.
Roberto Raggi [Mon, 12 Sep 2011 12:09:31 +0000 (14:09 +0200)]
Add auto tests for the QML minifier.

Change-Id: Iba821eb490ea791e9c375565985af62cef91d1f3
Reviewed-on: http://codereview.qt-project.org/4671
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoFix automatic semicolon insertion.
Roberto Raggi [Wed, 14 Sep 2011 12:50:24 +0000 (14:50 +0200)]
Fix automatic semicolon insertion.

The parser should insert a T_SEMICOLON token when it reaches an
error state and the lookahead token is following a closing brace.

Change-Id: Ib849e7fbfe50c2a3e679ae0794f5780cc0b94de5
Reviewed-on: http://codereview.qt-project.org/4896
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoFix compile when the parser is included in non GUI applications.
Roberto Raggi [Wed, 14 Sep 2011 12:59:09 +0000 (14:59 +0200)]
Fix compile when the parser is included in non GUI applications.

Change-Id: I63d910f0f63cd88d919b5487d5b48f6019eca9bd
Reviewed-on: http://codereview.qt-project.org/4895
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoAdded --verify-only option to qmlmin.
Roberto Raggi [Tue, 13 Sep 2011 13:49:11 +0000 (15:49 +0200)]
Added --verify-only option to qmlmin.

qmlmin has three different stages. In the first stage
it generates the QML/JS minified code. In the second
stage we verify that minified code is equivalent
to the original code and in the final stage we
produce the output. With --verify-only you can tell
qmlmin to quit after the verification step.

Note that this option is pretty much equivalent to
the unix command qmlmin file.qml -o /dev/null.

Change-Id: I91373bc1c1db8c35af2e301ad13d7b34fc384529
Reviewed-on: http://codereview.qt-project.org/4670
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoIntroduced qmlmin.
Roberto Raggi [Thu, 8 Sep 2011 11:40:28 +0000 (13:40 +0200)]
Introduced qmlmin.

qmlmin is a simple minifier for QML and Javascript files. It removes
comments and layout characters.

Change-Id: I387a683cd9b73e8fd225e10a75b3fcec50949938
Reviewed-on: http://codereview.qt-project.org/4442
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoFix the implementation of Lexer::tokenText().
Roberto Raggi [Thu, 8 Sep 2011 10:23:16 +0000 (12:23 +0200)]
Fix the implementation of Lexer::tokenText().

Lexer::tokenText() should return the contents of the
string literal without the quotes.

Change-Id: I968ca2e5142d8c55c75990c24380d2faa9b313a3
Reviewed-on: http://codereview.qt-project.org/4440
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoIntroduced a QML scanning mode.
Roberto Raggi [Fri, 9 Sep 2011 08:58:52 +0000 (10:58 +0200)]
Introduced a QML scanning mode.

In QML mode, the lexer will recognize the extra QML keywords, e.g.
readonly, as, on, and so on.

Change-Id: I148ff857e201f99d41e0265bcfc480a94a1085a0
Reviewed-on: http://codereview.qt-project.org/4518
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoRe-enable QtQuickTest.
Rohan McGovern [Wed, 14 Sep 2011 01:33:25 +0000 (11:33 +1000)]
Re-enable QtQuickTest.

This was disabled in refactor, but it seems to be working OK, so turn it
back on.

Change-Id: I35d97342c6ef7be358d9cb593a1eab27c711247c
Reviewed-on: http://codereview.qt-project.org/4846
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoGet rid of QDeclarativeUtils
Kent Hansen [Thu, 15 Sep 2011 12:11:55 +0000 (14:11 +0200)]
Get rid of QDeclarativeUtils

All the QChar methods needed by QtDeclarative have now
been optimized to achieve at least as good performance
as the QDeclarativeUtils versions.

Change-Id: I5b8dd58f9b597f716b53563d07d39d894c5dd666
Reviewed-on: http://codereview.qt-project.org/5059
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFix QDeclarativeListProperty assignment
Chris Adams [Thu, 8 Sep 2011 05:13:42 +0000 (15:13 +1000)]
Fix QDeclarativeListProperty assignment

This commit ensures that a QDeclarativeListReference can be
assigned to another QDeclarativeListProperty, by retrieving
each element in the list reference and converting to the appropriate
type before appending to the target list property.

Task-number: QTBUG-16316
Change-Id: Id8858058f052a53bf43eadc085fd278654478d77
Reviewed-on: http://codereview.qt-project.org/4388
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoMake cellWidth/cellHeight reals rather than ints.
Michael Brasser [Mon, 19 Sep 2011 03:50:03 +0000 (13:50 +1000)]
Make cellWidth/cellHeight reals rather than ints.

When they were ints, it was relatively easy to end up with a different
row or column count than expected, because of rounding.

Change-Id: Ifc5eba2b5598cbc0220df25f91f031581c3b51a5
Reviewed-on: http://codereview.qt-project.org/5112
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Bea Lam <bea.lam@nokia.com>
13 years agoQtQuick 2.0 elements system test
Damian Jansen [Thu, 8 Sep 2011 02:11:11 +0000 (12:11 +1000)]
QtQuick 2.0 elements system test

Added an application to browse elements. A very basic acceptance
test method that each can be performed in under a minute.
Added the .qtt for formal usage.
Also moved qsgimage system test.

Change-Id: Iada9804e2efe1339a072935647962e54aa3b4c6f
Reviewed-on: http://codereview.qt-project.org/4380
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoPathAnimation updates.
Michael Brasser [Wed, 7 Sep 2011 02:39:58 +0000 (12:39 +1000)]
PathAnimation updates.

Allow smooth orientation changes, smooth interruptions,
and implicit "from" in PathAnimation.

Change-Id: I2191f6df89ec25d78b1d498827281803a07129c9
Reviewed-on: http://codereview.qt-project.org/4378
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoTest fixes and reenables.
Michael Brasser [Fri, 16 Sep 2011 02:51:26 +0000 (12:51 +1000)]
Test fixes and reenables.

Change-Id: I85e3493855b6fefb682ddb120b15abd003fb00fd
Reviewed-on: http://codereview.qt-project.org/5045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoJSDebugging: Enable break on events.
Aurindam Jana [Tue, 13 Sep 2011 10:05:21 +0000 (12:05 +0200)]
JSDebugging: Enable break on events.

The user can request Javascript break on event. The user can provide
this info in the Breakpoints Window and provide the slot which will
be called when the event occurs. For example: specify "onTriggered" if
you need to break on Timer triggerred event.

Change-Id: I09f869a5301a9c1f92a8b8c0f3df7f74b1027b4b
Reviewed-on: http://codereview.qt-project.org/4751
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
13 years agoRe-enable commented tests.
Jędrzej Nowacki [Fri, 16 Sep 2011 14:34:27 +0000 (16:34 +0200)]
Re-enable commented tests.

The tests used QWidget class so widgets library have to be added to pro
file. QDeclarativestates works fine.

Change-Id: I55c0798a37c3a894b774ba71671569fe007a49d7
Reviewed-on: http://codereview.qt-project.org/5104
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
13 years agoRe-enable commented QJS tests.
Jędrzej Nowacki [Fri, 16 Sep 2011 12:49:57 +0000 (14:49 +0200)]
Re-enable commented QJS tests.

The tests used QWidget class so widgets library have to be added to pro
file. QJSValue test already had it.

Change-Id: Ib93b2e9b84dea76f5121378c13cc0e1921a4ebd9
Reviewed-on: http://codereview.qt-project.org/5101
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>