Commit Graph

1700 Commits

Author SHA1 Message Date
Thorbjørn Lindeijer 84a5bde0c4 QDeclarativeDebugServer: Send hello answer before any service messages
This is necessary since some services may like to send a message back
immediately when its state changes to enabled.

Reviewed-by: Kai Koehne
(cherry picked from commit 9fa0a9319ee0f178d03f9bdc4afbabb8563b4c62)
2011-05-10 18:14:37 +02:00
Kim Motoyoshi Kalland 67d5026372 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.
2011-05-10 16:57:59 +02:00
Yoann Lopes 79f6db432e Documented which thread gets the QSGPaintedItem::paint() call. 2011-05-10 13:12:57 +02:00
Eskil Abrahamsen Blomfeldt 762cbc75b9 Update to work with QGlyphs -> QGlyphRun renaming
Just some search replace to make the repository compile after
QGlyphs and related APIs were renamed.
2011-05-10 12:19:47 +02:00
Yoann Lopes b909a2433e Added a separate property to enable mipmapping on QSGPaintedItem.
Don't use QSGItem's smooth property for that anymore.
2011-05-10 12:12:44 +02:00
Kai Koehne 21deca53df QmlViewer: Remove one call to enableDebugging
Merge f9b198987d resulted in two calls of the method.

Reviewed-by: TrustMe
2011-05-10 11:44:24 +02:00
Kai Koehne 7b337d460c 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)
2011-05-10 11:38:02 +02:00
Martin Jones f9b198987d Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2 2011-05-10 15:34:37 +10:00
Martin Jones e7f900bdc6 Benchmark component creation with different types of bindings. 2011-05-10 15:33:46 +10:00
Chris Adams 3cfdb6da04 Add user documentation for js imports functionality
Relates to commit 6f8637810e549dac3ee8386f199a997d21ac85ce.

Task-number: QMLNG-18
Reviewed-by: Martin Jones
Change-Id: I96f0e2ebc4206d6c2a0fda476d214e549666a69c
2011-05-10 15:32:21 +10:00
Kim Motoyoshi Kalland 4fb6ee7d25 Fix Rectangle implementation. 2011-05-09 17:31:03 +02:00
Yoann Lopes 2002baaf68 Udate mipmaps when QSGPaintedItem's texture has changed. 2011-05-09 17:16:54 +02:00
Gunnar Sletta 7b7f5671c8 Docs for QSGTextureMaterials 2011-05-09 13:51:40 +02:00
Gunnar Sletta 2aa66a6660 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
2011-05-09 13:51:40 +02:00
Gunnar Sletta 743f8df88a Clean up QSGVertexColorMaterial a bit 2011-05-09 13:51:40 +02:00
Gunnar Sletta 79f2d3c2e9 Removed a few warnings 2011-05-09 13:51:40 +02:00
Gunnar Sletta aba3870391 Docs for vertex and flat color materials 2011-05-09 13:51:40 +02:00
Yoann Lopes b7e0c07633 Enable mipmapping for QSGPaintedItem's texture. 2011-05-09 13:13:24 +02:00
Kim Motoyoshi Kalland c962253085 Fixed issues with ShaderEffectSource and threaded rendering. 2011-05-09 13:08:43 +02:00
Kim Motoyoshi Kalland 02582f6c80 Added 'recursive' property to ShaderEffectSource.
If 'recursive' is set, ShaderEffectSource will keep two
buffers, alternatingly sourcing from one while rendering into
the other.
2011-05-09 13:08:42 +02:00
Gunnar Sletta 5079bcd11e Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2 2011-05-09 10:36:33 +02:00
Gunnar Sletta 66243440db Documentation for the scenegraph nodes 2011-05-09 10:33:24 +02:00
Roberto Raggi 7c31b7a969 Fix wrong usages of #include directives in the QML/JS parser.
Reviewed-by: Aaron Kennedy
2011-05-09 10:32:06 +02:00
Gunnar Sletta 357a0fe1a3 Added a "void *reserved" for QSGNode for potential future extensions 2011-05-09 10:30:36 +02:00
Alan Alpert 58ac6e8ee4 Augment Documentation
Task-number: QTBUG-19112
Reviewed-by: Martin Jones
2011-05-09 12:56:52 +10:00
Samuel Rødal 35ee416e2a Made opacity work for QSGSimpleTextureNode.
Reviewed-by: Kim
2011-05-06 14:04:23 +02:00
Roberto Raggi 56d4f0cc45 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.
2011-05-06 10:15:57 +02:00
Eskil Abrahamsen Blomfeldt 27c5aabe9b 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
2011-05-06 09:56:25 +02:00
Qt Continuous Integration System 6b731e517f Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtdeclarative-staging:
  Added .tag file with Git revision.
  Fix compilation with private header patch
  Use private headers
  Define the QT_NO_.... when the module is absant from QT_CONFIG
  Add module.prf, and install MODULE_PRI for each module
