profile/ivi/qtdeclarative.git
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>
13 years agoRemove QmlChanges.txt file
Aaron Kennedy [Fri, 16 Sep 2011 06:02:03 +0000 (16:02 +1000)]
Remove QmlChanges.txt file

Somehow I don't think changes prior to Qt 4.7.0 RC are that interesting
anymore.

Change-Id: I42d8bbb5de8ab04796b9f6f313fbb93d0a9c7794
Reviewed-on: http://codereview.qt-project.org/5055
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoGet rid of autotests dependencies on QtWidgets
Kent Hansen [Fri, 16 Sep 2011 10:07:14 +0000 (12:07 +0200)]
Get rid of autotests dependencies on QtWidgets

Change-Id: I19936b7f8173eff9fc0bc3e19b0a61830dc5a440
Reviewed-on: http://codereview.qt-project.org/5097
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoFix an assertion in QDeclarativeNotifierEndpoint
Lars Knoll [Fri, 16 Sep 2011 11:47:45 +0000 (13:47 +0200)]
Fix an assertion in QDeclarativeNotifierEndpoint

The code in toNotifier() tried to convert to a
Notifier, and called asNotifier() before setting
the type correctly.

Change-Id: I2d4c41c6bf43422587111ae4e0c57a3905f159e0
Reviewed-on: http://codereview.qt-project.org/5089
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoInitialize variable
Lars Knoll [Fri, 16 Sep 2011 11:47:08 +0000 (13:47 +0200)]
Initialize variable

Change-Id: I2aa261ed85136df33f678a9279f7f9c833c925cd
Reviewed-on: http://codereview.qt-project.org/5088
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoDisable autotests temporarily on Mac
Kent Hansen [Fri, 16 Sep 2011 10:55:36 +0000 (12:55 +0200)]
Disable autotests temporarily on Mac

Change-Id: Ib34fdbdce2b088e0f79034342ab1fc9c94ea10f9
Reviewed-on: http://codereview.qt-project.org/5080
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoAdd Age example
Alan Alpert [Wed, 14 Sep 2011 08:15:17 +0000 (18:15 +1000)]
Add Age example

Also added advancePosition property to Age, as it was needed for even this
simple example.

Change-Id: I614a719280efc1bc5140d07ab91ec0f1bc345788
Reviewed-on: http://codereview.qt-project.org/4871
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFix aliasing bug when compiled with gcc 4.6
Aaron Kennedy [Thu, 15 Sep 2011 08:52:27 +0000 (18:52 +1000)]
Fix aliasing bug when compiled with gcc 4.6

Change-Id: I50dbeaed501ae498cd5c46e6e5929789b373b932
Task-number: QTBUG-21265
Reviewed-on: http://codereview.qt-project.org/4957
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoReference V4 program data
Aaron Kennedy [Thu, 15 Sep 2011 08:46:26 +0000 (18:46 +1000)]
Reference V4 program data

Change-Id: I84d520da16def8e48ac8bbfaab654450f776abc8
Task-number: QTBUG-21265
Reviewed-on: http://codereview.qt-project.org/4956
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoFill out examples a little more
Alan Alpert [Fri, 16 Sep 2011 03:26:50 +0000 (13:26 +1000)]
Fill out examples a little more

