aboutsummaryrefslogtreecommitdiffstats
path: root/src/quick/scenegraph
Commit message (Expand)AuthorAgeFilesLines
* Merge "Merge branch 'stable' into dev" into refs/staging/devSergio Ahumada2013-08-064-6/+8
|\
| * Merge branch 'stable' into devSergio Ahumada2013-08-054-6/+8
| |\
| | * Fix crash when changing non-cached source of image during animationMichael Brasser2013-08-011-2/+2
| | * Fixed distance field text getting clipped at small sizes.Yoann Lopes2013-08-011-1/+1
| | * Rectangle which only draw an opaque border should not be blended.Gunnar Sletta2013-08-011-1/+1
| | * Workaround for distance field glyph upload problem.Yoann Lopes2013-07-261-2/+4
* | | Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into m...Simon Hausmann2013-07-261-1/+0
|\| |
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-231-1/+0
| |\|
| | * Fix CLANG-warning about unused member variable m_defaultAntialiasingMode.Friedemann Kleint2013-07-121-1/+0
* | | Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into w...Simon Hausmann2013-07-226-17/+21
|\| |
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-111-1/+1
| |\|
| | * Fixed typo 'backens'Thorbjørn Lindeijer2013-07-081-1/+1
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-07-043-6/+19
| |\|
| | * Initialize m_dirty_texture memberGunnar Sletta2013-07-031-0/+1
| | * Fix warning about change of sign: glyph_t is unsignedThiago Macieira2013-07-031-3/+3
| | * Document public members of QSGSimpleMaterialShaderGunnar Sletta2013-07-021-3/+15
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-243-10/+1
| |\|
| | * Revert "Cut performance cost in QSGContext::prepareMaterial()".Gunnar Sletta2013-06-203-10/+1
* | | Get rid of the first half of QQmlGuard usageLars Knoll2013-07-051-2/+1
* | | Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into w...Simon Hausmann2013-06-2431-257/+1175
|\| |
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-205-16/+16
| |\|
| | * Prefix internal classes properly and private export them.Gunnar Sletta2013-06-175-16/+16
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-1210-10/+63
| |\|
| | * Support unaligned QImage strides in QSGTextureAndrew Knight2013-06-121-0/+2
| | * Fix -Wpedantic warningsAlbert Astals Cid2013-06-121-1/+1
| | * Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-06-108-9/+60
| | |\
| | | * Set incubation controller when a Window{} is loaded via QQmlApplicationEngineAlan Alpert2013-06-076-9/+31
| | | * Precompile the most common materialsGunnar Sletta2013-05-312-0/+29
| * | | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-06-041-7/+8
| |\| |
| | * | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-05-311-0/+3
| | |\|
| | | * Added QQuickWindow::setDefaultAlphaBuffer()Shawn Rutledge2013-05-301-0/+3
| | * | Do not use QApp::arguments() to select antialiasing mode.Gunnar Sletta2013-05-311-7/+5
| | |/
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-05-2818-143/+264
| |\|
| | * QmlProfiler: fix SceneGraph profilingChristiaan Janssen2013-05-271-1/+1
| | * Cut performance cost in QSGContext::prepareMaterial()Gunnar Sletta2013-05-233-1/+10
| | * add private export to image and rectangle nodesGunnar Sletta2013-05-232-2/+2
| | * Avoid redundant QColor::alphaF() calls.Gunnar Sletta2013-05-221-5/+5
| | * Avoid using QColor::xxxF functions.Gunnar Sletta2013-05-222-29/+22
| | * improve docs of QSGGeometry::set[Vertex|Index]DataPatternGunnar Sletta2013-05-161-2/+4
| | * Doc: corrections, spelling, and ListView requirements commentsDavid Fries2013-05-153-12/+12
| | * Fix sorting of QSGTextMaskMaterial (native glyph drawing).Gunnar Sletta2013-05-141-1/+1
| | * QmlProfiler: SceneGraph profilingChristiaan Janssen2013-05-067-91/+208
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-296-26/+600
| |\|
| | * Disable native glyph rendering on embeddedGunnar Sletta2013-04-251-0/+4
| | * Renderloop for WindowsGunnar Sletta2013-04-244-24/+593
| | * Clear the pendingUpdate flag every frame.Gunnar Sletta2013-04-231-2/+3
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-04-224-63/+11
| |\|
| | * Don't use bitfields, reading/wrting them is not atomicGunnar Sletta2013-04-171-3/+3
| | * Remove dead code.Gunnar Sletta2013-04-171-28/+4
| | * Fixed alpha blending for native text.Yoann Lopes2013-04-161-2/+3