summaryrefslogtreecommitdiffstats
path: root/src/declarative/graphicsitems/qdeclarativeitem.cpp
Commit message (Expand)AuthorAgeFilesLines
* Update year in Nokia copyright messages.Jason McDonald2012-01-111-1/+1
* Merge remote-tracking branch 'upstream/4.8' into qt-4.8-from-4.7Sergio Ahumada2011-08-311-2/+2
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-08-301-2/+2
| |\
| | * QDeclarative::hasActiveFocus should return false for hidden itemsAlan Alpert2011-08-301-2/+2
* | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-311-1/+1
|\ \ \ | |/ / |/| |
| * | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-08-301-1/+1
* | | Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-261-1/+1
|\ \ \ | |/ / | | / | |/ |/|
* | Doc: Standardized on QtQuick for \since declarations.David Boddie2011-07-011-1/+1
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-06-171-1/+0
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-05-271-1/+0
| |\
| | * Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalA...Joona Petrell2011-05-271-1/+0
| * | Update licenseheader text in source filesJyri Tahtela2011-05-131-17/+17
| |/
* | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtDavid Boddie2011-05-241-17/+17
|\ \
| * | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-131-17/+17
| |/
* | Doc: Fixed qdoc warnings.David Boddie2011-05-111-3/+39
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-221-11/+198
|\
| * fixes/improvements for new QML right-to-left docsBea Lam2011-03-211-24/+43
| * Update QML "What's New" docs.Martin Jones2011-03-111-0/+4
| * Merge branch '4.7' into qtquick11Martin Jones2011-03-011-41/+71
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-02-041-41/+71
| | |\
| * | | Reverse KeyNavigation left and right properties when the layout mirroring is ...Joona Petrell2011-03-011-10/+22
| * | | Add LayoutMirroring attached property for mirroring QML layoutsJoona Petrell2011-03-011-1/+153
| |/ /
* | | Doc: Fixed a code snippet.David Boddie2011-02-221-2/+2
* | | Doc: Fixed links and whitespace.David Boddie2011-02-171-1/+1
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-02-041-24/+150
|\ \ \ | |/ / | | / | |/ |/|
| * Improve docs on Item::visible and Item::opacityBea Lam2011-02-021-10/+33
| * Fix critical spelling mistake.Martin Jones2011-01-251-1/+1
| * Expose implicitWidth and implicitHeight properties of Item.Martin Jones2011-01-241-6/+79
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-191-1/+1
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2011-01-071-30/+24
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into qtquick11Martin Jones2010-12-131-2/+4
| |\ \ \
| * | | | KeyNavigation skips disabled or invisible itemsChristopher Ham2010-12-101-8/+38
* | | | | Doc: Fixed the syntax of QML code snippets.David Boddie2011-01-241-20/+24
* | | | | Merge branch '4.7' into qdoc-simplifiedDavid Boddie2011-01-211-34/+1
|\ \ \ \ \
| * | | | | Doc: Fixed QML syntax.David Boddie2011-01-191-12/+20
| | |_|_|/ | |/| | |
| * | | | Update copyright year to 2011.Jason McDonald2011-01-101-1/+1
| | |_|/ | |/| |
| * | | Doc fixes for introduction page and Item docsBea Lam2011-01-061-28/+0
* | | | Doc: Fixed invalid QML snippets and marked up JavaScript correctly.David Boddie2011-01-201-33/+64
|/ / /
* | | Merge branch '4.7-upstream' into 4.7-docA-Team2010-12-131-2/+4
|\ \ \ | | |/ | |/|
| * | Improvements to anchoring docsBea Lam2010-12-091-0/+2
| * | Doc: make it clear that "z" affects sibling stacking order.Martin Jones2010-12-051-2/+2
| |/
* | Merge branch '4.7-upstream' into 4.7-docA-Team2010-11-301-51/+21
|\ \ | |/
| * Move KeyNavigation example to snippets, plus some doc rewordingBea Lam2010-11-291-51/+21
* | Doc: Added documentation about Tab and Backtab key handling.David Boddie2010-11-241-1/+23
|/
* Don't emit xChanged()/yChanged() twice.Martin Jones2010-11-041-4/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-131-22/+21
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-10-041-8/+19
| |\
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2010-09-201-2/+61
| |\ \
| * | | Doc: More work on QML reference documentation.David Boddie2010-09-171-22/+21
* | | | Don't forward keys to invisible items.Martin Jones2010-10-081-4/+4