summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-18298-334/+350
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-16295-332/+352
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | * Fix copyright year.Jason McDonald2010-02-16293-293/+293
| | | | | | | | | | | | Reviewed-by: Trust Me
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Jason McDonald2010-02-164-2/+10
| | |\
| | | * doc: Fixed some qdoc errors.Martin Smith2010-02-164-2/+10
| | | |
| | * | Fix broken license headers.Jason McDonald2010-02-162-35/+35
| | |/ | | | | | | | | | Reviewed-by: Trust Me
| | * doc: Fixed some qdoc errors.Martin Smith2010-02-163-2/+14
| | |
* | | Make QmlDom API internalKai Koehne2010-02-185-409/+420
| | | | | | | | | | | | | | | | | | | | | It's still used by QmlDesigner, therefore the symbols have to be exported. Task-number: QTBUG-6845
* | | Compile fix with namepaceshjk2010-02-183-1/+9
| | | | | | | | | | | | Task-number: QTBUG-8205
* | | Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transitionLeonardo Sobral Cunha2010-02-181-1/+0
| | |
* | | Doc: onExited, onEntered only work when button pressed or hoverEnabledMartin Jones2010-02-181-0/+16
| | | | | | | | | | | | Task-number: QTBUG-8305
* | | Ensure visibleIndex and currentIndex are updated on itemsMoved().Martin Jones2010-02-181-2/+25
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-188-480/+583
|\ \ \
| * | | Animation doc fix.Michael Brasser2010-02-181-24/+11
| | | |
| * | | Add a RotationAnimation element.Michael Brasser2010-02-183-0/+223
| | | | | | | | | | | | | | | | | | | | This is needed to provide more control of rotation direction when animating.
| * | | Remove unneeded comparison.Michael Brasser2010-02-181-1/+1
| | | | | | | | | | | | | | | | d->propertyName is now included in props.
| * | | Fix bugs and add tests related to manual start/stop control of animations.Michael Brasser2010-02-182-10/+12
| | | | | | | | | | | | | | | | | | | | This better enforces the restriction on starting an animation that is not top-level, or is part of a Transition or Behavior.
| * | | Transitions and Behaviors should exclusively control their animations.Michael Brasser2010-02-185-8/+25
| | | | | | | | | | | | | | | | | | | | Don't allow manual control (starting, stopping, etc) of animations in a Behavior or Transition.
| * | | Animation's setTarget should only be called via QmlValueSource*.Michael Brasser2010-02-181-1/+3
| | | | | | | | | | | | | | | | | | | | We rely on this to know whether to autostart. Disallow easy access to setTarget by making it private.
| * | | Minor transition cleanup.Michael Brasser2010-02-181-7/+1
| | | |
| * | | Minor animation class cleanup.Michael Brasser2010-02-183-29/+25
| | | |
| * | | Get rid of the matchProperties/properties distinction, as itMichael Brasser2010-02-187-438/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | QmlView API review. See QmlChanges.txt for details.Martin Jones2010-02-183-227/+229
|/ / /
* | | Fix typo in docsAlan Alpert2010-02-171-1/+1
| | |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-1779-760/+1403
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| * | Add missing NOTIFY signals to various QML item class propertiesJoona Petrell2010-02-1710-17/+74
| | | | | | | | | | | | Reviewed-by: Aaron Kennedy
| * | Fix currentIndex after itemsMoved()Martin Jones2010-02-171-8/+46
| | | | | | | | | | | | | | | | | | Ensure fixupPosition() positions properly for StrictlyEnforceRange highlight mode. Update visibleIndex after itemsMoved().
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-173-3/+9
| |\ \
| | * | Declare QmlXmlListModelRole meta type before any code uses it.Bea Lam2010-02-171-2/+4
| | | |
| | * | Make compile on Symbian (call Q_DECLARE_METATYPE earlier)Bea Lam2010-02-172-1/+5
| | | |
| * | | Revert "Replace QList<>* support with QmlListProperty"Aaron Kennedy2010-02-1720-215/+307
| |/ / | | | | | | | | | | | | | | | This was accidentally pushed early. This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-171-0/+7
| |\ \
| | * | Expose LayoutItem documentationAlan Alpert2010-02-161-0/+7
| | | | | | | | | | | | | | | | Also made it slightly more verbose.
| * | | Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-1620-307/+215
| |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qmlgraphicsitem.cpp src/declarative/qml/qmlmetaproperty.cpp src/declarative/qml/qmlmetatype.cpp
| * | Mobility 404Wolfgang Beck2010-02-161-2/+2
| | |
| * | Fix crash in QmlMetaProperty that could occur when using value-typeMichael Brasser2010-02-162-4/+4
| | | | | | | | | | | | properties after the engine was deleted.
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-1626-52/+318
| |\ \
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-1663-563/+847
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMichael Brasser2010-02-161-4/+0
| | | |\ \
| | | | * | transformOrigin defaults to Center, fix image/docs.Warwick Allison2010-02-161-4/+0
| | | | | |
| | | * | | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-1620-25/+68
| | | |/ /
| | * | | Add QmlImageProvider to allow asynchronous access to images.Martin Jones2010-02-167-23/+250
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | QML binding optimizer crashAaron Kennedy2010-02-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | The context's id values must be deleted after the compiled bindings as they may access the id values during shutdown.
| * | | | QML binding optimizer crashAaron Kennedy2010-02-161-4/+5
| | | | | | | | | | | | | | | | | | | | We should check that the fetch() generation succeeded before continuing.
| * | | | Fix crash in QML binding optimizerAaron Kennedy2010-02-163-138/+164
| | | | | | | | | | | | | | | | | | | | Optimized bindings need to reset the mePtr too.
| * | | | Don't delete binding directlyAaron Kennedy2010-02-161-2/+4
| | |/ / | |/| | | | | | | | | | | | | | Bindings should be destroyed by calling their destroy() method, not by deleting them.
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-165-5/+46
| |\ \ \
| | * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-152-2/+6
| | |\ \ \
| | | * | | Exposing some Validators requires Qt >= 4.7.0Alan Alpert2010-02-152-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | This commit should make declarative compile against 4.6.2 again.
| | * | | | Fix TextInput keypad navigationAlan Alpert2010-02-151-2/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Was accidentally ignoring key movements even when an existing selection meant that pressing right/left would do something. Task-number: QT-2944