summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-264-57/+281
|\
| * Added highlight ranges/modes to PathViewMartin Jones2010-03-264-57/+281
| | | | | | | | Task-number: QT-319
* | I've been told this fixes compilation on windows.Alan Alpert2010-03-261-1/+1
| |
* | Doc AugmentationAlan Alpert2010-03-261-1/+3
| | | | | | | | Task-number: QTBUG-9396
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-2629-340/+784
|\ \ | |/
| * Use QThread IdlePriority rather than linux platform code.Martin Jones2010-03-261-14/+1
| | | | | | | | Task-number: QTBUG-9032
| * Test and fix order of transform application.Warwick Allison2010-03-263-37/+9
| | | | | | | | Remove Translate.z since Qt cannot sensibly support it yet.
| * Fix namespace.Warwick Allison2010-03-261-1/+3
| |
| * Simple case, no size returned.Warwick Allison2010-03-261-1/+1
| | | | | | | | Fixes Particles plugin.
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-261-4/+0
| |\
| | * QDeclarativeItem don't need to emit childrenChanged anymore.Alexis Menard2010-03-261-4/+0
| | | | | | | | | | | | | | | | | | It's done by QGraphicsItemPrivate::addChild and removeChild. Reviewed-by:akennedy
| * | sourceWidth/sourceHeight -> sourceSizeWarwick Allison2010-03-264-47/+24
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-266-18/+20
| |\
| | * Do not call parent implementation if we accept the keyPressEvent in GridView ↵Yann Bodson2010-03-262-6/+6
| | | | | | | | | | | | and ListView delegates.
| | * Remove Q prefix from the validators.Michael Brasser2010-03-263-11/+13
| | |
| | * Really fix qMin() parameter types.Martin Jones2010-03-261-1/+1
| | |
| * | Control of image rendered size (esp. SVG).Warwick Allison2010-03-2612-78/+514
| |/ | | | | | | | | | | | | Add Translate transform. Image::sourceWidth and Image::sourceHeight read/write properties. Task-number: QTBUG-8984
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2613-266/+171
| |\
| | * Remove some Script {} docsMartin Jones2010-03-254-105/+12
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-254-27/+9
| | |\
| | | * Fix where data() is called before xml is loaded. Also add status tests.Bea Lam2010-03-251-2/+4
| | | |
| | | * Clean upBea Lam2010-03-251-20/+0
| | | |
| | | * Remove int parameter from ListModel countChanged() to be consistentBea Lam2010-03-253-5/+5
| | | | | | | | | | | | | | | | with other classes with countChanged() signals.
| | * | Ensure both qMin() parameters are the same type.Martin Jones2010-03-251-1/+1
| | |/
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-255-133/+149
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeitem.cpp
| | | * Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-2569-1139/+1101
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/declarative/minehunt/minehunt.cpp src/declarative/qml/qdeclarativecompiler.cpp
| | | * \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-03-243-3/+3
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Four-way merge: take the qt-qml.git#4.7 branch version (which uses fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1. Conflicts: src/declarative/qml/qdeclarativecompiler.cpp
| | | * | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-242-117/+133
| | | | | |
| | | * | | doc: Fixed function signatures in qdoc comments.Martin Smith2010-03-241-9/+9
| | | | | |
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-232-9/+9
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits) Fix the test of QDirIterator with NoDot and NoDotDot Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot QFSFileEngine: don't look through NTFS junctions After showing modal windows, WM_LBUTTONUP for double click is ignored. Possible fix for missing QML properties in the qt.qhp file. Use standard theme icons in Linguist where possible Use more standard icons from the theme in Assistant Use more standard icons for standard actions in Designer Drag & drop operations wont end while using Remote Desktop sessions _close(fd) closes the associated handle and not the other way around Fixed locale mapping on Symbian. Revert change 7bf4512659 on Cocoa. Extended the high_attributes array, since we have more than 127 widget attributes now. Added instructions for MinGW users wanting to build the MySQL driver. Designer: Fix broken resource view. Add missing ,. get rid of build warning messages Quiet unnecessary configure/qmake warnings when EPOCROOT is not set. Add configure test for Maemo Internet Connection Daemon. fix warning ...
| | | | * | | Fix cast-from-ascii warningThiago Macieira2010-03-201-1/+1
| | | | | | |
| | | | * | | Fix compilation on LinuxThiago Macieira2010-03-201-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Error was: narrowing conversion of 'point.QPointF::x()' from 'qreal' to 'float' inside { }
| | | | * | | Fix compilation with WINSCW: #include doesn't find files in the same dirThiago Macieira2010-03-201-3/+3
| | | | | | |
| * | | | | | Add missing files from 72599ca45c416f2f0a9654412c14a148ca3d728cAaron Kennedy2010-03-262-0/+167
| |/ / / / /
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-2549-878/+1471
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Optimize QML "parent" property accessAaron Kennedy2010-03-254-16/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For properties that are as important as "parent", QML cannot afford the overhead of a signal/slot connection.
| * | | | | Begin dragging PathView up to the level (quality and functionality) of other ↵Martin Jones2010-03-253-302/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | views. Task-number: QT-319
| * | | | | Auto-test fix.Alexis Menard2010-03-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix a connect in QDeclarativeItem. Reviewed-by:TrustMe
| * | | | | Build Fix and port to new width and height propertiesAlexis Menard2010-03-255-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Martin Jones
| * | | | | Port Flickable and Flipable to support QGraphicsObject.Alexis Menard2010-03-254-20/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacing QDeclarativeItem* members by QGraphicsObject*. Build fix too. Reviewed-by:akennedy
| * | | | | Protect the QDeclarativeListProperty used in QGraphicsItem with ifdefAlexis Menard2010-03-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Then it fixes the build Reviewed-by:TrustMe
| * | | | | Fix the build due to new properties in QGraphicsObject.Alexis Menard2010-03-252-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by:Martin Jones
| * | | | | Remove the children property from QDeclarativeItem.Alexis Menard2010-03-253-113/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit remove the children property from QDeclarativeItem because it's now in QGraphicsObject. This commit also get rid of width and height properties to use the one in QGraphicsObject. Task-number:QT-2757 Reviewed-by:akennedy
| * | | | | Update AnchorChanges to use more natural form for setting anchors.Michael Brasser2010-03-254-192/+408
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of specifying left, right, etc directly, we keep the regular syntax and specify anchors.left, anchors.right, etc. Also get rid of the hacky "reset" string property and use undefined to reset (like PropertyChanges).
| * | | | | Pen is not a creatable type.Michael Brasser2010-03-251-1/+1
| | |_|_|/ | |/| | |
| * | | | Qt.Infinite -> Animation.InfiniteMichael Brasser2010-03-257-12/+48
| | | | | | | | | | | | | | | | | | | | | | | | | Too misleading to have on the Qt object, as it only means infinite for animation loops.
| * | | | Doc fix.Michael Brasser2010-03-253-3/+3
| | | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-2510-38/+81
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-257-34/+50
| | |\ \ \ \
| | | * | | | Replace Animation's repeat property with loops.Michael Brasser2010-03-257-34/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You can now loop a fixed number of times as well as forever. The old repeat behavior (loop forever) can be acheived with loops: Qt.Infinite.