summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Work around bad naming of exported class in symbian sdk causing conflictThomas Zander2010-03-301-0/+3
| | | | | | The symbian SDK has a Time class defined which means that the compiler complains about the name already being used. Lets just disable the compile as this is not worth disturbing the example over.
* Fix building on public symbian SDK.Thomas Zander2010-03-301-2/+2
| | | | | the capability CAP_GENERAL_DLL is apparently an alias, so replace it with the extended version
* Fix qmake with the symbian makespec failing when project has a dash in itThomas Zander2010-03-301-2/+2
|
* Make s60main static lib not depend on QtCoreThomas Zander2010-03-302-5/+48
| | | | | Inline all the code that is used from QtCore as we should not assume QtCore is present for a static library linked into random 3rd party applications.
* Remove stray non-latin1 characterThomas Zander2010-03-301-1/+1
|
* Fix out-of-source symbian build for external appsThomas Zander2010-03-301-1/+1
|
* Update EABI def files for 4.7Shane Kearns2010-03-306-3508/+3456
| | | | Reviewed-by: Trust Me
* Merge remote branch 'qt/4.7' into 4.7Shane Kearns2010-03-301408-20468/+23246
|\ | | | | | | | | Conflicts: tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-3058-849/+1139
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Correctly construct boolean JSValue's Update QmlChanges for SmoothedAnimation WorkerScript was receiving events after deletion and trying to process Make qmlpixmapcache thread shutdown cleaner Make visual tests run on windows Fixes PathView compile warnings Finished file rename of qdeclarative easefollow to smoothedanimation Change and rename qml EaseFollow to SmoothedAnimation Fix parenting after 6f88388db4e8e202780d789e66664ff824691948. Fix viewer resizing on reload and File->open Don't emit onPositionChanged before onPressed
| | * Correctly construct boolean JSValue'sAaron Kennedy2010-03-303-3/+47
| | | | | | | | | | | | Task-number: QTBUG-9205
| | * Update QmlChanges for SmoothedAnimationLeonardo Sobral Cunha2010-03-301-0/+33
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-3050-816/+1036
| | |\
| | | * WorkerScript was receiving events after deletion and trying to processBea Lam2010-03-302-8/+9
| | | | | | | | | | | | | | | | these events.
| | | * Make visual tests run on windowsMartin Jones2010-03-301-1/+2
| | | |
| | | * Fixes PathView compile warningsLeonardo Sobral Cunha2010-03-302-2/+2
| | | |
| | | * Finished file rename of qdeclarative easefollow to smoothedanimationLeonardo Sobral Cunha2010-03-3025-33/+32
| | | |
| | | * Change and rename qml EaseFollow to SmoothedAnimationLeonardo Sobral Cunha2010-03-3025-386/+609
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-302-17/+17
| | | | | | | | | | | | Task-number: QTBUG-9325
| | * Don't emit onPositionChanged before onPressedMartin Jones2010-03-301-1/+0
| | | | | | | | | | | | Task-number: QTBUG-9383
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-30935-2250/+5724
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (136 commits) Make QDeclarativeListProperty a class Fix qdeclarativedom::loadDynamicProperty test Correctly parent repeater items. Make sure cursor delegate is parented. Allow just one dimension to be set, the other scaled accordingly Simplify import path. Removed unneeded code. Update autotest a little Improve QML compiler statistics Use error enum not numbers Pass test. doc test error code too QDeclarativeItem::setParentItem should not modify the QObject parent Doc Ensure currentIndex is updated when PathView items are removed/moved Visual test fixes. Doc Relayout items when Flow size changes. Make sure the image reader thread is shutdown properly ...
| | * Make QDeclarativeListProperty a classAaron Kennedy2010-03-302-2/+4
| | | | | | | | | | | | Apparently structs are not socially acceptable.
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-03-3010-77/+65
| | |\ | | | | | | | | | | | | | | | | 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-294-59/+45
| | | | | | | | | | | | | | | | Reviewed-by: mae
| | | * Removed unneeded code.Roberto Raggi2010-03-292-10/+0
| | | |
| | | * Update autotest a littleAlan Alpert2010-03-291-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | variant property was removed, and data property was altered, without updating this autotest. However the remaining failure for date appears to be genuine
| | * | Fix qdeclarativedom::loadDynamicProperty testAaron Kennedy2010-03-302-6/+10
| | |/
| | * Improve QML compiler statisticsAaron Kennedy2010-03-292-9/+45
| | |
| | * Use error enum not numbersWarwick Allison2010-03-291-2/+2
| | | | | | | | | | | | (easier to doc)
| | * Pass test.Warwick Allison2010-03-291-0/+14
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-03-2916-65/+200
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-291-4/+0
| | | |\
| | | | * QDeclarativeItem::setParentItem should not modify the QObject parentAaron Kennedy2010-03-291-4/+0
| | | | | | | | | | | | | | | | | | | | QTBUG-5768
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-297-50/+45
| | | |\ \ | | | | |/
| | | | * DocAaron Kennedy2010-03-291-45/+40
| | | | | | | | | | | | | | | | | | | | QTBUG-7998
| | | | * Visual test fixes.Michael Brasser2010-03-295-4/+4
| | | | |
| | | | * DocAaron Kennedy2010-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | QTBUG-9273
| | | * | Ensure currentIndex is updated when PathView items are removed/movedMartin Jones2010-03-292-8/+37
| | | |/
| | | * Relayout items when Flow size changes.Martin Jones2010-03-294-0/+103
| | | | | | | | | | | | | | | | | | | | | | | | Also add Flow tests. Task-number: QTBUG-9421
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2948-528/+1083
| | | |\
| | | * | Make sure the image reader thread is shutdown properlyMartin Jones2010-03-291-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | Prevents deadlock on shutdown for very shortlived runs, e.g. autotests
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-299-29/+32
| | | |\ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-29690-318/+475
| | | |\ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-2843-151/+399
| | | |\ \ \ \
| | | * | | | | Fix change description: Import -> importMartin Jones2010-03-281-1/+1
| | | | | | | |
| | * | | | | | docWarwick Allison2010-03-291-4/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9459 QTBUG-9458
generated by cgit v0.12 at 2025-03-13 12:59:36 (GMT)