summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed some qdoc errors.Martin Smith2010-03-021-1/+1
|
* compile fix with namespaceshjk2010-03-011-1/+2
|
* compile fix for WinCEMaurice Kalinowski2010-03-011-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-qmlMartin Jones2010-03-011-2/+19
|\ | | | | | | | | Conflicts: demos/declarative/flickr/mobile/ImageDetails.qml
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-011-1/+1
| |\
| * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-03-0149-563/+1284
| |\ \ | | | | | | | | | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativeproperty/tst_qdeclarativeproperty.cpp
| * | | Fix reload() when keys are not specified, and add extra tests.Bea Lam2010-03-011-2/+19
| | | |
* | | | Small optimizations.Martin Jones2010-03-012-4/+10
| |_|/ |/| |
* | | Use setOpacity(0.) rather than setVisible() to avoid positioner relayout.Martin Jones2010-03-011-1/+1
| |/ |/|
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-011-0/+2
|\ \
| * | Fix IM repaint.Warwick Allison2010-03-011-0/+2
| | | | | | | | | | | | Task-number: QT-448
* | | Rename QDeclarativeGraphics_setParent_noEvent QDeclarative_setParent_noEventMartin Jones2010-03-016-12/+12
|/ /
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-03-0122-20/+38
|\ \
| * | Fixed private header include style to work when headers are installed.Rohan McGovern2010-03-018-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 System2010-03-011-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.7Thiago Macieira2010-02-27330-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-1Martin Smith2010-02-261-4/+8
| |\ \ \ \
| * | | | | doc: Added \since 4.7 to several \qmlclass elements.Martin Smith2010-02-2615-11/+32
| | | | | |
* | | | | | Set delegate Z before complete() so that view Z is overridden by delegate.Martin Jones2010-03-013-3/+7
| |_|_|/ / |/| | | |
* | | | | Add mention of highlightRangeMode in snapMode docs.Martin Jones2010-03-011-0/+6
| |_|/ / |/| | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2612-353/+444
|\ \ \ \
| * | | | Revert "Some animation cleanup/refactoring."Leonardo Sobral Cunha2010-02-262-20/+12
| | | | | | | | | | | | | | | | | | | | This reverts commit b5700759da7bccf0ccd6e20b1727950532894ad2.
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-269-81/+281
| |\ \ \ \
| | * | | | DocAaron Kennedy2010-02-262-13/+150
| | | | | |
| | * | | | update painted geometry on pixmapChanged rather than sourceChangedYann Bodson2010-02-262-10/+3
| | | | | |
| * | | | | Rename files to follow class name.Warwick Allison2010-02-264-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2822
| * | | | | Change Connection syntax as per QT-2822.Warwick Allison2010-02-264-166/+135
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2610-73/+160
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Polish QDeclarativeProperty APIAaron Kennedy2010-02-266-58/+128
| |/ / / /
| * | | | Test, demo, and work-around bug QTBUG-8535Warwick Allison2010-02-261-0/+3
| | | | |
| * | | | Fix ParentAnimation crash.Michael Brasser2010-02-262-3/+9
| | | | |
| * | | | Some animation cleanup/refactoring.Michael Brasser2010-02-262-12/+20
| | | | |
* | | | | Make Flickable overshoot behavior nicer.Martin Jones2010-02-263-27/+58
| | | | |
* | | | | Tiny doc tweak.Martin Jones2010-02-261-1/+1
|/ / / /
* | | | Fix Flickable.overShoot doc - it is a bool not a realMartin Jones2010-02-261-2/+2
| | | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-265-47/+57
|\ \ \ \
| * | | | Remove unnecessary QDeclarativeProperty::Type enum valuesAaron Kennedy2010-02-263-22/+43
| | | | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-266-7/+486
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2556-1366/+1535
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativeproperty.cpp
| * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2513-10/+120
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-254-29/+27
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2552-743/+872
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qdeclarativemetaproperty.cpp
| * | | | | | | | Automatically connect to signals "onFooChanged" if property is "foo".Bea Lam2010-02-253-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 contentXXXMartin Jones2010-02-265-80/+62
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | A viewport is the thing you look through, not what you look at.
* | | | | | | | Add ParentAnimation.Michael Brasser2010-02-266-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 Raggi2010-02-252-6/+20
| | | | | | |
* | | | | | | Fix compilation due to enabling of QStringBuilder throughoutThiago Macieira2010-02-251-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-25324-19071/+19942
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp
| * | | | | | Don't look for contextual keywords when defining properties.Roberto Raggi2010-02-253-632/+658
| | | | | | |
| * | | | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-255-6/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context.