platform/upstream/qtdeclarative.git
13 years agoAdd user documentation for js imports functionality
Chris Adams [Tue, 10 May 2011 02:14:09 +0000 (12:14 +1000)]
Add user documentation for js imports functionality

Relates to commit 6f8637810e549dac3ee8386f199a997d21ac85ce.

Task-number: QMLNG-18
Reviewed-by: Martin Jones
Change-Id: I96f0e2ebc4206d6c2a0fda476d214e549666a69c

13 years agoFix Rectangle implementation.
Kim Motoyoshi Kalland [Mon, 9 May 2011 14:59:37 +0000 (16:59 +0200)]
Fix Rectangle implementation.

13 years agoUdate mipmaps when QSGPaintedItem's texture has changed.
Yoann Lopes [Mon, 9 May 2011 15:16:16 +0000 (17:16 +0200)]
Udate mipmaps when QSGPaintedItem's texture has changed.

13 years agoDocs for QSGTextureMaterials
Gunnar Sletta [Mon, 9 May 2011 11:51:12 +0000 (13:51 +0200)]
Docs for QSGTextureMaterials

13 years agoRenamed of texture material classes to be more intuitivly named
Gunnar Sletta [Mon, 9 May 2011 10:56:50 +0000 (12:56 +0200)]
Renamed of texture material classes to be more intuitivly named

The assumption is that most people will use QSGTextureMaterial
so this should be the one that works for both transparent
and opaque textures. QSGOpaqueTextureMaterial is an optimization

13 years agoClean up QSGVertexColorMaterial a bit
Gunnar Sletta [Mon, 9 May 2011 10:41:00 +0000 (12:41 +0200)]
Clean up QSGVertexColorMaterial a bit

13 years agoRemoved a few warnings
Gunnar Sletta [Mon, 9 May 2011 09:54:31 +0000 (11:54 +0200)]
Removed a few warnings

13 years agoDocs for vertex and flat color materials
Gunnar Sletta [Mon, 9 May 2011 09:54:10 +0000 (11:54 +0200)]
Docs for vertex and flat color materials

13 years agoEnable mipmapping for QSGPaintedItem's texture.
Yoann Lopes [Mon, 9 May 2011 11:12:35 +0000 (13:12 +0200)]
Enable mipmapping for QSGPaintedItem's texture.

13 years agoFixed issues with ShaderEffectSource and threaded rendering.
Kim Motoyoshi Kalland [Mon, 9 May 2011 10:58:40 +0000 (12:58 +0200)]
Fixed issues with ShaderEffectSource and threaded rendering.

13 years agoAdded 'recursive' property to ShaderEffectSource.
Kim Motoyoshi Kalland [Thu, 5 May 2011 13:33:45 +0000 (15:33 +0200)]
Added 'recursive' property to ShaderEffectSource.

