summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-24313-16161/+16161
| | | | QDeclarativeXXX.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2447-27/+124
|\ | | | | | | | | Conflicts: src/declarative/qml/qml.h
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2447-36/+134
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-2446-24/+122
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-231-1/+2
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix compilation with namespace.
| | | | * Fix compilation with namespace.ck2010-02-231-1/+2
| | | | |
| | | * | Merge remote branch 'origin/master'Thiago Macieira2010-02-2387-1670/+1363
| | | |\ \ | | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-231-2/+2
| | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: clean up x11 desktop detection avoid double reallocations in inserting operations create temporaries more intelligently do not protect against self-assignment in QList::replace() make queues to which only lists are appended not blow the memory optimize queue-like structures remove more pointless recalculations Fix compilation with namespace. Fix compilation with namespace.
| | | | | * Fix compilation with namespace.ck2010-02-221-2/+2
| | | | | |
| | | * | | doc: Fixed some qdoc errors.Martin Smith2010-02-221-2/+2
| | | | | |
| | | * | | Merge remote branch 'origin/master'Thiago Macieira2010-02-2095-1911/+2734
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| | | * | | doc: Added "\since 4.7" to a bunch of declarative stuff.Martin Smith2010-02-1945-18/+116
| | | | | |
| * | | | | Disallow ids that start with upper case letters.Bea Lam2010-02-241-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2786
* | | | | | 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-2330-426/+1156
| |\ \ \ \ \ | | |/ / / /
| * | | | | Fix illegal access in QmlStyledText and add auto testsMartin Jones2010-02-231-12/+12
| | | | | |
* | | | | | docWarwick Allison2010-02-231-0/+8
| | | | | |
* | | | | | Merge fix.Warwick Allison2010-02-231-1/+6
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2352-716/+1706
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
| * | | | | Added missing destructor to QmlExtensionInterface.Roberto Raggi2010-02-231-0/+1
| | | | | |
| * | | | | Merge branch 'qtruntime'Roberto Raggi2010-02-2312-245/+774
| |\ \ \ \ \
| | * | | | | Get rid of QmlModulePlugin.Roberto Raggi2010-02-234-200/+0
| | | | | | |
| | * | | | | Look for QML plugins in the paths specified in QML_PLUGIN_PATH env var.Roberto Raggi2010-02-234-6/+31
| | | | | | |
| | * | | | | Added QmlEnginePrivate::resolvePlugin.Roberto Raggi2010-02-232-3/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | resolvePlugin returns the merge of the plugin's base name with the platform suffix (e.g. .dylib) and prefix (e.g. lib).
| | * | | | | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-2344-488/+964
| | |\ \ \ \ \
| | * | | | | | Load QML extensions.Roberto Raggi2010-02-227-25/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows projects which use the QtDeclarative module to register QML types and functions through C++ extensions. Reviewed-by: mae
| | * | | | | | Document the QmlExtensionPlugin interface.Roberto Raggi2010-02-223-0/+157
| | | | | | | |
| | * | | | | | Compile.Roberto Raggi2010-02-221-2/+0
| | | | | | | |
| | * | | | | | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-2285-1666/+1350
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h
| | * | | | | | | Introduced QmlEngine::importExtension.Roberto Raggi2010-02-222-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | importExtension can be used to import QmlExtensionInterface(s) into a QmlEngine.
| | * | | | | | | Get rid of the unfriendly ImportedNamespace::isBuiltin flag.Roberto Raggi2010-02-191-27/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `isBuiltin' flag doesn't play nice with hybrid apps where the types in a namespace are provided by both C++ and QML code. Done-with: mae
| | * | | | | | | Added QmlExtensionPlugin and QmlExtensionInterface.Roberto Raggi2010-02-194-2/+75
| | | | | | | | |
| | * | | | | | | Introduced a new parser for qmldir files.Roberto Raggi2010-02-194-20/+352
| | | | | | | | |
| | * | | | | | | Introduced the internal virtual method QmlView::setRootObject(object).Roberto Raggi2010-02-192-45/+54
| | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | Done-with: mae
| * | | | | | | Fix build on solarisAlan Alpert2010-02-231-1/+1
| | | | | | | |
| * | | | | | | Doc fixAlan Alpert2010-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove stray '>'
| * | | | | | | More precise compiler errorsAlan Alpert2010-02-231-2/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | People were having trouble figureing what was wrong based off the previous error message. This should now be rectified - at least for users who read the docs. Reviewed-by: mae
| * | | | | | String to enum conversion in value typesAaron Kennedy2010-02-235-12/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning a string to a value type enum property from a binding was not working as QmlMetaProperty didn't realise the property was of enum type.
| * | | | | | Adds QmlEasingValueType to qmlLeonardo Sobral Cunha2010-02-235-123/+178
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Add missing NOTIFY signals to positioners, particles and webviewJoona Petrell2010-02-236-42/+161
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2327-260/+353
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2327-233/+373
| | |\ \ \ \ \
| | | * | | | | QmlExpression API reviewAaron Kennedy2010-02-2312-65/+38
| | | | | | | |
| | | * | | | | Make QmlBinding (and friends) privateAaron Kennedy2010-02-2318-164/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23306-3008/+3090
| | |\ \ \ \ \ \
| | * | | | | | | 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-233-29/+37
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2538
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-232-17/+19
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| * | | | | | | Add support for setting the root index when using a QAbstractItemModel.Martin Jones2010-02-232-4/+168
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Task-number: QT-2777