summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2411-2/+24
|\ | | | | | | | | Conflicts: src/declarative/qml/qml.h
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-2411-2/+24
| |\ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
| | * Merge remote branch 'origin/master'Thiago Macieira2010-02-2325-417/+286
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp
| | * | doc: Fixed some qdoc errors.Martin Smith2010-02-221-2/+2
| | | |
| | * | Merge remote branch 'origin/master'Thiago Macieira2010-02-2015-747/+867
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| | * | | doc: Added "\since 4.7" to a bunch of declarative stuff.Martin Smith2010-02-1911-0/+22
| | | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-241-12/+12
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-235-168/+103
| |\ \ \ \
| * | | | | Fix illegal access in QmlStyledText and add auto testsMartin Jones2010-02-231-12/+12
| | | | | |
* | | | | | Merge fix.Warwick Allison2010-02-231-1/+6
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2311-233/+285
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
| * | | | | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-2311-189/+239
| |\ \ \ \ \
| | * | | | | Adds QmlEasingValueType to qmlLeonardo Sobral Cunha2010-02-233-123/+51
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now it's possible to use easing curve types directly in qml as value types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the former ugly string format, like "easeOutBounce(amplitude:3.0)". Reviewed-by: akennedy
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-237-39/+152
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-236-8/+4
| | | |\ \ \ \
| | | | * | | | QmlExpression API reviewAaron Kennedy2010-02-233-4/+0
| | | | | | | |
| | | | * | | | Make QmlBinding (and friends) privateAaron Kennedy2010-02-234-4/+4
| | | | | |_|/ | | | | |/| | | | | | | | | | | | | | | | | | | | | | | QmlBinding exposes way too many implementation details to be confident about making it public right now.
| | | * | | | Doc fix.Bea Lam2010-02-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2831
| | | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2363-1166/+1139
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Add XmlRole::isKey property for incremental data changes when reload()Bea Lam2010-02-231-29/+146
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is called. Task-number: QT-2831
| | * | | | | Remove QmlView::execute(). QmlView::setSource() does it all now.Martin Jones2010-02-232-27/+36
| | | |/ / / | | |/| | | | | | | | | | | | | | | Task-number: QT-2538
| * | | | | Compile.Roberto Raggi2010-02-221-2/+0
| | | | | |
| * | | | | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-2225-417/+286
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h
| * | | | | Introduced the internal virtual method QmlView::setRootObject(object).Roberto Raggi2010-02-192-45/+54
| | |_|_|/ | |/| | | | | | | | | | | | | Done-with: mae
* | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-2328-131/+309
| |/ / / |/| | | | | | | | | | | Task-number: QT-2798
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2216-311/+208
|\ \ \ \
| * | | | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-2216-311/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a value type QmlListProperty doesn't consume any memory in the object. It also has a companion QmlListReference class that is part of the public API for C++ developers to interact with that also manages memory issues that existed with previous solutions (if the containing QObject was destroyed it left a dangling pointer).
* | | | | Remove race condition in remote pixmap cancelling.Martin Jones2010-02-221-17/+12
|/ / / /
* | | | Rename MouseRegion -> MouseAreaMartin Jones2010-02-224-10/+10
| | | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-222-52/+38
|\ \ \ \
| * | | | Fix compile error on SolarisAaron Kennedy2010-02-222-52/+38
| |/ / / | | | | | | | | | | | | | | | | QTBUG-8267. Remove templating from QmlTimeLineEvent class (and rename it to QmlTimeLineCallback to more represent what it is).
* | | | Document the default velocity of EaseFollowMartin Jones2010-02-221-1/+10
| | | | | | | | | | | | | | | | Task-number: QTBUG-8181
* | | | Remove use of unexprted private classes.Martin Jones2010-02-222-26/+8
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-191-3/+6
|\ \ \
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-191-8/+0
| |\ \ \
| * | | | Delete the QmlImageRequestHandler in the correct thread.Martin Jones2010-02-191-3/+6
| | | | |
* | | | | More strict type checking of ListElement properties.Warwick Allison2010-02-191-10/+32
| |/ / / |/| | | | | | | | | | | Task-number: QTBUG-6203
* | | | Remove unused function that breaks build on AIX.Michael Brasser2010-02-191-8/+0
|/ / /
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1863-63/+63
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1663-64/+68
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. Fix copyright year. Fix broken license headers. doc: Fixed some qdoc errors. Reusing sheets on Mac OS X 10.5 & above shows painting artifacts. doc: Fixed some qdoc errors. QNetworkAccessManager: add method to send custom requests doc: Fixed some qdoc errors. Optimization: Avoid calling out to public API function Mac: submenu shows up at the wrong position Add operator< and qHash for QSharedPointer and fix operator-. Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX ...
| | * | Fix copyright year.Jason McDonald2010-02-1663-63/+63
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | doc: Fixed some qdoc errors.Martin Smith2010-02-162-1/+5
| | | |
* | | | Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transitionLeonardo Sobral Cunha2010-02-181-1/+0
| | | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-186-475/+578
|\ \ \ \
| * | | | Animation doc fix.Michael Brasser2010-02-181-24/+11
| | | | |
| * | | | Add a RotationAnimation element.Michael Brasser2010-02-183-0/+223
| | | | | | | | | | | | | | | | | | | | | | | | | This is needed to provide more control of rotation direction when animating.
| * | | | Remove unneeded comparison.Michael Brasser2010-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | d->propertyName is now included in props.
| * | | | Fix bugs and add tests related to manual start/stop control of animations.Michael Brasser2010-02-182-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | This better enforces the restriction on starting an animation that is not top-level, or is part of a Transition or Behavior.
| * | | | Transitions and Behaviors should exclusively control their animations.Michael Brasser2010-02-185-8/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Don't allow manual control (starting, stopping, etc) of animations in a Behavior or Transition.
| * | | | Animation's setTarget should only be called via QmlValueSource*.Michael Brasser2010-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | We rely on this to know whether to autostart. Disallow easy access to setTarget by making it private.
generated by cgit v0.12 at 2025-02-03 07:03:37 (GMT)