2011-05-06 16:43:30 +10:00
Gunnar Sletta 55ff812974 Make animation driver pluggable through the QSGContext 2011-05-06 07:27:28 +02:00
Chris Adams 24bb6f90f8 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
2011-05-06 13:56:10 +10:00
Roberto Raggi e50b7c9299 Fix evaluation of boolean conditions
Ensure that the operand of IR::OpIfTrue and IR::OpNot has boolean type.
2011-05-05 17:19:01 +02:00
Yoann Lopes 8883e0500e Implemented contentsSize and contentsScale for QSGPaintedItem. 2011-05-05 15:41:36 +02:00
Yoann Lopes 9815adf88c Makes sub-pixel antialiased distance-field text looks slightly sharper. 2011-05-05 12:03:20 +02:00
Gunnar Sletta 7983f0df7f Enable the threaded renderer.
Disable by specifying QML_NO_THREADED_RENDERER if this
causes problems
2011-05-05 10:03:04 +02:00
Aaron Kennedy 1332e9277c Compilation benchmark
Change-Id: Iaa875817367d3a9600dd1ad685f996377af9f82d
2011-05-05 15:26:17 +10:00
Aaron Kennedy 21521c2d28 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
2011-05-05 15:26:04 +10:00
Aaron Kennedy cb661b8fd3 Support variable length instructions in QML bytecode
Reviewed-by: Martin Jones
Change-Id: Ib04b8d46a78723d3a734e14d22a2f2256c1627c2
2011-05-05 15:25:43 +10:00
Alan Alpert 5f46c8e70f Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2 2011-05-05 11:29:03 +10:00
Alan Alpert 3ea78d14ec Model Particle fixes
Now tracks model count changes.
2011-05-05 11:28:06 +10:00
Aaron Kennedy cff3c25ee6 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
2011-05-05 11:19:39 +10:00
Gunnar Sletta 09e7699033 added private headers to qmlscene 2011-05-04 12:57:28 +02:00
Gunnar Sletta 6a1a69e9e2 added private headers to qmlplugindump.pro 2011-05-04 11:52:52 +02:00
Gunnar Sletta 01285af37a Merge branch 'master' into qtquick2
Conflicts:
	src/imports/particles/particles.pro
2011-05-04 11:38:59 +02:00
Gunnar Sletta 16f58282bc Merge branch 'qtquick2' of scm.dev.nokia.troll.no:qt/qtdeclarative-staging into qtquick2 2011-05-04 10:21:47 +02:00
Martin Jones 1b7c1b6ef8 Update SG items with GV item changes. 2011-05-04 17:54:21 +10:00
Yann Bodson ff62dede7b Fix QSGText autotests 2011-05-04 17:42:49 +10:00
Martin Jones a6a0dfc44e Fix crashing QtQuick 1 Image elements. 2011-05-04 14:43:16 +10:00
Kim Motoyoshi Kalland 79943c45bf Code cleanup in QSGShaderEffectTexture. 2011-05-03 16:53:45 +02:00
axis dbbcc4dff0 Added .tag file with Git revision. 2011-05-03 16:23:50 +02:00