summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml/qmlengine.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-1901/+0
| | | | QDeclarativeXXX.
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-241-0/+2
|\ | | | | | | | | Conflicts: src/declarative/qml/qml.h
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-241-0/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
| | * Merge remote branch 'origin/master'Thiago Macieira2010-02-231-14/+23
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 remote branch 'origin/master'Thiago Macieira2010-02-201-8/+89
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| | * | | doc: Added "\since 4.7" to a bunch of declarative stuff.Martin Smith2010-02-191-0/+2
| | | | |
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-231-62/+196
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
| * | | | Get rid of QmlModulePlugin.Roberto Raggi2010-02-231-1/+0
| | | | |
| * | | | Look for QML plugins in the paths specified in QML_PLUGIN_PATH env var.Roberto Raggi2010-02-231-4/+26
| | | | |
| * | | | Added QmlEnginePrivate::resolvePlugin.Roberto Raggi2010-02-231-3/+86
| | | | | | | | | | | | | | | | | | | | | | | | | 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-231-1/+1
| |\ \ \ \
| | * | | | Make QmlBinding (and friends) privateAaron Kennedy2010-02-231-1/+1
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | QmlBinding exposes way too many implementation details to be confident about making it public right now.
| * | | | Load QML extensions.Roberto Raggi2010-02-221-22/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows projects which use the QtDeclarative module to register QML types and functions through C++ extensions. Reviewed-by: mae
| * | | | Merge remote branch 'origin/master' into qtruntimeRoberto Raggi2010-02-221-14/+24
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/qml/qml.pri src/declarative/qml/qmlengine.cpp src/declarative/util/qmlview.h
| * | | | Introduced QmlEngine::importExtension.Roberto Raggi2010-02-221-1/+20
| | | | | | | | | | | | | | | | | | | | 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
| * | | | Introduced a new parser for qmldir files.Roberto Raggi2010-02-191-18/+16
| | |_|/ | |/| |
* | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-231-1/+13
| |/ / |/| | | | | | | | Task-number: QT-2798
* | | Replace QmlList* and QList* support with a single QmlListProperty typeAaron Kennedy2010-02-221-14/+23
|/ / | | | | | | | | | | | | | | 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).
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-181-2/+6
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Fix copyright year.Jason McDonald2010-02-161-1/+1
| | | | | | | | Reviewed-by: Trust Me
| * doc: Fixed some qdoc errors.Martin Smith2010-02-161-1/+5
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-161-0/+8
|\ \
| * | Move type initialization from global static initializers to QmlEngine ↵Warwick Allison2010-02-141-0/+8
| |/ | | | | | | | | | | construction. Task-number: QT-2798
* | Add QmlImageProvider to allow asynchronous access to images.Martin Jones2010-02-161-8/+81
|/ | | | | | | | | Setting an image source to image://providerid/imageid will pass the request for imageid to the provider registered for providerid. QmlImageProvider::request() is run in a low priority thread, so the main thread is not blocked while the image is loaded/rendered. Reviewed-by: Aaron Kennedy
* Cleanup public QmlMetaType APIAaron Kennedy2010-02-121-7/+21
| | | | Remove some unnecessary methods from the QmlMetaType class
* CrashAaron Kennedy2010-02-101-0/+2
|
* Properly insert objects into the context's object listAlan Alpert2010-02-091-0/+1
| | | | | | | Fixes a failing autotest, where the object's context pointer was not being reset. This was because the object was not placed properly in the context's contextObjects list and so was not found and cleared when the context was destroyed.
* Remove old implicit module support.Warwick Allison2010-02-091-8/+6
| | | | | | | | Previously, it was allowed to use type qualification to refer to types defined in subdirectories - indeed, this was the only form of modularity. This is no longer desirable since we have good import features. Task-number: QTBUG-7721
* Document QtObjectAlan Alpert2010-02-081-0/+19
| | | | Task-number:QTBUG-6034
* Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-051-0/+2
|
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2010-02-031-8/+20
|\ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp
| * Don't create one QNetworkAccessManager per XMLHttpRequestAaron Kennedy2010-02-031-15/+27
| |
* | Really run image reader in its own thread.Martin Jones2010-02-031-14/+1
|/
* Don't use statics for type definition, at least for plugin modules.Warwick Allison2010-02-011-1/+3
| | | | Task-number: QT-2798
* Move image network access into a separate thread, with decoding.Martin Jones2010-01-291-15/+47
|
* Harden binding optimizerAaron Kennedy2010-01-271-1/+0
|
* Compile with Qt 4.6.1Aaron Kennedy2010-01-201-3/+3
|
* Remove QByteArray constructor from QmlComponent.Michael Brasser2010-01-131-2/+4
| | | | | | | It was too easily confused with the QString constructor that had completely different semantics. Use setData() instead. Task-number: QTBUG-6590
* Fix and test version 0.0 installed imports.Warwick Allison2010-01-131-1/+1
|
* Improve efficiency and correctness of qHash(QUrl), and use it in DeclarativeWarwick Allison2010-01-121-2/+2
| | | | | rather than qHash(url.toString()). Similar corelib changes may come from 4.6 too.
* unwarnWarwick Allison2010-01-111-1/+1
|
* Use URI, not modified URL when resolving type namesAaron Kennedy2010-01-111-2/+2
|
* Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2010-01-111-6/+5
|\ | | | | | | into kinetic-declarativeui
| * Must always ask factory loader, or else plugins will only load the second time.Warwick Allison2010-01-081-6/+5
| |
* | Optimization: Cache compiled dynamic functionsAaron Kennedy2010-01-081-4/+1
|/
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-01-081-9/+6
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Optimization: Improve property read speedAaron Kennedy2010-01-081-9/+6
| |
* | Allow QML types defined in both C++ and QML files to be in the same module.Warwick Allison2010-01-081-45/+54
|/
* Load qmlmodules plugins.Warwick Allison2010-01-071-0/+12
| | | | | | This allows projects which use the declarative module to add QML types through C++ modules, such that qmlviewer (or any QML) can import those types.