Alan Alpert [Thu, 12 May 2011 05:43:29 +0000 (15:43 +1000)]
Upgrade Flickr demo to QtQuick 2.
And throw in particle effects.
Includes a variety of fixes to modelparticle and picture affector which
were arrived at during this demo.
Rohan McGovern [Wed, 11 May 2011 22:47:43 +0000 (08:47 +1000)]
tests: build autotests by default for qtdeclarative
Configure Qt with `-nomake tests' if you don't want the tests.
Reviewed-by: Jason McDonald
Change-Id: I1af6a231b9cfb8ecf3e3a0c932ead6ddff7bbe90
Rohan McGovern [Wed, 11 May 2011 23:52:48 +0000 (09:52 +1000)]
tests: mark tst_qsgitem as a private-test
This test uses private symbols.
Reviewed-by: Jason McDonald
Change-Id: I026f4d00be5f53203d0b155e08533474cc4d9605
Rohan McGovern [Thu, 12 May 2011 00:00:26 +0000 (10:00 +1000)]
Fixed incorrect usage of `signals', `slots' in headers
Qt headers must use Q_SIGNALS, Q_SLOTS.
Reviewed-by: Jason McDonald
Change-Id: I54b3322befd8f133d44aa48f3aa7cd96785d2e24
Martin Jones [Thu, 12 May 2011 04:34:48 +0000 (14:34 +1000)]
Improve error message for invalid image provider name.
Also fix broken qdeclarativeimageprovider test.
Martin Jones [Thu, 12 May 2011 03:40:02 +0000 (13:40 +1000)]
Compile.
Kim Motoyoshi Kalland [Wed, 11 May 2011 13:12:08 +0000 (15:12 +0200)]
Fixed image tiling on scene graph.
Repeat wrapping of non-power-of-two textures is not supported
on OpenGL ES 2 by default. This commit implements a fallback
for tiled QML Images.
Yoann Lopes [Wed, 11 May 2011 13:55:01 +0000 (15:55 +0200)]
Fixes crash in PaintedItem example when using threaded rendering.
Gunnar Sletta [Wed, 11 May 2011 10:56:51 +0000 (12:56 +0200)]
Documentation and API cleanup of QSGMaterial
Gunnar Sletta [Wed, 11 May 2011 10:54:41 +0000 (12:54 +0200)]
Delete the rendering thread when shutting down
Gunnar Sletta [Wed, 11 May 2011 05:55:56 +0000 (07:55 +0200)]
Stop the render thread before deleting the QSGCanvas.
Alan Alpert [Wed, 11 May 2011 09:11:51 +0000 (19:11 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Alan Alpert [Wed, 11 May 2011 09:11:18 +0000 (19:11 +1000)]
Add private parts to autotest .pro files
Alan Alpert [Wed, 11 May 2011 07:53:22 +0000 (17:53 +1000)]
Augment Documentation
Task-number: QTBUG-18235
Chris Adams [Tue, 10 May 2011 02:10:06 +0000 (12:10 +1000)]
Add user documentation for scarce resource properties
Relates to commit
59ace5c5a666b1588560d2aeaa79a57da535e863.
Task-number: QMLNG-18
Reviewed-by: Aaron Kennedy
Change-Id: I216ced4c663ebab8003978999dc16ac809443a5f
Kim Motoyoshi Kalland [Tue, 10 May 2011 14:38:44 +0000 (16:38 +0200)]
Replaced grab() with scheduleUpdate().
Replaced the synchronous function grab() with an asynchronous
function scheduleUpdate() in QShaderEffectSource because
synchronous grabbing doesn't work with threaded rendering.
Yoann Lopes [Tue, 10 May 2011 11:12:14 +0000 (13:12 +0200)]
Documented which thread gets the QSGPaintedItem::paint() call.
Eskil Abrahamsen Blomfeldt [Tue, 10 May 2011 10:18:55 +0000 (12:18 +0200)]
Update to work with QGlyphs -> QGlyphRun renaming
Just some search replace to make the repository compile after
QGlyphs and related APIs were renamed.
Yoann Lopes [Tue, 10 May 2011 10:11:24 +0000 (12:11 +0200)]
Added a separate property to enable mipmapping on QSGPaintedItem.
Don't use QSGItem's smooth property for that anymore.
Kai Koehne [Tue, 10 May 2011 09:42:03 +0000 (11:42 +0200)]
QmlViewer: Remove one call to enableDebugging
Merge
f9b198987d2 resulted in two calls of the method.
Reviewed-by: TrustMe
Kai Koehne [Mon, 2 May 2011 12:03:35 +0000 (14:03 +0200)]
QmlViewer: Translate UI
Install translators for the Qt & QmlViewer translations. also
add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated
strings.
Reviewed-by: Oswald Buddenhagen
Task-number: QTBUG-14848
(cherry-picked from commit
f33b31dcc1b8fd35501ab5b441a4529e2f8570f3)
Martin Jones [Tue, 10 May 2011 05:34:37 +0000 (15:34 +1000)]
Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2
Martin Jones [Tue, 10 May 2011 04:46:10 +0000 (14:46 +1000)]
Benchmark component creation with different types of bindings.
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
Kim Motoyoshi Kalland [Mon, 9 May 2011 14:59:37 +0000 (16:59 +0200)]
Fix Rectangle implementation.
Yoann Lopes [Mon, 9 May 2011 15:16:16 +0000 (17:16 +0200)]
Udate mipmaps when QSGPaintedItem's texture has changed.
Gunnar Sletta [Mon, 9 May 2011 11:51:12 +0000 (13:51 +0200)]
Docs for QSGTextureMaterials
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
Gunnar Sletta [Mon, 9 May 2011 10:41:00 +0000 (12:41 +0200)]
Clean up QSGVertexColorMaterial a bit
Gunnar Sletta [Mon, 9 May 2011 09:54:31 +0000 (11:54 +0200)]
Removed a few warnings
Gunnar Sletta [Mon, 9 May 2011 09:54:10 +0000 (11:54 +0200)]
Docs for vertex and flat color materials
Yoann Lopes [Mon, 9 May 2011 11:12:35 +0000 (13:12 +0200)]
Enable mipmapping for QSGPaintedItem's texture.
Kim Motoyoshi Kalland [Mon, 9 May 2011 10:58:40 +0000 (12:58 +0200)]
Fixed issues with ShaderEffectSource and threaded rendering.
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.
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
Gunnar Sletta [Mon, 9 May 2011 08:33:24 +0000 (10:33 +0200)]
Documentation for the scenegraph nodes
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
Gunnar Sletta [Mon, 9 May 2011 08:30:36 +0000 (10:30 +0200)]
Added a "void *reserved" for QSGNode for potential future extensions
Alan Alpert [Mon, 9 May 2011 02:48:21 +0000 (12:48 +1000)]
Augment Documentation
Task-number: QTBUG-19112
Reviewed-by: Martin Jones
Samuel Rødal [Fri, 6 May 2011 12:04:11 +0000 (14:04 +0200)]
Made opacity work for QSGSimpleTextureNode.
Reviewed-by: Kim
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.
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
Gunnar Sletta [Thu, 5 May 2011 09:26:47 +0000 (11:26 +0200)]
Make animation driver pluggable through the QSGContext
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
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.
Yoann Lopes [Thu, 5 May 2011 13:41:36 +0000 (15:41 +0200)]
Implemented contentsSize and contentsScale for QSGPaintedItem.
Yoann Lopes [Thu, 5 May 2011 10:02:20 +0000 (12:02 +0200)]
Makes sub-pixel antialiased distance-field text looks slightly sharper.
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
Aaron Kennedy [Thu, 5 May 2011 05:24:17 +0000 (15:24 +1000)]
Compilation benchmark
Change-Id: Iaa875817367d3a9600dd1ad685f996377af9f82d
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
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
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
Alan Alpert [Thu, 5 May 2011 01:28:06 +0000 (11:28 +1000)]
Model Particle fixes
Now tracks model count changes.
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
Gunnar Sletta [Wed, 4 May 2011 10:57:28 +0000 (12:57 +0200)]
added private headers to qmlscene
Gunnar Sletta [Wed, 4 May 2011 09:52:52 +0000 (11:52 +0200)]
added private headers to qmlplugindump.pro
Gunnar Sletta [Wed, 4 May 2011 09:38:59 +0000 (11:38 +0200)]
Merge branch 'master' into qtquick2
Conflicts:
src/imports/particles/particles.pro
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
Martin Jones [Wed, 4 May 2011 07:53:51 +0000 (17:53 +1000)]
Update SG items with GV item changes.
Yann Bodson [Wed, 4 May 2011 07:42:49 +0000 (17:42 +1000)]
Fix QSGText autotests
Martin Jones [Wed, 4 May 2011 04:43:16 +0000 (14:43 +1000)]
Fix crashing QtQuick 1 Image elements.
Kim Motoyoshi Kalland [Tue, 3 May 2011 14:50:51 +0000 (16:50 +0200)]
Code cleanup in QSGShaderEffectTexture.
axis [Tue, 3 May 2011 14:21:07 +0000 (16:21 +0200)]
Added .tag file with Git revision.
Yoann Lopes [Tue, 3 May 2011 12:43:51 +0000 (14:43 +0200)]
Removed unused properties in QSGPaintedItem.
Yoann Lopes [Tue, 3 May 2011 12:41:52 +0000 (14:41 +0200)]
Added antialiasing property to QSGPaintedItem.
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.
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).
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.
Olivier Goffart [Mon, 2 May 2011 14:54:54 +0000 (16:54 +0200)]
Fix compilation with private header patch
Marius Storm-Olsen [Thu, 21 Apr 2011 12:55:54 +0000 (07:55 -0500)]
Use private headers
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
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
Kim Motoyoshi Kalland [Mon, 2 May 2011 10:59:20 +0000 (12:59 +0200)]
Fixed upside-down texture in QSGPaintedItem.
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
Gunnar Sletta [Mon, 2 May 2011 05:13:00 +0000 (07:13 +0200)]
Timing for renderers
Gunnar Sletta [Thu, 28 Apr 2011 07:13:06 +0000 (09:13 +0200)]
Added a runtime option to enable consistent timing for animations
Gunnar Sletta [Thu, 28 Apr 2011 06:37:57 +0000 (08:37 +0200)]
Don't round flickable positions while panning
Kim Motoyoshi Kalland [Thu, 28 Apr 2011 13:42:46 +0000 (15:42 +0200)]
Support mirroring the source rectangle of ShaderEffectSource.
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
Kim Motoyoshi Kalland [Thu, 28 Apr 2011 12:50:41 +0000 (14:50 +0200)]
Fixed signal passing between nested ShaderEffectItems.
Yoann Lopes [Fri, 29 Apr 2011 12:26:08 +0000 (14:26 +0200)]
Use a proper hash key for distance-field cache.
Yoann Lopes [Fri, 29 Apr 2011 09:01:58 +0000 (11:01 +0200)]
Removed distfieldgen tool.
Not needed anymore.
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)
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
Gunnar Sletta [Fri, 29 Apr 2011 07:14:42 +0000 (09:14 +0200)]
specify dependencies for declarative
Gunnar Sletta [Thu, 28 Apr 2011 15:54:07 +0000 (17:54 +0200)]
compile
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.
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
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)
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)
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)
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)
axis [Wed, 27 Apr 2011 12:13:27 +0000 (14:13 +0200)]
Merged master into 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
axis [Wed, 27 Apr 2011 10:34:43 +0000 (12:34 +0200)]
Added dependency information to the sync.profile.
axis [Wed, 27 Apr 2011 10:06:07 +0000 (12:06 +0200)]
Add .gitignore to each module
Liang Qi [Fri, 25 Mar 2011 09:32:15 +0000 (10:32 +0100)]
Add tst_headersclean for each module
Liang Qi [Wed, 23 Mar 2011 16:25:22 +0000 (17:25 +0100)]
Modularized tst_compilerwarnings
Liang Qi [Tue, 22 Mar 2011 15:13:21 +0000 (16:13 +0100)]
Modularized tst_bic and add some helper functions for global test
Prasanth Ullattil [Wed, 23 Mar 2011 09:55:02 +0000 (10:55 +0100)]
Changed the path for qpluginbase.pri