| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits)
doc: Fixed some qdoc errors.
doc: Fixed some qdoc errors.
Fix copyright year.
Fix broken license headers.
doc: Fixed some qdoc errors.
Reusing sheets on Mac OS X 10.5 & above shows painting artifacts.
doc: Fixed some qdoc errors.
QNetworkAccessManager: add method to send custom requests
doc: Fixed some qdoc errors.
Optimization: Avoid calling out to public API function
Mac: submenu shows up at the wrong position
Add operator< and qHash for QSharedPointer and fix operator-.
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)
Optimized QLocale to access system locale on demand.
Fix QRegion under Mac OS X.
update according to Thiago's comments.
Changes: add functionality for dbus auto start to qt
Add license header to this file
readdir64 is not available on HP-UX
...
|
| | |
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | |\ |
|
| | | | |
|
| | |/
| | |
| | |
| | | |
Reviewed-by: Trust Me
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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().
|
| |\ \ |
|
| | | | |
|
| | | | |
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
This was accidentally pushed early.
This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Also made it slightly more verbose.
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/graphicsitems/qmlgraphicsitem.cpp
src/declarative/qml/qmlmetaproperty.cpp
src/declarative/qml/qmlmetatype.cpp
|
| | | |
|
| | |
| | |
| | |
| | | |
properties after the engine was deleted.
|
| |\ \ |
|
| | |\ \ |
|
| | | |\ \ |
|
| | | | | | |
|
| | | |/ / |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The context's id values must be deleted after the compiled bindings as they
may access the id values during shutdown.
|
| | | | |
| | | | |
| | | | |
| | | | | |
We should check that the fetch() generation succeeded before continuing.
|
| | | | |
| | | | |
| | | | |
| | | | | |
Optimized bindings need to reset the mePtr too.
|
| | |/ /
| |/| |
| | | |
| | | |
| | | | |
Bindings should be destroyed by calling their destroy() method, not by
deleting them.
|
| |\ \ \ |
|
| | |\ \ \ |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This commit should make declarative compile against 4.6.2 again.
|
| | |/ / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Was accidentally ignoring key movements even when an existing selection
meant that pressing right/left would do something.
Task-number: QT-2944
|