summaryrefslogtreecommitdiffstats
path: root/src/declarative
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-061-1/+1
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Labs (experimental) Gesture support.
| * Labs (experimental) Gesture support.Warwick Allison2010-04-061-1/+1
| | | | | | | | By popular demand.
* | Fix QtDeclarative public headers to include <QtDeclarative/foo.h>Thiago Macieira2010-04-024-9/+9
| | | | | | | | All Qt public headers must do it like that.
* | Update #include of private headers in QtDeclarativeThiago Macieira2010-04-02195-580/+580
|/ | | | | Always use private/. The WinSCW compiler doesn't search the current directory, for whatever reason.
* Fix loading of _debug.dylib plugins under OSX.Roberto Raggi2010-04-011-1/+4
|
* Improve Transform docs.Martin Jones2010-04-011-4/+11
|
* Doc fixBea Lam2010-04-011-1/+1
|
* ModelNode::setObjectValue() must update the object cache.Bea Lam2010-04-011-0/+2
| | | | Task-number: QTBUG-9509
* Fix Rectangle::gradient rotation doc.Martin Jones2010-04-011-2/+1
| | | | Task-number: QTBUG-9553
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-011-25/+25
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-014-29/+37
| |\
| * | import "." first - i.e. override it by everything else.Warwick Allison2010-04-011-25/+25
| | | | | | | | | | | | Otherwise, simple things break, like having "image.qml" on a case-insensitive file system.
* | | Fix Flickable::visibleArea.xPosition, Flickable::visibleArea.yPosition docsMartin Jones2010-04-011-2/+4
| |/ |/| | | | | Task-number: QTBUG-9499
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-011-2/+2
|\ \
| * | Fix compilation on Symbian winscwJoona Petrell2010-04-011-2/+2
| |/ | | | | | | | | Task-number: Reviewed-by: Aaron Kennedy
* | Set positioner size to final size, rather than some random size mid animationMartin Jones2010-04-013-27/+35
|/ | | | Task-number: QTBUG-9559
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-318-1039/+1138
|\ | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fixed: Declared properties cannot be assigned in declaration
| * Fixed: Declared properties cannot be assigned in declarationRoberto Raggi2010-03-318-1039/+1138
| | | | | | | | Task-number: QTBUG-7860
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-311-1/+1
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (31 commits) Fix compilation with Sun CC: no semi-colon after Q_ENUM. Remove the "Insert unicode control character" menu entry on X11. adds a timeout option to QThreadPool::waitForDone(); Remove leading whitespace from Qt header macros. Rename the xxxMsecsSinceEpoch functions to xxxMSecsSinceEpoch. Add QDateTime members that operate on 64-bit milliseconds. Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct. qdoc: Added <div> elements to some html output for class references. Fix compile error on mingw. MONILITY-645 Do not override alternate background color in Plastique Fix QComboBox ignoring foreground role in some styles Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined Fix compilation with Sun CC: Ensure that we return QPair<long,long> in all cases. Update PLATFORM(SPARC64) to CPU(SPARC64) jui files are no c++ ... scan some more file types by default Support EtchDisabledText with spin box on Windows style QNAM HTTP: Fix invoking a method when being destructed right now ...
| * Fix compilation with Sun CC: no semi-colon after Q_ENUM.Thiago Macieira2010-03-311-1/+1
| | | | | | | | | | | | | | Error was: "graphicsitems/qdeclarativepathview_p.h", line 80: Error: "}" expected instead of ";" Reviewed-by: Olivier Goffart
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-03-311-20/+31
|\ \
| * | Optimize QDeclarativeEngine::importExtensionmae2010-03-311-20/+31
| | | | | | | | | | | | | | | Avoid double initialization of QPluginLoader and assert that modules are imported with a stable uri
* | | Fix bug when adding import paths manuallyAlan Alpert2010-03-311-1/+7
|/ / | | | | | | | | | | | | Paths were being added relatively even though they should be converted to a canoncial form. Patch originally by tmikola Reviewed-by: mae
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-317-9/+60
|\ \
| * | Improve flipable example.Yann Bodson2010-03-311-1/+1
| | |
| * | VisibleArea is not a creatable type.Michael Brasser2010-03-311-1/+1
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-311-0/+1
| |\ \
| | * | Update mouseX(Y) when clicking on a mouse areaLeonardo Sobral Cunha2010-03-311-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | This fixes the original commit, 56aa9370dbafa8ee4, for QTBUG-9383. We need to emit a positionChanged signal to update the mouseX(Y) for the mouse area. Reviewed-by: Martin Jones
| * | docWarwick Allison2010-03-311-0/+4
| |/
| * Fix qml plugin loading with specified path in qmldirmae2010-03-301-3/+8
| | | | | | | | | | | | The fix makes it possible to specify an ABSOLUTE path as well, e.g.: plugin mimehunt C:\sys\bin
| * Optimization: Use internal QGraphicsItemPrivate::setItemParentHelper()Aaron Kennedy2010-03-301-4/+12
| | | | | | | | | | This brings the "data" property inline with the "children" property. Improves the declarative/creation/itemtree_qml test by 13%.
| * Update QmlChanges for SmoothedAnimationLeonardo Sobral Cunha2010-03-301-0/+33
| |
* | Fix snapping in listview.Martin Jones2010-03-312-15/+35
|/
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-3023-659/+751
|\
| * WorkerScript was receiving events after deletion and trying to processBea Lam2010-03-301-1/+5
| | | | | | | | these events.
| * Fixes PathView compile warningsLeonardo Sobral Cunha2010-03-302-2/+2
| |
| * Finished file rename of qdeclarative easefollow to smoothedanimationLeonardo Sobral Cunha2010-03-308-14/+13
| |
| * Change and rename qml EaseFollow to SmoothedAnimationLeonardo Sobral Cunha2010-03-3014-353/+446
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QDeclarativeSmoothedAnimation inherits from QDeclarativeNumberAnimation, as a consequence SmoothedAnimation can be used inside Behaviors and as PropertySourceValues, like any other animation. The old EaseFollow properties changed to comply with the other declarative animations ('source' changed to 'to'), so now 'to' changes are not automatically 'followed' anymore. You can achieve the following behavior by putting a SmoothedAnimation inside a Behavior of a property that is bound to another, as the following example: If you want to follow an hypothetical rect1, you should do now: Rectangle { color: "green" width: 60; height: 60; x: rect1.x - 5; y: rect1.y - 5; Behavior on x { SmoothedAnimation { velocity: 200 } } Behavior on y { SmoothedAnimation { velocity: 200 } } } SmoothedAnimation also supports animating multiple target(s)/property(ies) in the transition case. When a QDeclarativeSmoothedAnimation is restarted, it will match the QDeclarativeProperty which were being animated and transfer the corresponding track velocity to the new starting animations. QSmoothedAnimation is an uncontrolled animation, duration == -1. The duration is set as -1 to avoid consecutive animation state changes stop()/start(). This is particularly useful when using QSmoothAnimation to 'follow' another property, which is also being animated (change the 'to' property every tick). Reviewed-by: Michael Brasser
| * Fix parenting after 6f88388db4e8e202780d789e66664ff824691948.Michael Brasser2010-03-308-35/+31
| |
* | Make qmlpixmapcache thread shutdown cleanerMartin Jones2010-03-301-12/+6
|/ | | | | | | | | | | | | | | | | Change to Thiago's method: QThread::quit() is *not* thread-safe, so we mustn't call it from outside the QThread that the QThread holds. Unlike other QObjects, this method and some others must not be called from the thread they have affinity to. So add a hack to call it in the auxiliary thread. Do that by connecting a dummy QObject's destroyed() signal to the quit() slot in a DirectConnection, then move the object to the thread. When we call deleteLater(), this will cause the thread's event loop to delete the object, which in turn calls quit() in the actual thread. Reviewed-by: Thiago Macieira
* Fix viewer resizing on reload and File->openMartin Jones2010-03-301-0/+1
| | | | Task-number: QTBUG-9325
* Don't emit onPositionChanged before onPressedMartin Jones2010-03-301-1/+0
| | | | Task-number: QTBUG-9383
* Make QDeclarativeListProperty a classAaron Kennedy2010-03-301-1/+2
| | | | Apparently structs are not socially acceptable.
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-309-75/+56
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/tst_qdeclarativedom.cpp
| * Correctly parent repeater items.Michael Brasser2010-03-301-5/+5
| |
| * Make sure cursor delegate is parented.Michael Brasser2010-03-292-0/+4
| | | | | | | | setParentItem no longer sets QObject parent.
| * Allow just one dimension to be set, the other scaled accordinglyWarwick Allison2010-03-291-3/+11
| | | | | | | | Task-number: QTBUG-8984
| * Simplify import path.Warwick Allison2010-03-293-57/+36
| | | | | | | | Reviewed-by: mae
| * Removed unneeded code.Roberto Raggi2010-03-292-10/+0
| |
* | Fix qdeclarativedom::loadDynamicProperty testAaron Kennedy2010-03-301-0/+6
|/