aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items/qsgcanvas_p.h
Commit message (Collapse)AuthorAgeFilesLines
* Remove unnecessary updateInputContext function from QSGCanvasPrivateJoona Petrell2011-09-151-2/+0
| | | | | | | Change-Id: Ibc64ef8a90854edf2c4b341ba01afdac19a813e1 Reviewed-on: http://codereview.qt-project.org/4742 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Explicitly ask input method to commit preedit when focus lost.Pekka Vuorela2011-09-081-1/+0
| | | | | | | | | Takes advantage of new QInputPanel::commit() method. Change-Id: I0f09353c6ac7f5503ea9fda3a9bd79d0ae3da940 Reviewed-on: http://codereview.qt-project.org/4456 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* make sure we polishItems also in plain render loopGunnar Sletta2011-09-081-1/+1
| | | | | | | Change-Id: Ife8ab271c77a8daeaca9463e72296714aba17df9 Reviewed-on: http://codereview.qt-project.org/4430 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Ensure the itemTransform in QInputPanel is always up to dateLars Knoll2011-09-081-0/+2
| | | | | | | | | | | Hook into the render loop and update the itemTransform in the QInputPanel before we repaint. Change-Id: If9122ba0fbe31cff3bfcc3edc48f684cc9b16984 Reviewed-on: http://codereview.qt-project.org/4405 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Vesa Rantanen <vesa.rantanen@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Remove the remaining dependencies onto QtWidgetsLars Knoll2011-09-011-1/+1
| | | | | | Change-Id: I49efc4d0af4c19c24515ecfaa5c549e36f442cc8 Reviewed-on: http://codereview.qt.nokia.com/3992 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Use QMouseEvent instead of QGraphicsSceneMouseEventLars Knoll2011-09-011-8/+4
| | | | | | | | | | QMouseEvent now supports floating point coordinates, and the graphics scene event is not be available in QtGui anymore. Change-Id: I28ab428a2d00fc1deef55b05c1c545e74838e105 Reviewed-on: http://codereview.qt.nokia.com/3991 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Get declarative running on new gui/opengl stack.Samuel Rødal2011-08-291-6/+6
| | | | | | | | | Rename QGuiGLContext -> QOpenGLContext, QGL* -> QOpenGL*, etc. Change-Id: I08379029d756e28b20ae141ca30ed801626b513d Reviewed-on: http://codereview.qt.nokia.com/3711 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Respect QPlatformIntegration::ThreadedOpenGL and fix thread affinity of the ↵Gunnar Sletta2011-08-291-2/+2
| | | | | | | | QSGContext Change-Id: I3a63e8a3d515bfb41895f7717d534a46e2ab2bde Reviewed-on: http://codereview.qt.nokia.com/3705 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* separated out render thread codeGunnar Sletta2011-08-291-15/+64
| | | | | | | Change-Id: I9e440ef172055f626c908d4dd733d0243feb77c9 Reviewed-on: http://codereview.qt.nokia.com/3700 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-08-251-2/+2
|\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgitem.cpp src/declarative/items/qsgtextnode.cpp tests/auto/declarative/examples/examples.pro tools/qmlviewer/qmlviewer.pro Change-Id: Icbb0ef5dc79b658c62fd2b2c25a66c9bb3cbeb10
| * Allow descendant chains to simultaneously be hovered.Alan Alpert2011-08-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | Matches GV behaviour. Also fixes a bug in QSGMouseArea, which we aren't fixing for QtQuick 1. Task-number: QTBUG-18175 Change-Id: I4ecac7b908504f28de830732c731281407d7b0bc Reviewed-on: http://codereview.qt.nokia.com/2422 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* | Remove the QGLContext from QSGCanvasGunnar Sletta2011-08-051-2/+0
| | | | | | | | | | | | | | Change-Id: I6ad95d05d9874704b038943f7887611315733c89 Reviewed-on: http://codereview.qt.nokia.com/2678 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Ported use of QInputContext to QPlatformInputContext for nowGunnar Sletta2011-08-051-0/+3
| | | | | | | | | | | | | | Change-Id: I2e0e62cffd04c3a096d1402028a9be92d8b0a27c Reviewed-on: http://codereview.qt.nokia.com/2677 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | Make QSGCanvas a QWindow instead of a QGLWidgetGunnar Sletta2011-08-051-3/+8
|/ | | | | | Change-Id: I71a04f61acff893a35c00204ed11bdf852830485 Reviewed-on: http://codereview.qt.nokia.com/2675 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* Update licenseheader text in source files for qtdeclarative Qt moduleJyri Tahtela2011-07-081-17/+17
| | | | | | | | Replace old license header with correct one. Change-Id: I492ddaaa0227b2c8faf11bdcd6e12e7231a54a10 Reviewed-on: http://codereview.qt.nokia.com/1312 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* Replace the QGraphicsSceneHoverEvent with a QHoverEventLars Knoll2011-07-071-3/+3
| | | | | | | | | | One step towards getting rid of the remaining graphics view dependencies Change-Id: Ieeb84fc115c96393fdee453615a424679dc48177 Reviewed-on: http://codereview.qt.nokia.com/1139 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Use QWheelEvent instead of QGraphicsSceneWheelEventLars Knoll2011-07-071-1/+1
| | | | | | | | | | Since WheelEvent is not floating point based, we can use it instead of the graphics scene event. Change-Id: Ifa8411ca9c3a986ea311c8741f60213637b7c6ae Reviewed-on: http://codereview.qt.nokia.com/1140 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
* Support setting an FBO as the render target for a canvasGunnar Sletta2011-07-011-0/+3
| | | | | | | Change-Id: I8049580f1d2b27d6ebc4d595712939338c01b711 Reviewed-on: http://codereview.qt.nokia.com/986 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Disable vsync animations by defaultGunnar Sletta2011-06-101-0/+2
| | | | Change-Id: Ia614915ddb96f5c51e9883885479f1269ab361ed
* Add a DragTarget element.Andrew den Exter2011-06-091-0/+3
| | | | | | | Provides an area that can be used to handle events when other items are dragged over it. Task-number: QMLNG-32
* Merge branch 'master' into qtquick2Gunnar Sletta2011-06-091-0/+2
|\
| * Support calling update while syncing scenegraph.Gunnar Sletta2011-06-091-0/+2
| | | | | | | | | | | | | | The variable inSync is written from the scene graph thread and read from the GUI thread, but this is safe as it is only written to during the sync phase, during which the GUI thread is already blocked.
* | Merge branch 'master' into qtquick2Aaron Kennedy2011-06-091-21/+71
|\| | | | | | | | | | | Conflicts: src/declarative/items/qsgcanvas.cpp src/declarative/items/qsgcanvasitem.cpp
| * A better threaded rendererGunnar Sletta2011-06-061-20/+71
| |
* | Don't crash if GL context initialization failedAaron Kennedy2011-06-081-0/+1
|/
* When calling update() on a QSGItem during the sync phase, we did not update.Gunnar Sletta2011-05-121-0/+1
| | | | | | The QSGCanvas autotest did this. Reviewed-by: Kim
* Stop the render thread before deleting the QSGCanvas.Gunnar Sletta2011-05-111-0/+2
|
* Enable the threaded renderer.Gunnar Sletta2011-05-051-12/+3
| | | | | Disable by specifying QML_NO_THREADED_RENDERER if this causes problems
* Initial import from qtquick2.Qt by Nokia2011-04-271-0/+195
Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469