Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make QML_REGISTER...TYPE functions unnecessary (still exist for now). | Warwick Allison | 2010-02-25 | 1 | -13/+13 |
| | | | | Fix multimedia plugin. | ||||
* | Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView" | Aaron Kennedy | 2010-02-25 | 3 | -574/+2 |
| | | | | This reverts commit 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5. | ||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-02-24 | 1 | -7/+12 |
|\ | |||||
| * | Add support for qml imports directory in configure, qmake, and qmlengine | mae | 2010-02-24 | 1 | -7/+12 |
| | | |||||
* | | Fix building without the XmlPatterns Module | Alan Alpert | 2010-02-24 | 1 | -0/+2 |
| | | |||||
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Alan Alpert | 2010-02-24 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Build fix when using <QtDeclarative> include. | Alexis Menard | 2010-02-24 | 1 | -0/+3 |
| | | |||||
* | | Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView | Alan Alpert | 2010-02-24 | 3 | -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 Alpert | 2010-02-24 | 1 | -0/+11 |
|/ | |||||
* | Make QDeclarativeMetaType and QDeclarativeType private | Aaron Kennedy | 2010-02-24 | 13 | -26/+30 |
| | |||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-24 | 23 | -317/+328 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Aaron Kennedy | 2010-02-24 | 1 | -1/+1 |
| |\ | |||||
| | * | Fix wrong property name in qdeclarativeitem docs | Leonardo Sobral Cunha | 2010-02-24 | 1 | -1/+1 |
| | | | |||||
| * | | Fixup tests after QDeclarative class renames | Aaron Kennedy | 2010-02-24 | 1 | -1/+1 |
| | | | |||||
| * | | Simplify QML element registration headers | Aaron Kennedy | 2010-02-24 | 21 | -315/+326 |
| |/ | |||||
* | | Don't crash if the currentIndex is set while creating a delegate. | Martin Jones | 2010-02-24 | 2 | -1/+5 |
|/ | | | | Task-number: QTBUG-8456 | ||||
* | Add an "asynchonous" property to Image. | Martin Jones | 2010-02-24 | 8 | -58/+178 |
| | | | | | Allows loading/decoding local images in an asynchronous thread (already the case for network images). | ||||
* | Removed unnecessary update calls in qmlgraphicsitem | Leonardo Sobral Cunha | 2010-02-24 | 1 | -4/+0 |
| | | | | Reviewed-by: akennedy | ||||
* | Automatically connect to a notify signal if the requested signal is | Bea Lam | 2010-02-24 | 1 | -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 Allison | 2010-02-24 | 313 | -16161/+16161 |
| | | | | QDeclarativeXXX. | ||||
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 47 | -27/+124 |
|\ | | | | | | | | | Conflicts: src/declarative/qml/qml.h | ||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Bea Lam | 2010-02-24 | 47 | -36/+134 |
| |\ | |||||
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 46 | -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 System | 2010-02-23 | 1 | -1/+2 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: Fix compilation with namespace. | ||||
| | | | * | Fix compilation with namespace. | ck | 2010-02-23 | 1 | -1/+2 |
| | | | | | |||||
| | | * | | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-23 | 87 | -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 System | 2010-02-23 | 1 | -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. | ck | 2010-02-22 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | doc: Fixed some qdoc errors. | Martin Smith | 2010-02-22 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Merge remote branch 'origin/master' | Thiago Macieira | 2010-02-20 | 95 | -1911/+2734 |
| | | |\ \ \ | | | | | |/ | | | | |/| | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc | ||||
| | | * | | | doc: Added "\since 4.7" to a bunch of declarative stuff. | Martin Smith | 2010-02-19 | 45 | -18/+116 |
| | | | | | | |||||
| * | | | | | Disallow ids that start with upper case letters. | Bea Lam | 2010-02-24 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QT-2786 | ||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 1 | -12/+12 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Martin Jones | 2010-02-23 | 30 | -426/+1156 |
| |\ \ \ \ \ | | |/ / / / | |||||
| * | | | | | Fix illegal access in QmlStyledText and add auto tests | Martin Jones | 2010-02-23 | 1 | -12/+12 |
| | | | | | | |||||
* | | | | | | doc | Warwick Allison | 2010-02-23 | 1 | -0/+8 |
| | | | | | | |||||
* | | | | | | Merge fix. | Warwick Allison | 2010-02-23 | 1 | -1/+6 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 52 | -716/+1706 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp | ||||
| * | | | | | Added missing destructor to QmlExtensionInterface. | Roberto Raggi | 2010-02-23 | 1 | -0/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'qtruntime' | Roberto Raggi | 2010-02-23 | 12 | -245/+774 |
| |\ \ \ \ \ | |||||
| | * | | | | | Get rid of QmlModulePlugin. | Roberto Raggi | 2010-02-23 | 4 | -200/+0 |
| | | | | | | | |||||
| | * | | | | | Look for QML plugins in the paths specified in QML_PLUGIN_PATH env var. | Roberto Raggi | 2010-02-23 | 4 | -6/+31 |
| | | | | | | | |||||
| | * | | | | | Added QmlEnginePrivate::resolvePlugin. | Roberto Raggi | 2010-02-23 | 2 | -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 qtruntime | Roberto Raggi | 2010-02-23 | 44 | -488/+964 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Load QML extensions. | Roberto Raggi | 2010-02-22 | 7 | -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 Raggi | 2010-02-22 | 3 | -0/+157 |
| | | | | | | | | |||||
| | * | | | | | | Compile. | Roberto Raggi | 2010-02-22 | 1 | -2/+0 |
| | | | | | | | | |||||
| | * | | | | | | Merge remote branch 'origin/master' into qtruntime | Roberto Raggi | 2010-02-22 | 85 | -1666/+1350 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h | ||||
| | * | | | | | | | Introduced QmlEngine::importExtension. | Roberto Raggi | 2010-02-22 | 2 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | importExtension can be used to import QmlExtensionInterface(s) into a QmlEngine. | ||||
| | * | | | | | | | Get rid of the unfriendly ImportedNamespace::isBuiltin flag. | Roberto Raggi | 2010-02-19 | 1 | -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 |