summaryrefslogtreecommitdiffstats
path: root/src/declarative/util
Commit message (Collapse)AuthorAgeFilesLines
* doc: Fixed some qdoc errors.Martin Smith2010-02-221-2/+2
|
* Merge remote branch 'origin/master'Thiago Macieira2010-02-2015-747/+867
|\ | | | | | | | | Conflicts: doc/src/declarative/advtutorial1.qdoc
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-191-3/+6
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-191-8/+0
| | |\
| | * | Delete the QmlImageRequestHandler in the correct thread.Martin Jones2010-02-191-3/+6
| | | |
| * | | More strict type checking of ListElement properties.Warwick Allison2010-02-191-10/+32
| | |/ | |/| | | | | | | Task-number: QTBUG-6203
| * | Remove unused function that breaks build on AIX.Michael Brasser2010-02-191-8/+0
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-1863-63/+63
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transitionLeonardo Sobral Cunha2010-02-181-1/+0
| | |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-186-475/+578
| |\ \
| | * | 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-185-433/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-182-226/+212
| |/ /
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-175-20/+39
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ...
| | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-171-2/+4
| | |\ \
| | | * | Declare QmlXmlListModelRole meta type before any code uses it.Bea Lam2010-02-171-2/+4
| | | | |
| | * | | Revert "Replace QList<>* support with QmlListProperty"Aaron Kennedy2010-02-174-38/+37
| | |/ / | | | | | | | | | | | | | | | | | | | | This was accidentally pushed early. This reverts commit 8454c53b304a4aba7c058b315041b3a38ad4fff5.
| | * | Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-164-37/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qmlgraphicsitem.cpp src/declarative/qml/qmlmetaproperty.cpp src/declarative/qml/qmlmetatype.cpp
| | * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-165-6/+15
| | |\ \
| | | * | MOBILITY-404 QS Windows.Wolfgang Beck2010-02-165-6/+15
| | | | |
| | * | | Add QmlImageProvider to allow asynchronous access to images.Martin Jones2010-02-161-15/+23
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | doc: Added "\since 4.7" to a bunch of declarative stuff.Martin Smith2010-02-1911-0/+22
| |_|/ |/| |
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-1663-64/+68
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1663-63/+63
| | | | | | | | | | | | Reviewed-by: Trust Me
| * | doc: Fixed some qdoc errors.Martin Smith2010-02-162-1/+5
| |/
* | Prepare translations of the declarative module.Friedemann Kleint2010-02-155-15/+15
|/ | | | | Add to translations profile. move stuff out of QObject-context, correct spelling and contractions, correct usage of tr().
* Fix warningsAaron Kennedy2010-02-121-1/+0
|
* Cleanup public QmlMetaType APIAaron Kennedy2010-02-121-4/+3
| | | | Remove some unnecessary methods from the QmlMetaType class
* Animations are running by default when used as property source valueLeonardo Sobral Cunha2010-02-112-2/+11
| | | | | | | | When you assign an animation to a property (used as source value), the animation will automatically start running, which is the most common behavior for this use case. Reviewed-by: Michael Brasser
* Revert "Replace QList<>* support with QmlListProperty"Martin Jones2010-02-104-38/+37
| | | | This reverts commit d914555badcd4761864657e1e335e657b791453f.
* Replace QList<>* support with QmlListPropertyAaron Kennedy2010-02-094-37/+38
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-082-1/+23
|\
| * Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectTypeMarco Bubke2010-02-082-1/+23
| | | | | | | | | | | | We need some internal stuff in the derived class. Reviewed-By: Kai Koehne
* | For local fonts, we can just addApplicationFont() rather than loading data.Martin Jones2010-02-081-4/+10
|/
* Fix private header include.Bea Lam2010-02-081-1/+1
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-0511-91/+90
|\
| * Fix Behaviors for object-type properties.Michael Brasser2010-02-051-2/+1
| | | | | | | | Task-number: QT-2269
| * Pass symbols::prefix (Action -> QmlAction)Warwick Allison2010-02-0510-89/+89
| |
* | Fix test.Martin Jones2010-02-051-7/+17
|/
* Clean up QmlImageReader thread on engine destruction.Martin Jones2010-02-052-12/+19
|
* Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-041-1/+2
| | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
* doc: There is no easeNone, it is called easeLinearThorbjørn Lindeijer2010-02-031-1/+1
| | | | Reviewed-by: dt
* Really run image reader in its own thread.Martin Jones2010-02-032-122/+136
|