Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | QtDeclarative: Fix compiler warnings | Friedemann Kleint | 2010-03-02 | 4 | -4/+2 |
| | | | | | class/struct mixups, unused variables. Reviewed-by: Thomas Hartmann <thartman@trolltech.com> | ||||
* | QDeclarativeView: Make usable in Designer | Friedemann Kleint | 2010-03-02 | 1 | -1/+3 |
| | | | | | | Make source a designable property, add missing declarations for enumerations. Reviewed-by: akennedy <qt-info@nokia.com> | ||||
* | doc: Fixed some qdoc errors. | Martin Smith | 2010-03-02 | 1 | -1/+1 |
| | |||||
* | compile fix with namespaces | hjk | 2010-03-01 | 1 | -1/+2 |
| | |||||
* | compile fix for WinCE | Maurice Kalinowski | 2010-03-01 | 1 | -0/+2 |
| | | | | | | do not include headers of disabled modules Reviewed-by: Paul Olav Tvete | ||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-03-01 | 1 | -2/+19 |
|\ | | | | | | | | | Conflicts: demos/declarative/flickr/mobile/ImageDetails.qml | ||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-03-01 | 1 | -1/+1 |
| |\ | |||||
| * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-03-01 | 49 | -563/+1284 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp | ||||
| * | | | Fix reload() when keys are not specified, and add extra tests. | Bea Lam | 2010-03-01 | 1 | -2/+19 |
| | | | | |||||
* | | | | Small optimizations. | Martin Jones | 2010-03-01 | 2 | -4/+10 |
| |_|/ |/| | | |||||
* | | | Use setOpacity(0.) rather than setVisible() to avoid positioner relayout. | Martin Jones | 2010-03-01 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-03-01 | 1 | -0/+2 |
|\ \ | |||||
| * | | Fix IM repaint. | Warwick Allison | 2010-03-01 | 1 | -0/+2 |
| | | | | | | | | | | | | Task-number: QT-448 | ||||
* | | | Rename QDeclarativeGraphics_setParent_noEvent QDeclarative_setParent_noEvent | Martin Jones | 2010-03-01 | 6 | -12/+12 |
|/ / | |||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-03-01 | 22 | -20/+38 |
|\ \ | |||||
| * | | Fixed private header include style to work when headers are installed. | Rohan McGovern | 2010-03-01 | 8 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Private headers should include other private headers by: #include <private/qfoo_p.h> Using a relative path works during the build, but does not work when building other projects which attempt to use the installed private headers (e.g. unit tests for private classes). | ||||
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵ | Qt Continuous Integration System | 2010-03-01 | 1 | -0/+6 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Add mention of highlightRangeMode in snapMode docs. Fix position of image in detail view. | ||||
| * \ \ | Merge remote branch 'origin/master' into 4.7 | Thiago Macieira | 2010-02-27 | 330 | -21634/+23196 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp | ||||
| * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 | Martin Smith | 2010-02-26 | 1 | -4/+8 |
| |\ \ \ \ | |||||
| * | | | | | doc: Added \since 4.7 to several \qmlclass elements. | Martin Smith | 2010-02-26 | 15 | -11/+32 |
| | | | | | | |||||
* | | | | | | Set delegate Z before complete() so that view Z is overridden by delegate. | Martin Jones | 2010-03-01 | 3 | -3/+7 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Add mention of highlightRangeMode in snapMode docs. | Martin Jones | 2010-03-01 | 1 | -0/+6 |
| |_|/ / |/| | | | |||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-26 | 12 | -353/+444 |
|\ \ \ \ | |||||
| * | | | | Revert "Some animation cleanup/refactoring." | Leonardo Sobral Cunha | 2010-02-26 | 2 | -20/+12 |
| | | | | | | | | | | | | | | | | | | | | This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2. | ||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-26 | 9 | -81/+281 |
| |\ \ \ \ | |||||
| | * | | | | Doc | Aaron Kennedy | 2010-02-26 | 2 | -13/+150 |
| | | | | | | |||||
| | * | | | | update painted geometry on pixmapChanged rather than sourceChanged | Yann Bodson | 2010-02-26 | 2 | -10/+3 |
| | | | | | | |||||
| * | | | | | Rename files to follow class name. | Warwick Allison | 2010-02-26 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2822 | ||||
| * | | | | | Change Connection syntax as per QT-2822. | Warwick Allison | 2010-02-26 | 4 | -166/+135 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-26 | 10 | -73/+160 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Polish QDeclarativeProperty API | Aaron Kennedy | 2010-02-26 | 6 | -58/+128 |
| |/ / / / | |||||
| * | | | | Test, demo, and work-around bug QTBUG-8535 | Warwick Allison | 2010-02-26 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Fix ParentAnimation crash. | Michael Brasser | 2010-02-26 | 2 | -3/+9 |
| | | | | | |||||
| * | | | | Some animation cleanup/refactoring. | Michael Brasser | 2010-02-26 | 2 | -12/+20 |
| | | | | | |||||
* | | | | | Make Flickable overshoot behavior nicer. | Martin Jones | 2010-02-26 | 3 | -27/+58 |
| | | | | | |||||
* | | | | | Tiny doc tweak. | Martin Jones | 2010-02-26 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Fix Flickable.overShoot doc - it is a bool not a real | Martin Jones | 2010-02-26 | 1 | -2/+2 |
| | | | | |||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-26 | 5 | -47/+57 |
|\ \ \ \ | |||||
| * | | | | Remove unnecessary QDeclarativeProperty::Type enum values | Aaron Kennedy | 2010-02-26 | 3 | -22/+43 |
| | | | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-26 | 6 | -7/+486 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 56 | -1366/+1535 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeproperty.cpp | ||||
| * \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 13 | -10/+120 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 4 | -29/+27 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-25 | 52 | -743/+872 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativemetaproperty.cpp | ||||
| * | | | | | | | | Automatically connect to signals "onFooChanged" if property is "foo". | Bea Lam | 2010-02-25 | 3 | -25/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This follows on from a2a8cea2835ef24104fe784b6ce0f508cc5637c0 to make it work for PropertyChanges and QDeclarativeMetaProperty as well. Task-number: QT-2783 | ||||
* | | | | | | | | | Renamed Flickable viewportXXX properties contentXXX | Martin Jones | 2010-02-26 | 5 | -80/+62 |
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | A viewport is the thing you look through, not what you look at. | ||||
* | | | | | | | | Add ParentAnimation. | Michael Brasser | 2010-02-26 | 6 | -7/+486 |
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ParentAnimation will replace ParentAction. It provides two advantages: * It will animate correctly when reversed. * It allows reparenting via another item, which is useful in the presence of clips, for example. | ||||
* | | | | | | | Protect against double initialization. | Roberto Raggi | 2010-02-25 | 2 | -6/+20 |
| | | | | | | | |||||
* | | | | | | | Fix compilation due to enabling of QStringBuilder throughout | Thiago Macieira | 2010-02-25 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge branch 'master' of git:qt/qt-qml | Thiago Macieira | 2010-02-25 | 324 | -19071/+19942 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp |