| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Fix compilation with namespace.
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | |
|
| | | |
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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).
|
| |/ / |
|
| |\ \ |
|
| | |\ \ |
|
| | | |/
| | |/| |
|
| | |/
| |/| |
|
| |\ \ |
|
| | |/
| | |
| | |
| | |
| | | |
QTBUG-8267. Remove templating from QmlTimeLineEvent class (and rename
it to QmlTimeLineCallback to more represent what it is).
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8181
|
| |/ |
|
| | |
|
|\ \
| |/
| |
| |
| | |
Conflicts:
doc/src/declarative/advtutorial1.qdoc
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 282a46ab5edafa7b82e9c58658143cb979db2d85.
This change introduced some regression due to itemChange notifications
not being delivered as expected (reported by Warwick). We have to find
another solution, unfortunately. However, the performance penalty isn't
that big so we can live with it for now.
|
| |\ |
|
| | |\ |
|
| | | | |
|
| | |/
| |/|
| | |
| | | |
Task-number: QTBUG-6203
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8343
|
| |/ |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
It's still used by QmlDesigner, therefore the symbols have to be
exported.
Task-number: QTBUG-6845
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8205
|
| | | |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8305
|
| | | |
|
| |\ \ |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This is needed to provide more control of rotation direction when
animating.
|
| | | |
| | | |
| | | |
| | | | |
d->propertyName is now included in props.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This better enforces the restriction on starting an animation that is
not top-level, or is part of a Transition or Behavior.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Don't allow manual control (starting, stopping, etc) of animations in a
Behavior or Transition.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
We rely on this to know whether to autostart. Disallow easy access to
setTarget by making it private.
|
| | | | |
|
| | | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
has proven to be confusing in practice.
property/target and properties/targets will be functionally equivilant
(the only distinction being singular/plural). In a transition these
properties can be used for both 'matching' and explicit animation
based on whether a 'to' value is supplied.
The documentation, tests, examples and demos have been updated as well.
|
| |/ / |
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (47 commits)
Add missing NOTIFY signals to various QML item class properties
Fix currentIndex after itemsMoved()
qmlviewer: build on symbian
Revert "Replace QList<>* support with QmlListProperty"
Declare QmlXmlListModelRole meta type before any code uses it.
Make compile on Symbian (call Q_DECLARE_METATYPE earlier)
Conditionally link webkit on wince
Revert "Run dos2unix on these files."
Expose LayoutItem documentation
Fix palette on the N900
Fix QTBUG-8090, improve original patch effectiveness.
Replace QList<>* support with QmlListProperty
Run dos2unix on these files.
Remove standalone QmlDebugger. It is now only available through the
Mobility 404
Fix crash in QmlMetaProperty that could occur when using value-type
QML binding optimizer crash
QML binding optimizer crash
Fix crash in QML binding optimizer
Don't delete binding directly
...
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Aaron Kennedy
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Ensure fixupPosition() positions properly for StrictlyEnforceRange
highlight mode.
Update visibleIndex after itemsMoved().
|
| | |\ \ |
|
| | | | | |
|
| | | | | |
|