Adds an example of colorized ImageParticle, and an example comparing
the particle system to dynamically created Images (which don't do too
badly when they're kept really simple).

Change-Id: Id9e8d0575a38ddde1c73d694bd5c062d56cbed42
Reviewed-on: http://codereview.qt-project.org/5047
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoParticles examples shuffle
Alan Alpert [Tue, 13 Sep 2011 10:25:11 +0000 (20:25 +1000)]
Particles examples shuffle

Recast as examples, not demos. Fewer licking face usages.

Change-Id: I02a03fb9af513cbc3dc2a94aa0843220f162593b
Reviewed-on: http://codereview.qt-project.org/4754
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoHotfix docs
Alan Alpert [Fri, 16 Sep 2011 02:40:19 +0000 (12:40 +1000)]
Hotfix docs

While QtQuick 1 and 2 aren't clearly separated yet, some of the more
drastic differences (like the separate particle systems) need to be
explained a little in the interim. Or at least visible.

Change-Id: I60321bcb90a34730ed3e0862a049540ea36f8c5b
Reviewed-on: http://codereview.qt-project.org/5044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agorename threadRendering to renderInThread
Charles Yin [Fri, 16 Sep 2011 01:55:01 +0000 (11:55 +1000)]
rename threadRendering to renderInThread

Change-Id: I21d2492288adc84d3ef99633752e78a3ea232a4a
Reviewed-on: http://codereview.qt-project.org/5042
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoFix qsgpositioners autotest
Alan Alpert [Fri, 16 Sep 2011 01:50:15 +0000 (11:50 +1000)]
Fix qsgpositioners autotest

A waitForWindowShown now takes long enough of the animations to make
progress, which had been confusing the initial state checks.

Task-number: QTBUG-21414
Change-Id: I3e01f804d6bca7f627012da6cc69b0baabaabaaa
Reviewed-on: http://codereview.qt-project.org/5041
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoupdate canvas item documentations
Charles Yin [Thu, 15 Sep 2011 12:17:28 +0000 (22:17 +1000)]
update canvas item documentations

Change-Id: I66cc6550a7d8eb054c70b6f17fee05976e0a32c6
Reviewed-on: http://codereview.qt-project.org/5040
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agofix context2d composition bug, lighter should map to qt ligten composite mode
Charles Yin [Thu, 15 Sep 2011 10:15:53 +0000 (20:15 +1000)]
fix context2d composition bug, lighter should map to qt ligten composite mode

Change-Id: Iacc9cb4bd9196869b9947f919b7748ab5ad9610f
Reviewed-on: http://codereview.qt-project.org/5039
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agofix broken canvas blur after merging refactor branch
Charles Yin [Tue, 13 Sep 2011 03:53:25 +0000 (13:53 +1000)]
fix broken canvas blur after merging refactor branch

Change-Id: If145f1d02566f839abeb50df167db2b237499290
Reviewed-on: http://codereview.qt-project.org/4857
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoFix warnings.
Michael Brasser [Fri, 16 Sep 2011 00:44:23 +0000 (10:44 +1000)]
Fix warnings.

Change-Id: I7f066550fa2e1799f1c44b787da84c882f549b03
Reviewed-on: http://codereview.qt-project.org/5036
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoAdd exception for qpa, xcb platform for failing test
Toby Tomkins [Tue, 13 Sep 2011 07:05:42 +0000 (17:05 +1000)]
Add exception for qpa, xcb platform for failing test

Task-number: QTBUG-21416

Change-Id: I69986ea120d908d20a4ef73bf137ca0906dc4351
Reviewed-on: http://codereview.qt-project.org/4729
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
13 years agoUpdate system offset every frame
Alan Alpert [Thu, 15 Sep 2011 04:04:36 +0000 (14:04 +1000)]
Update system offset every frame

May be expensive if large systems animate painters, but seems safer than
messing with the tranformation matrix.

Change-Id: Ie5b21e9f238b5305bef44c48027a3337c70b2aaa
Reviewed-on: http://codereview.qt-project.org/4933
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFriction and Gravity examples
Alan Alpert [Wed, 14 Sep 2011 08:23:11 +0000 (18:23 +1000)]
Friction and Gravity examples

Change-Id: Ie816f1209711aae3b9cd1465f874919370c26028
Reviewed-on: http://codereview.qt-project.org/4875
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoDocumentation Augmentation
Alan Alpert [Wed, 14 Sep 2011 07:26:59 +0000 (17:26 +1000)]
Documentation Augmentation

Change-Id: I662526a9c0f9c8694ec39aa0d5ad9286d1c9f208
Reviewed-on: http://codereview.qt-project.org/4863
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoUpdate Turbulence on noiseSource change
Alan Alpert [Wed, 14 Sep 2011 07:11:25 +0000 (17:11 +1000)]
Update Turbulence on noiseSource change

Change-Id: Ib730bcad0a345df8e4cd45aa5b8ab892d3de16f7
Reviewed-on: http://codereview.qt-project.org/4860
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoRemove invalid ASSERT
Alan Alpert [Tue, 13 Sep 2011 03:44:23 +0000 (13:44 +1000)]
Remove invalid ASSERT

There is a possibility for it to have been updated already if newDatums
are requested before emittersChanged is reached. This became possible
when emitters stopped having strict particle emission limits.

Change-Id: I45d1564f56547418127446e3138ff21deec891c3
Reviewed-on: http://codereview.qt-project.org/4753
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFix missing/outdated license headers.
Jason McDonald [Thu, 15 Sep 2011 04:28:46 +0000 (14:28 +1000)]
Fix missing/outdated license headers.

Change-Id: Ib5f244a61cb65db829ee83ec9e4d5e4189319a9f
Reviewed-on: http://codereview.qt-project.org/4936
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
13 years agoVelocities reported by Flickable in onFlickStarted can be 0
Martin Jones [Tue, 13 Sep 2011 02:50:48 +0000 (12:50 +1000)]
Velocities reported by Flickable in onFlickStarted can be 0

Change 55cfbdb7c64068ae68f7baaceb8acfb96cb0c07e manually applied
from Qt 4.7

Ensure the smoothed velocity is set at the start of the flick.  Ensure
that the smoothed velocity animation isn't restarted unless there is
new valid data.

Change-Id: Ia77249be9980aba268a1bfa0ea3f69c49fa09e5e
Reviewed-by: Bea Lam
Reviewed-on: http://codereview.qt-project.org/4712
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoWhen we create textureprovider, initialize it with the texture if we got it
Gunnar Sletta [Thu, 15 Sep 2011 13:28:24 +0000 (15:28 +0200)]
When we create textureprovider, initialize it with the texture if we got it

Change-Id: Ia3ab1a75db947a67c610e664051f73bf84b079c1
Reviewed-on: http://codereview.qt-project.org/5008
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
13 years agoSupport preedit text in QSGTextInput
Eskil Abrahamsen Blomfeldt [Thu, 15 Sep 2011 09:49:12 +0000 (11:49 +0200)]
Support preedit text in QSGTextInput

We need to support merged additional formats with backgrounds
in the QSGTextInput as well, so that code has been separated
into its own function. We also need to account for the position
in the bounding rect, so that the decorations are painted at
the correct location when there text input is scrolled.

Task-number: QTBUG-21261
Change-Id: I0799a62bf26e6a7a2c1a6eef9bbdf889c1c8e870
Reviewed-on: http://codereview.qt-project.org/4964
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoUse QWindow's surface format for QSGCanvas' GL context
Gunnar Sletta [Thu, 15 Sep 2011 10:35:27 +0000 (12:35 +0200)]
Use QWindow's surface format for QSGCanvas' GL context

Change-Id: Ibca3b126405e2c7a0deaad55151c1bd2b284cf93
Reviewed-on: http://codereview.qt-project.org/4972
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agoFix pre-edit text in in QSGTextEdit
Eskil Abrahamsen Blomfeldt [Wed, 14 Sep 2011 10:13:28 +0000 (12:13 +0200)]
Fix pre-edit text in in QSGTextEdit

We need to include the preedit text when getting the glyphs
for the fragment, and we need to support background formats.
Note: This assumes that the pre-edit text will not span several fragments,
which seems like a reasonable assumption.

Task-number: QTBUG-21261
Change-Id: I7dd28f1221f931893ba1c51cc9e8b9771b2e46c3
Reviewed-on: http://codereview.qt-project.org/4906
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoSeparate declarative builtin functions from QV8Engine class
Jędrzej Nowacki [Wed, 7 Sep 2011 08:56:25 +0000 (10:56 +0200)]
Separate declarative builtin functions from QV8Engine class

Function like md5(), darker(), createQmlObject()... should not belong
to QV8Engine class

This is an attempt to balance size of source files.

Change-Id: If36405ad5359e11e992bb4f17764be6c18e94a6a
Reviewed-on: http://codereview.qt-project.org/4351
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoRemove some unused includes.
Jędrzej Nowacki [Tue, 6 Sep 2011 14:39:05 +0000 (16:39 +0200)]
Remove some unused includes.

Change-Id: I5090b0d3c88f3c972b1f1d2a56a954138f8d02ca
Reviewed-on: http://codereview.qt-project.org/4283
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
13 years agoFix QJSValue autotest.
Jędrzej Nowacki [Tue, 13 Sep 2011 14:23:57 +0000 (16:23 +0200)]
Fix QJSValue autotest.

The test depends on widgets library.

Change-Id: I22cd3cbf9b3a2e3ed8d5c28cd8d5e44b6e33c4f1
Reviewed-on: http://codereview.qt-project.org/4792
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoSplit qjsconverter_p header.
Jędrzej Nowacki [Thu, 8 Sep 2011 07:45:55 +0000 (09:45 +0200)]
Split qjsconverter_p header.

Change-Id: I7495cfe5932cdd226e6e8c550fff421e3705184a
Reviewed-on: http://codereview.qt-project.org/4411
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoRemove dead code.
Jędrzej Nowacki [Mon, 5 Sep 2011 15:14:21 +0000 (17:14 +0200)]
Remove dead code.

Last time when I checked using ExternalStringResources was slower then
normal strings. Probably in future we may reevaluate this idea.

Change-Id: I9e8d971be146a29256d4e01e4fae6e50cfe42c80
Reviewed-on: http://codereview.qt-project.org/4245
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
13 years agoFix potential memory corruption.
Jędrzej Nowacki [Mon, 5 Sep 2011 13:36:19 +0000 (15:36 +0200)]
Fix potential memory corruption.

The code exploited information that most of types in union use d
pointers and that size of d pointer is less or equals then
sizeof(QVariant) or sizeof(double). Still the code may suffer
from an alignment issue on some exotic platforms.

Change-Id: I4ef331f4cdb7177337ddcc8696f78d85e9594d27
Reviewed-on: http://codereview.qt-project.org/4244
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoCleanup includes in QDeclarativeData.
Jędrzej Nowacki [Mon, 5 Sep 2011 12:14:11 +0000 (14:14 +0200)]
Cleanup includes in QDeclarativeData.

QJSValue is not used in QDeclarativeData class, but QHash is.

Change-Id: Iae5cd7ed39ade04cb16afb4521978d527e97d878
Reviewed-on: http://codereview.qt-project.org/4242
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
13 years agoWe need to set the OpenGLSurface surface type on QSGCanvas.
Samuel Rødal [Wed, 14 Sep 2011 13:51:20 +0000 (15:51 +0200)]
We need to set the OpenGLSurface surface type on QSGCanvas.

Change-Id: Ib0ea343399b703c3437603918d97fc925e2adc4c
Reviewed-on: http://codereview.qt-project.org/4908
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@nokia.com>
13 years agoRemove unnecessary updateInputContext function from QSGCanvasPrivate
Joona Petrell [Mon, 12 Sep 2011 19:08:35 +0000 (22:08 +0300)]
Remove unnecessary updateInputContext function from QSGCanvasPrivate

Change-Id: Ibc64ef8a90854edf2c4b341ba01afdac19a813e1
Reviewed-on: http://codereview.qt-project.org/4742
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoPass Qt::ImQueryInput instead of Qt::CursorRectangle in QSgItem::updateMicroFocus...
Joona Petrell [Mon, 12 Sep 2011 18:48:40 +0000 (21:48 +0300)]
Pass Qt::ImQueryInput instead of Qt::CursorRectangle in QSgItem::updateMicroFocus function

QPlatformInputContext::update() function takes QInputMethodQueries flag as a parameter.
When cursor rectangle changes many input method query attributes like
cursor rectangle, cursor position, surrounding text, current selection and a
position change as well. New composite query ImQueryInput encapsulates this.

Change-Id: I83b17507f22fcbec0d8ed50588c67794d62f9495
Reviewed-on: http://codereview.qt-project.org/4741
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agoUpdate QtQuick 2 "What's New" docs.
Martin Jones [Thu, 15 Sep 2011 03:34:19 +0000 (13:34 +1000)]
Update QtQuick 2 "What's New" docs.

Change-Id: I46714a94ea88436e90d7e3eafbc2953940c5fa94
Reviewed-on: http://codereview.qt-project.org/4932
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
13 years agoFixed compile of qtdeclarative examples.
Rohan McGovern [Wed, 14 Sep 2011 01:39:54 +0000 (11:39 +1000)]
Fixed compile of qtdeclarative examples.

Change-Id: I3a982de8eaf31267a4d90e3cc3bedbf87400d34a
Reviewed-on: http://codereview.qt-project.org/4847
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>