aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-06-1362-78/+411
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-06-1059-64/+380
| |\
| | * Fix spelling error in QSGNode docsMitch Curtis2016-06-081-3/+3
| | * Fix 'Threaded Render Loop' docsMitch Curtis2016-06-081-1/+1
| | * KeyNavigation: fix the documentation for its propertiesGiuseppe D'Angelo2016-06-071-5/+28
| | * Fix crash when using with statement with an expression that throwsSimon Hausmann2016-06-072-2/+12
| | * Fix bug in SQL database integration with null valuesSimon Hausmann2016-06-033-5/+40
| | * Item: mention the actual type of the grab resultMitch Curtis2016-06-031-1/+2
| | * Revert removal of "Fixed MouseArea threshold with preventStealing"Filippo Cucchetto2016-06-033-8/+25
| | * Removed insignificant of qmltest againLiang Qi2016-06-0226-2/+13
| | * Compile Fix for OpenBSD in C++11 modeRalf Nolden2016-06-021-1/+1
| | * QQuickTextNodeEngine: early out if no document layout.Edward Welbourne2016-06-011-1/+4
| | * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-05-312-2/+7
| | |\
| | | * Workaround for crashes in QtQml code relating to null this pointersv5.6.1Thiago Macieira2016-05-201-0/+5
| | | * Fix links in changelogSimon Hausmann2016-05-191-2/+2
| | * | RegAllocInfo: Initialize member _currentStmt.Edward Welbourne2016-05-301-0/+1
| | * | V4: Mirror jsAlloc behavior at stack allocation.Erik Verbruggen2016-05-272-5/+5
| | * | Fix grammar in PathView docsMitch Curtis2016-05-271-1/+1
| | * | scene graph: document the qt.scenegraph.info category not env QSG_INFOShawn Rutledge2016-05-261-2/+2
| | * | Fix crash with SignalTransitionSimon Hausmann2016-05-253-8/+96
| | * | QmlProfiler: When flushing data, send it in the right orderUlf Hermann2016-05-252-3/+13
| | * | Flickable: MovementEndingTimerInterval is used only on OS XShawn Rutledge2016-05-251-0/+2
| | * | Fix tst_qquicktext::lineLaidOutRelayout() with > 1 fontEskil Abrahamsen Blomfeldt2016-05-251-5/+6
| | * | do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+0
| | * | Avoid Canvas crashes with qtquickcompilerLaszlo Agocs2016-05-241-3/+7
| | * | Fix crash for unknown QQmlListModel roles in debug buildsFilipe Azevedo2016-05-232-0/+18
| | * | QQuickWindow: Only send focus events to items that actually gain focusRobin Burchell2016-05-233-6/+98
| | * | Bump versionOswald Buddenhagen2016-05-191-1/+1
| * | | Fix names of testsStephen Kelly2016-06-081-2/+2
| * | | Imports: de-duplicate some expensive callsAnton Kudryavtsev2016-05-272-3/+5
| * | | qmlplugindump: add a command line option.Marco Benelli2016-05-251-8/+23
| * | | Fix grammar in QQuickItem::grabToImage() documentationMitch Curtis2016-05-231-1/+1
* | | | Merge branch 'wip/scenegraphng' into devLaszlo Agocs2016-06-1026-110/+325
|\ \ \ \
| * | | | Software Adaptation: Explicitly detach backingstore image on grabAndy Nichols2016-06-101-0/+1
| * | | | QQuickItemLayer: Don't run tests with GLSL when OpenGL is not usedAndy Nichols2016-06-101-2/+35
| * | | | Software Adaptation: Obey QQuickWindow::TextureIsOpaque flagAndy Nichols2016-06-073-6/+11
| * | | | Skip mirroring tests with software adaptationAndy Nichols2016-06-072-0/+11
| * | | | Disable BoomBlock qml compilation benchmark when building without OpenGLAndy Nichols2016-06-071-1/+3
| * | | | Add OpenGL-only notes to the simple materialsLaszlo Agocs2016-06-064-1/+16
| * | | | D3D12: Add flat color materialLaszlo Agocs2016-06-064-19/+147
| * | | | Enhance rendernode example with opacity supportLaszlo Agocs2016-06-035-22/+49
| * | | | D3D12: Remove m_lastNN members from text materialLaszlo Agocs2016-06-032-33/+32
| * | | | Add OpenGL prefixes to ContextProfile in GraphicsInfoLaszlo Agocs2016-06-022-13/+13
| * | | | Avoid ifdefed enumLaszlo Agocs2016-06-022-11/+4
| * | | | Only build textureprovider example when OpenGL is availableAndy Nichols2016-06-011-2/+3
* | | | | Merge "Merge remote-tracking branch 'origin/wip/scenegraphng' into dev" into ...Laszlo Agocs2016-06-10262-3715/+27339
|\ \ \ \ \
| * | | | | Merge remote-tracking branch 'origin/wip/scenegraphng' into devLaszlo Agocs2016-06-01262-3715/+27339
| |\| | | |
| | * | | | Fix build with latest qtbase due to qsimd_p changesLaszlo Agocs2016-06-011-2/+2
| | * | | | One GraphicsInfo to rule them allLaszlo Agocs2016-06-0129-480/+658
| | * | | | D3D12: Get rid of the material's RenderState duplicationLaszlo Agocs2016-06-019-110/+27