| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
QDeclarativeXXX.
|
|\
| |
| |
| |
| | |
Conflicts:
src/declarative/qml/qml.h
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
src/declarative/qml/qmlmoduleplugin.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
|
| | | | | |
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/util/qmlanimation.cpp
src/declarative/util/qmlxmllistmodel.cpp
|
| | | | | |
|
| | | | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
resolvePlugin returns the merge of the plugin's base name with the
platform suffix (e.g. .dylib) and prefix (e.g. lib).
|
| |\ \ \ \ |
|
| | | |_|/
| | |/| |
| | | | |
| | | | |
| | | | | |
QmlBinding exposes way too many implementation details to be confident
about making it public right now.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This allows projects which use the QtDeclarative module to register QML
types and functions through C++ extensions.
Reviewed-by: mae
|
| |\ \ \ \
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/qml/qml.pri
src/declarative/qml/qmlengine.cpp
src/declarative/util/qmlview.h
|
| | | | |
| | | | |
| | | | |
| | | | | |
importExtension can be used to import QmlExtensionInterface(s) into a QmlEngine.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | |_|/
| |/| | |
|
| |/ /
|/| |
| | |
| | | |
Task-number: QT-2798
|
|/ /
| |
| |
| |
| |
| |
| |
| | |
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).
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| | |
|
|\ \ |
|
| |/
| |
| |
| |
| |
| | |
construction.
Task-number: QT-2798
|
|/
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Remove some unnecessary methods from the QmlMetaType class
|
| |
|
|
|
|
|
|
|
| |
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.
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Task-number:QTBUG-6034
|
| |
|
|\
| |
| |
| |
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlengine.cpp
|
| | |
|
|/ |
|
|
|
|
| |
Task-number: QT-2798
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
| |
It was too easily confused with the QString constructor that had
completely different semantics. Use setData() instead.
Task-number: QTBUG-6590
|
| |
|
|
|
|
|
| |
rather than qHash(url.toString()).
Similar corelib changes may come from 4.6 too.
|
| |
|
| |
|
|\
| |
| |
| | |
into kinetic-declarativeui
|
| | |
|
|/ |
|
|\
| |
| |
| | |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
|
| | |
|
|/ |
|
|
|
|
|
|
| |
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.
|