summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Make QML_REGISTER...TYPE functions unnecessary (still exist for now).Warwick Allison2010-02-251-13/+13
| | | | Fix multimedia plugin.
* Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView"Aaron Kennedy2010-02-253-574/+2
| | | | This reverts commit 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-241-7/+12
|\
| * Add support for qml imports directory in configure, qmake, and qmlenginemae2010-02-241-7/+12
| |
* | Fix building without the XmlPatterns ModuleAlan Alpert2010-02-241-0/+2
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-241-0/+3
|\ \ | |/
| * Build fix when using <QtDeclarative> include.Alexis Menard2010-02-241-0/+3
| |
* | Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlViewAlan Alpert2010-02-243-2/+574
| | | | | | | | | | | | | | | | | | Could use to be renamed. Possibly to -QDeclarativeViewGraphicsWidget -QGraphicsDeclarativeViewWidget (Or QGraphicsD20, in the spirit of i18n) But those aren't any shorter. Task-number: QTBUG-7067
* | Explain the onPropertyChanged pattern in the docs.Alan Alpert2010-02-241-0/+11
|/
* Make QDeclarativeMetaType and QDeclarativeType privateAaron Kennedy2010-02-2413-26/+30
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2423-317/+328
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-241-1/+1
| |\
| | * Fix wrong property name in qdeclarativeitem docsLeonardo Sobral Cunha2010-02-241-1/+1
| | |
| * | Fixup tests after QDeclarative class renamesAaron Kennedy2010-02-241-1/+1
| | |
| * | Simplify QML element registration headersAaron Kennedy2010-02-2421-315/+326
| |/
* | Don't crash if the currentIndex is set while creating a delegate.Martin Jones2010-02-242-1/+5
|/ | | | Task-number: QTBUG-8456
* Add an "asynchonous" property to Image.Martin Jones2010-02-248-58/+178
| | | | | Allows loading/decoding local images in an asynchronous thread (already the case for network images).
* Removed unnecessary update calls in qmlgraphicsitemLeonardo Sobral Cunha2010-02-241-4/+0
| | | | Reviewed-by: akennedy
* Automatically connect to a notify signal if the requested signal isBea Lam2010-02-241-0/+10
| | | | | | | in the "onFooChanged" form, even if the notify signal is not called "fooChanged". Task-number: QT-2783
* 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