If 'recursive' is set, ShaderEffectSource will keep two
buffers, alternatingly sourcing from one while rendering into
the other.

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Mon, 9 May 2011 08:36:33 +0000 (10:36 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoDocumentation for the scenegraph nodes
Gunnar Sletta [Mon, 9 May 2011 08:33:24 +0000 (10:33 +0200)]
Documentation for the scenegraph nodes

13 years agoFix wrong usages of #include directives in the QML/JS parser.
Roberto Raggi [Mon, 9 May 2011 08:30:02 +0000 (10:30 +0200)]
Fix wrong usages of #include directives in the QML/JS parser.

Reviewed-by: Aaron Kennedy
13 years agoAdded a "void *reserved" for QSGNode for potential future extensions
Gunnar Sletta [Mon, 9 May 2011 08:30:36 +0000 (10:30 +0200)]
Added a "void *reserved" for QSGNode for potential future extensions

13 years agoAugment Documentation
Alan Alpert [Mon, 9 May 2011 02:48:21 +0000 (12:48 +1000)]
Augment Documentation

Task-number: QTBUG-19112
Reviewed-by: Martin Jones
13 years agoMade opacity work for QSGSimpleTextureNode.
Samuel Rødal [Fri, 6 May 2011 12:04:11 +0000 (14:04 +0200)]
Made opacity work for QSGSimpleTextureNode.

Reviewed-by: Kim
13 years agoDon't visit the sub tree of an AST::UiScriptBinding node.
Roberto Raggi [Fri, 6 May 2011 08:08:27 +0000 (10:08 +0200)]
Don't visit the sub tree of an AST::UiScriptBinding node.

ProcessAST needs to look only at QML nodes and as we know
it is impossible to find QML nodes inside JavaScript statements.

13 years agoFix potential crash when displaying multiscripted text
Eskil Abrahamsen Blomfeldt [Thu, 5 May 2011 14:49:06 +0000 (16:49 +0200)]
Fix potential crash when displaying multiscripted text

Shaping has to be done in the current thread, otherwise the
font engines index for each glyph (referenced in the msb of the glyph
index) might not be valid yet, because the font engines list is
populated when shaping is done. So we need to make sure that the
render thread relayouts. Geometry changes will already cause a
relayout, which will in turn cause another relayout when the
paint node is updated. There doesn't seem to be any convenient
and safe way of avoiding this doubling of the layout step if we
want to have rendering in a different thread than the QML graph.

Reviewed-by: Gunnar
13 years agoMake animation driver pluggable through the QSGContext
Gunnar Sletta [Thu, 5 May 2011 09:26:47 +0000 (11:26 +0200)]
Make animation driver pluggable through the QSGContext

13 years agoAdd unit test and documentation for module API
Chris Adams [Fri, 6 May 2011 03:18:19 +0000 (13:18 +1000)]
Add unit test and documentation for module API

Related to commit ae6c7a44394d4a5f943f1fc92f4de015ec7bcc96.
Previously, only property access on module API was tested.
This commit adds a test which calls a method on a module API.
It also adds documentation for the qmlRegisterModuleApi functions.

Task-number: QMLNG-33
Reviewed-by: Martin Jones
13 years agoFix evaluation of boolean conditions
Roberto Raggi [Thu, 5 May 2011 15:19:01 +0000 (17:19 +0200)]
Fix evaluation of boolean conditions

Ensure that the operand of IR::OpIfTrue and IR::OpNot has boolean type.

13 years agoImplemented contentsSize and contentsScale for QSGPaintedItem.
Yoann Lopes [Thu, 5 May 2011 13:41:36 +0000 (15:41 +0200)]
Implemented contentsSize and contentsScale for QSGPaintedItem.

13 years agoMakes sub-pixel antialiased distance-field text looks slightly sharper.
Yoann Lopes [Thu, 5 May 2011 10:02:20 +0000 (12:02 +0200)]
Makes sub-pixel antialiased distance-field text looks slightly sharper.

13 years agoEnable the threaded renderer.
Gunnar Sletta [Thu, 5 May 2011 08:03:04 +0000 (10:03 +0200)]
Enable the threaded renderer.

Disable by specifying QML_NO_THREADED_RENDERER if this
causes problems

13 years agoCompilation benchmark
Aaron Kennedy [Thu, 5 May 2011 05:24:17 +0000 (15:24 +1000)]
Compilation benchmark

Change-Id: Iaa875817367d3a9600dd1ad685f996377af9f82d

13 years agoInline static data for basic types into the QML instruction
Aaron Kennedy [Thu, 5 May 2011 04:16:27 +0000 (14:16 +1000)]
Inline static data for basic types into the QML instruction

The following types are now entirely inline:
    QPoint, QPointF
    QSize, QSizeF
    QRect, QRectF
    QVector3D,
    QTime, QDateTime
    CustomTypeData

Reviewed-by: Martin Jones
Change-Id: I7024d136c77f8fb23ef6a6abb23ddfe0f9f8a1ca

13 years agoSupport variable length instructions in QML bytecode
Aaron Kennedy [Thu, 5 May 2011 03:48:29 +0000 (13:48 +1000)]
Support variable length instructions in QML bytecode

Reviewed-by: Martin Jones
Change-Id: Ib04b8d46a78723d3a734e14d22a2f2256c1627c2

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Thu, 5 May 2011 01:29:03 +0000 (11:29 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoModel Particle fixes
Alan Alpert [Thu, 5 May 2011 01:28:06 +0000 (11:28 +1000)]
Model Particle fixes

Now tracks model count changes.

13 years agoOnly include line numbers when necessary
Aaron Kennedy [Thu, 5 May 2011 01:07:59 +0000 (11:07 +1000)]
Only include line numbers when necessary

The mandatory line number bloats QML instructions for no reason.
Moving it inline actually increases the instruction size further,
but that will come down again once variable sized instruction
support is added.

Change-Id: I0ace03a50371ef57946edbb7c8e0e8c2fa4fdd76

13 years agoadded private headers to qmlscene
Gunnar Sletta [Wed, 4 May 2011 10:57:28 +0000 (12:57 +0200)]
added private headers to qmlscene

13 years agoadded private headers to qmlplugindump.pro
Gunnar Sletta [Wed, 4 May 2011 09:52:52 +0000 (11:52 +0200)]
added private headers to qmlplugindump.pro

13 years agoMerge branch 'master' into qtquick2
Gunnar Sletta [Wed, 4 May 2011 09:38:59 +0000 (11:38 +0200)]
Merge branch 'master' into qtquick2

Conflicts:
src/imports/particles/particles.pro

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Wed, 4 May 2011 08:21:47 +0000 (10:21 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoUpdate SG items with GV item changes.
Martin Jones [Wed, 4 May 2011 07:53:51 +0000 (17:53 +1000)]
Update SG items with GV item changes.

13 years agoFix QSGText autotests
Yann Bodson [Wed, 4 May 2011 07:42:49 +0000 (17:42 +1000)]
Fix QSGText autotests

13 years agoFix crashing QtQuick 1 Image elements.
Martin Jones [Wed, 4 May 2011 04:43:16 +0000 (14:43 +1000)]
Fix crashing QtQuick 1 Image elements.

13 years agoCode cleanup in QSGShaderEffectTexture.
Kim Motoyoshi Kalland [Tue, 3 May 2011 14:50:51 +0000 (16:50 +0200)]
Code cleanup in QSGShaderEffectTexture.

13 years agoAdded .tag file with Git revision.
axis [Tue, 3 May 2011 14:21:07 +0000 (16:21 +0200)]
Added .tag file with Git revision.

13 years agoRemoved unused properties in QSGPaintedItem.
Yoann Lopes [Tue, 3 May 2011 12:43:51 +0000 (14:43 +0200)]
Removed unused properties in QSGPaintedItem.

13 years agoAdded antialiasing property to QSGPaintedItem.
Yoann Lopes [Tue, 3 May 2011 12:41:52 +0000 (14:41 +0200)]
Added antialiasing property to QSGPaintedItem.

13 years agoStart QtQuick2 section of whats new.
Alan Alpert [Tue, 3 May 2011 05:13:50 +0000 (15:13 +1000)]
Start QtQuick2 section of whats new.

With the minor MouseArea behaviour change.

13 years agoAffector Augmentation
Alan Alpert [Tue, 3 May 2011 00:23:21 +0000 (10:23 +1000)]
Affector Augmentation

Affectors gained shape and signal properties, and the affected(x,y)
signal (turned on by the signal property, a theorized performance
improvement).

13 years agoSet ChildenDoNotOverlap flag on grids, lists and positioners.
Kim Motoyoshi Kalland [Mon, 2 May 2011 14:58:33 +0000 (16:58 +0200)]
Set ChildenDoNotOverlap flag on grids, lists and positioners.

QSGGridView, QSGListView, QSGRow, QSGColumn, QSGGrid and
QSGFlow now all set the ChildrenDoNotOverlap flag which allows
the scene graph to render nodes in a more optimal order.

13 years agoFix compilation with private header patch
Olivier Goffart [Mon, 2 May 2011 14:54:54 +0000 (16:54 +0200)]
Fix compilation with private header patch

13 years agoUse private headers
Marius Storm-Olsen [Thu, 21 Apr 2011 12:55:54 +0000 (07:55 -0500)]
Use private headers

13 years agoDefine the QT_NO_.... when the module is absant from QT_CONFIG
Olivier Goffart [Wed, 6 Apr 2011 13:33:13 +0000 (15:33 +0200)]
Define the QT_NO_.... when the module is absant from QT_CONFIG

Task-number: QTMODULARIZATION-38

13 years agoAdd module.prf, and install MODULE_PRI for each module
Marius Storm-Olsen [Fri, 1 Apr 2011 10:47:28 +0000 (05:47 -0500)]
Add module.prf, and install MODULE_PRI for each module

Output warning if not present

13 years agoFixed upside-down texture in QSGPaintedItem.
Kim Motoyoshi Kalland [Mon, 2 May 2011 10:59:20 +0000 (12:59 +0200)]
Fixed upside-down texture in QSGPaintedItem.

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Mon, 2 May 2011 05:23:24 +0000 (07:23 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agoTiming for renderers
Gunnar Sletta [Mon, 2 May 2011 05:13:00 +0000 (07:13 +0200)]
Timing for renderers

13 years agoAdded a runtime option to enable consistent timing for animations
Gunnar Sletta [Thu, 28 Apr 2011 07:13:06 +0000 (09:13 +0200)]
Added a runtime option to enable consistent timing for animations

13 years agoDon't round flickable positions while panning
Gunnar Sletta [Thu, 28 Apr 2011 06:37:57 +0000 (08:37 +0200)]
Don't round flickable positions while panning

13 years agoSupport mirroring the source rectangle of ShaderEffectSource.
Kim Motoyoshi Kalland [Thu, 28 Apr 2011 13:42:46 +0000 (15:42 +0200)]
Support mirroring the source rectangle of ShaderEffectSource.

13 years agoRevert "Flipped texture coordinates right way up."
Kim Motoyoshi Kalland [Thu, 28 Apr 2011 13:10:32 +0000 (15:10 +0200)]
Revert "Flipped texture coordinates right way up."

This reverts commit ffb6fe57ee0ece18b6778889f7602811ab4ca822.

Conflicts:

src/declarative/scenegraph/qsgdefaultimagenode.cpp

13 years agoFixed signal passing between nested ShaderEffectItems.
Kim Motoyoshi Kalland [Thu, 28 Apr 2011 12:50:41 +0000 (14:50 +0200)]
Fixed signal passing between nested ShaderEffectItems.

13 years agoUse a proper hash key for distance-field cache.
Yoann Lopes [Fri, 29 Apr 2011 12:26:08 +0000 (14:26 +0200)]
Use a proper hash key for distance-field cache.

13 years agoRemoved distfieldgen tool.
Yoann Lopes [Fri, 29 Apr 2011 09:01:58 +0000 (11:01 +0200)]
Removed distfieldgen tool.

Not needed anymore.

13 years agoMake text align in the same baseline
Jiang Jiang [Thu, 28 Apr 2011 15:02:53 +0000 (17:02 +0200)]
Make text align in the same baseline

(cherry picked from commit 3f0e1ac647cc8ab700b85772264bc2a95e5301fa)

13 years agoMerge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Gunnar Sletta [Fri, 29 Apr 2011 07:14:55 +0000 (09:14 +0200)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2

13 years agospecify dependencies for declarative
Gunnar Sletta [Fri, 29 Apr 2011 07:14:42 +0000 (09:14 +0200)]
specify dependencies for declarative

13 years agocompile
Gunnar Sletta [Thu, 28 Apr 2011 15:54:07 +0000 (17:54 +0200)]
compile

13 years agoFix detection of fonts with narrow outline in the distance-field cache.
Yoann Lopes [Thu, 28 Apr 2011 13:46:20 +0000 (15:46 +0200)]
Fix detection of fonts with narrow outline in the distance-field cache.

13 years agoqmlplugindump: Fix --path usage with drive letters on Windows.
Christian Kamm [Thu, 28 Apr 2011 10:22:30 +0000 (12:22 +0200)]
qmlplugindump: Fix --path usage with drive letters on Windows.

Since we can't import by such a path, we instead use a "." import
and set the uri of the component to the correct path.

Mirrors a change to qmldump in
qt-creator/0c8b4e38fab1862e3427aac7e7db68623bc7f174

Reviewed-by: Thomas Hartmann
13 years agoSort gradient stops for the convenience of the scenegraph
Alan Alpert [Wed, 27 Apr 2011 00:46:24 +0000 (10:46 +1000)]
Sort gradient stops for the convenience of the scenegraph

The scenegraph gradients require sorted graident stops, whereas QML does
not. Gradient stops are now sorted at the point they are passed into the
scenegraph.

Change-Id: I499dd00dc78e60dfc2053f2ee3691e61e0cf2a5d
Task-number: QTBUG-18494
Reviewed-by: Martin Jones
(cherry picked from commit 8cbd68b29224eed19f6ca6ec8186766c69a35c83)

13 years agoUpdate particles to use QElapsedTimer
Alan Alpert [Wed, 27 Apr 2011 01:19:24 +0000 (11:19 +1000)]
Update particles to use QElapsedTimer

Step one of fixing the limited lifetime bug. As this step should also
increase the lifetime 'a lot' step two may take a while.

Change-Id: I87bbe762803451f751e23d4bf8559c662fdf57a3
(cherry picked from commit 9cf15c135373f8190bf2cb62f9f99890cacf7d88)

13 years agoPre-accept events
Alan Alpert [Wed, 27 Apr 2011 03:27:13 +0000 (13:27 +1000)]
Pre-accept events

Key handler expects events to be accepted, and will ignore them if
necessary.

Change-Id: I8ee110d70c98ff7c2de107b44e7d51aab12678c4
Reviewed-by: Michael Brasser
(cherry picked from commit 6476bbea1d7905f083789224accc8f4b43a0779b)

13 years agoAdd variable rotation speed to deformable particle
Alan Alpert [Wed, 27 Apr 2011 05:40:20 +0000 (15:40 +1000)]
Add variable rotation speed to deformable particle

Change-Id: I105f18f0d7ec860de5d8bc8a9f3e4f007ea71ae2
(cherry picked from commit 41296b3ed046ddf73eca320bf0a97008decca287)

13 years agoMerged master into qtquick2.
axis [Wed, 27 Apr 2011 12:13:27 +0000 (14:13 +0200)]
Merged master into qtquick2.

13 years agoInitial import from qtquick2.
Qt by Nokia [Wed, 27 Apr 2011 12:13:26 +0000 (14:13 +0200)]
Initial import from qtquick2.

Branched from the monolithic repo, Qt qtquick2 branch, at commit
a4a585d2ee907746682846ae6e8a48e19deef469

13 years agoAdded dependency information to the sync.profile.
axis [Wed, 27 Apr 2011 10:34:43 +0000 (12:34 +0200)]
Added dependency information to the sync.profile.

13 years agoAdd .gitignore to each module
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module

13 years agoAdd tst_headersclean for each module
Liang Qi [Fri, 25 Mar 2011 09:32:15 +0000 (10:32 +0100)]
Add tst_headersclean for each module

13 years agoModularized tst_compilerwarnings
Liang Qi [Wed, 23 Mar 2011 16:25:22 +0000 (17:25 +0100)]
Modularized tst_compilerwarnings

13 years agoModularized tst_bic and add some helper functions for global test
Liang Qi [Tue, 22 Mar 2011 15:13:21 +0000 (16:13 +0100)]
Modularized tst_bic and add some helper functions for global test

13 years agoChanged the path for qpluginbase.pri
Prasanth Ullattil [Wed, 23 Mar 2011 09:55:02 +0000 (10:55 +0100)]
Changed the path for qpluginbase.pri

13 years agoIntroduced the QT.<module>.plugins variable to module profiles.
axis [Tue, 22 Mar 2011 12:20:53 +0000 (13:20 +0100)]
Introduced the QT.<module>.plugins variable to module profiles.

13 years agoFixed parserstress test.
axis [Mon, 21 Mar 2011 11:55:15 +0000 (12:55 +0100)]
Fixed parserstress test.

13 years agoSwitched to using QT.declaratice.imports variable.
axis [Thu, 17 Mar 2011 09:58:42 +0000 (10:58 +0100)]
Switched to using QT.declaratice.imports variable.

13 years agoAdded QT.<module>.imports support to module profiles.
axis [Thu, 17 Mar 2011 09:57:48 +0000 (10:57 +0100)]
Added QT.<module>.imports support to module profiles.

13 years agocompile qtdeclarative/import
Olivier Goffart [Tue, 11 Jan 2011 10:09:56 +0000 (11:09 +0100)]
compile qtdeclarative/import

13 years agoMake auto test build
Liang Qi [Fri, 7 Jan 2011 12:47:49 +0000 (13:47 +0100)]
Make auto test build

13 years agoMake each module refer to its own bin/
Marius Storm-Olsen [Thu, 6 Jan 2011 18:52:17 +0000 (12:52 -0600)]
Make each module refer to its own bin/

Since modules cannot rely on QtCore having a build directory, nor
can they build the applications directly into $$[QT_INSTALL_BINS]
each module needs their own bin/. Add this path to each module's
pri file, so others can use their applications

13 years agoExtended module profiles.
axis [Mon, 3 Jan 2011 18:01:57 +0000 (19:01 +0100)]
Extended module profiles.

Each module now sets the QT_CONFIG variable itself.

13 years agoAdd the private_includes path to the modules .pri file
Liang Qi [Thu, 23 Dec 2010 08:38:00 +0000 (09:38 +0100)]
Add the private_includes path to the modules .pri file

13 years agoAdd the source path to the modules .pri file
Marius Storm-Olsen [Fri, 17 Dec 2010 05:34:20 +0000 (23:34 -0600)]
Add the source path to the modules .pri file

13 years agoMake declarative compile.
Liang Qi [Thu, 25 Nov 2010 14:20:01 +0000 (15:20 +0100)]
Make declarative compile.

13 years agoInitial import from the monolithic Qt.
Qt by Nokia [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Initial import from the monolithic Qt.

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
Qt Git wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://qt.gitorious.org/qt/pages/GitIntroductionWithQt

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo, Qt master branch, at commit
896db169ea224deb96c59ce8af800d019de63f12

13 years agoMoved to using a feature profile instead of direct inclusion.
axis [Wed, 27 Apr 2011 10:05:43 +0000 (12:05 +0200)]
Moved to using a feature profile instead of direct inclusion.