aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/items/qsgitem.h
Commit message (Collapse)AuthorAgeFilesLines
* Rename Qt Quick-specific classes to QQuick*Kent Hansen2011-10-211-415/+0
| | | | | | | | | | | | | | | | | | | | | | The QSG (SceneGraph) prefix is too generic for Qt Quick(2)-specific classes. All the classes and files in the declarative/items directory have been renamed. In particular, for classes that are currently public, the renaming is as follows: QSGView --> QQuickView QSGCanvas --> QQuickCanvas QSGItem --> QQuickItem QSGPaintedItem --> QQuickPaintedItem The header files have been renamed accordingly (e.g. qsgview.h --> qquickview.h). Change-Id: Iac937fff81db20bb639486a793c3aeb5230b038c Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* Add DropArea item and Drag attached property.Andrew den Exter2011-10-101-5/+6
| | | | | | | | | | | | | | | | | | | Refactors drag API to improve compatibility with traditional drag and drop by reusing events and adding drop actions. Event sending is removed from MouseArea, instead the Drag object can be attached to the item that is dragged and it will send drag events when the position of that item is changed or when its active property changes. The DragTarget item is renamed to DropArea and can now communicate supported and suggested actions. Task-number: QTBUG-19747 Change-Id: I46cb77e68cf1ff32bbcbf0945facb593c9c2243c Reviewed-on: http://codereview.qt-project.org/4638 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Fix warnings.Michael Brasser2011-09-161-3/+3
| | | | | | | Change-Id: I7f066550fa2e1799f1c44b787da84c882f549b03 Reviewed-on: http://codereview.qt-project.org/5036 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Merge branch 'master' into refactorGunnar Sletta2011-09-121-1/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/cppextensions/qwidgets/qwidgets.pro examples/declarative/minehunt/main.cpp examples/declarative/minehunt/minehunt.pro src/declarative/items/context2d/qsgcontext2d.cpp src/declarative/items/qsgflickable.cpp src/declarative/items/qsgtextedit.cpp src/declarative/items/qsgtextinput.cpp src/declarative/particles/qsgangleddirection.cpp src/declarative/particles/qsgcumulativedirection.cpp src/declarative/particles/qsgcumulativedirection_p.h src/declarative/particles/qsgfollowemitter.cpp src/declarative/particles/qsgmodelparticle.cpp src/declarative/particles/qsgparticlesystem.cpp src/qtquick1/util/qdeclarativeview.h tests/auto/declarative/examples/examples.pro tests/auto/declarative/qsgfocusscope/tst_qsgfocusscope.cpp Change-Id: Ib4be2a5e742dee1a399d73da97161736f77448e5
| * Make state a public property of QSGItem.Michael Brasser2011-09-121-1/+4
| | | | | | | | | | | | | | | | | | The property type is QString, so doesn't need to be private. Change-Id: If1d1a740be451331e8142fbe1d89fda2eeff4509 Reviewed-on: http://codereview.qt-project.org/4499 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Charles Yin <charles.yin@nokia.com>
| * Add new path functionality.Michael Brasser2011-09-081-0/+1
| | | | | | | | | | | | | | | | | | Introduces new elements PathCurve, PathArc, PathSvg, PathAnimation, and PathInterpolator. Change-Id: I0f5b6284511f332e826ed373018418d2e2a8c07e Reviewed-on: http://codereview.qt-project.org/4220 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Remove the remaining dependencies onto QtWidgetsLars Knoll2011-09-011-1/+0
| | | | | | | | | | | | 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-5/+5
| | | | | | | | | | | | | | | | | | | | 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>
* | Merge branch 'master' into refactorGunnar Sletta2011-08-251-0/+1
|\| | | | | | | | | | | | | | | | | | | | | 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
| * Cancel mousearea pressed state when window is deactivatedCharles Yin2011-08-021-0/+1
| | | | | | | | | | | | | | | | Change-Id: I1cc21c338576a2ac3b1e8e282e8e4de3bc63759a Task-number:QTBUG-19904 Reviewed-on: http://codereview.qt.nokia.com/2357 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com>
* | Make textureProvider() a virtual accessor in QSGItem.Gunnar Sletta2011-08-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | This gets us one step closer to a public QSGTextureProvider API. This patch also includes a fix to the material ownership in QSGCustomParticle. Change-Id: I620e3006816db0c37eedf3a20a0d4cbe7a783b82 Reviewed-on: http://codereview.qt.nokia.com/3317 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
* | Build against refactor.Samuel Rødal2011-07-291-2/+2
|/ | | | Change-Id: I0143767405afe968c0aea71651bd9e3dc7a74e23
* Clip to bounding rectAlan Alpert2011-07-281-1/+1
| | | | | | | | | | | | | Bounding rect varies from width/height in some cases, like Rectangle. This restores rectangle clipping behaviour to be the same as QtQuick 1. Task-number: QTBUG-20547 Change-Id: I2b6edc662a0026219d73b52878d2f4c046fef7f0 Reviewed-on: http://codereview.qt.nokia.com/2317 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Martin Jones <martin.jones@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
* Extract all QtQuick 1 elements into a separate library/plugin.Martin Jones2011-07-121-0/+1
| | | | | | Change-Id: I41a280de2739ee08202f4be2519e5012870090f2 Reviewed-on: http://codereview.qt.nokia.com/1391 Reviewed-by: Martin Jones <martin.jones@nokia.com>
* Merge branch 'v8'Aaron Kennedy2011-07-081-2/+2
|\ | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativescarceresourcescriptclass.cpp src/declarative/qml/qdeclarativescarceresourcescriptclass_p.h Change-Id: I54e579307cbeafbbad21884218c5e797ba245c8b
| * Merge branch 'qtquick2' into v8Aaron Kennedy2011-06-101-0/+5
| |\
| * | Initial V8 integrationAaron Kennedy2011-06-061-2/+2
| | |
* | | 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>
* | Add a DragTarget element.Andrew den Exter2011-06-091-0/+5
|/ | | | | | | Provides an area that can be used to handle events when other items are dragged over it. Task-number: QMLNG-32
* Initial import from qtquick2.Qt by Nokia2011-04-271-0/+399
Branched from the monolithic repo, Qt qtquick2 branch, at commit a4a585d2ee907746682846ae6e8a48e19deef469