summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Update DEF files for Qt 4.7Shane Kearns2010-05-116-41/+129
| | | | | Task-Number: QTBUG-10251 Reviewed-by: Trust Me
* Fix slider stepping when used with keypad navigationMiikka Heikkinen2010-05-111-2/+6
| | | | | | | QElapsedTimer usage was corrected Task-number: QTBUG-9857 Reviewed-by: Alessandro Portale
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7Janne Koskinen2010-05-11124-2834/+3269
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-1112-65/+63
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Remove test cases which cause stack overflow Fix compile errors Run autotests with minimal capabilities Documentation updates for Qt/Symbian on Linux development Allow EPOCROOT env var to be without trailing slash. Workaround for Symbian Open C bug in socket connect. Fix fetchedRoot test variable to work also in Symbian Add configure time checks for symbian environment Check for existance of sis file parameter to runonphone Fix thread synchronization issues in Symbian QFileSystemWatcher Disable compiling of the plugin when extra package not found Added missing UID3 for qsymbianbearer.dll. Enabled previously disabled Qt features. Fix includes so it compiles Use lowercase includes so it compiles in Linux too Fixed library dependency for Gnupoc. Removed the --export_all_vtbl from linking. Cleaned up the elf2e32 options a bit.
| * | Correct Flipable back item based on parent, not scene transformAaron Kennedy2010-05-111-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flipable transformation consists of two parts: 1. Detecting that the back face is visible 2. Transforming the back item as though "it were on the front" These are two steps. The first should be done in scene coordinates, and the second relative to the Flipable parent. QTBUG-10532
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-05-111-1/+3
| |\ \
| | * | Round ideal width up to prevent incorrect word wrapping on Mac OS XAaron Kennedy2010-05-111-1/+3
| | | | | | | | | | | | | | | | QTBUG-10539
| * | | Correct ownership of signal handlers in state changes.Michael Brasser2010-05-111-7/+28
| |/ / | | | | | | | | | | | | | | | | | | When a state uses override, we may apply the same replacesignalhandler on top of itself. Make sure we update ownership accordingly. Task-number: QTBUG-10523
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-105-14/+20
| |\ \
| | * | Fixes doc of mouse area's onEnteredLeonardo Sobral Cunha2010-05-101-3/+3
| | | | | | | | | | | | | | | | Task-number: QTBUG-9227
| | * | Prevent handling of Up/Down on Mac OS X, for consistency with other platforms.Warwick Allison2010-05-101-2/+7
| | | | | | | | | | | | | | | | Task-number: QTBUG-10438
| | * | Optimize QGW constructor.Alexis Menard2010-05-103-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mostly by avoiding sending useless QVariant at construction time. itemChange is virtual, the user implementation will never be called. Worst case the QGW one. Reviewed-by:janarve
| * | | Add some test assertsAaron Kennedy2010-05-101-0/+3
| |/ /
| * | Avoid changing header dependencies.Warwick Allison2010-05-102-4/+6
| | | | | | | | | | | | (should fix compile on Symbian)
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-08123-2810/+3208
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (131 commits) Avoid many unnecessary allocations, so so that paint engines attached to pixmaps Doc Fix autotests Fix autotests (remove import Qt.widgets) Add missing qml file to qdeclarativemousearea Doc fix Clean up example code, add white background behind text Update mouse area qmlvisual test to follow change QTBUG-10162 Fix autotest bug in MouseArea Avoid emitting release when the mouse is ungrabbed Resize qmlruntime window to new dimensions when orientation changes Compile with opengl enabled. Avoid repeated create/destroy at top list boundary with sub-pixel movement. Call QDeclarativeItem::geometryChanged() base implementation qdoc fixes. Avoid warnings as delegates with bindings to parent are created and destroyed. qdoc fixes TextInput echoMode doc. Make sure to call base class implementation. More cleanup ...
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-07123-2810/+3208
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (131 commits) Avoid many unnecessary allocations, so so that paint engines attached to pixmaps Doc Fix autotests Fix autotests (remove import Qt.widgets) Add missing qml file to qdeclarativemousearea Doc fix Clean up example code, add white background behind text Update mouse area qmlvisual test to follow change QTBUG-10162 Fix autotest bug in MouseArea Avoid emitting release when the mouse is ungrabbed Resize qmlruntime window to new dimensions when orientation changes Compile with opengl enabled. Avoid repeated create/destroy at top list boundary with sub-pixel movement. Call QDeclarativeItem::geometryChanged() base implementation qdoc fixes. Avoid warnings as delegates with bindings to parent are created and destroyed. qdoc fixes TextInput echoMode doc. Make sure to call base class implementation. More cleanup ...
| | | * \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-0745-155/+378
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/dynamic/qml/itemCreation.js
| | | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-0714-47/+161
| | | | |\ \
| | | | | * | DocAaron Kennedy2010-05-071-9/+24
| | | | | | |
| | | | | * | Fix autotestsAaron Kennedy2010-05-071-1/+1
| | | | | | |
| | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-0724-93/+243
| | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/dynamic/qml/PerspectiveItem.qml
| | | | | | * | Avoid emitting release when the mouse is ungrabbedLeonardo Sobral Cunha2010-05-072-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added an onCanceled signal to mouse area, which is triggered when the mouse area rejects the event (propagates to the nearest mouse area beneath) or some other element steals the mouse grab (flickable, for example). Task-number: QTBUG-10162 Reviewed-by: Michael Brasser
| | | | | | * | Resize qmlruntime window to new dimensions when orientation changesJoona Petrell2010-05-071-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Reviewed-by: Warwick Allison
| | | | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-07102-2734/+3031
| | | | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (118 commits) Avoid repeated create/destroy at top list boundary with sub-pixel movement. Call QDeclarativeItem::geometryChanged() base implementation qdoc fixes. Avoid warnings as delegates with bindings to parent are created and destroyed. qdoc fixes TextInput echoMode doc. Make sure to call base class implementation. More cleanup Cleanup Cleanup Use enum for drag.axis in doc and examples. Add missing test file. Fix autotest Add QML_XHR_DUMP option Compile doc fixes Doc: more clarification of cacheBuffer Fix some compiler warnings. Another initialization fix. Unleak. Fix compile in namespace. ...
| | | | | | | * | Avoid repeated create/destroy at top list boundary with sub-pixel movement.Martin Jones2010-05-061-5/+5
| | | | | | | | |
| | | | | * | | | Doc fixBea Lam2010-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10458
| | | | * | | | | Avoid many unnecessary allocations, so so that paint engines attached to pixmapsWarwick Allison2010-05-0717-51/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not consume excessive amounts of memory, and so can still be reasonably kept cached with the pixmap. Saves 8K for every pixmaps drawn to on raster paint engine. Saves about 2K for other graphicssystems. Task-number: QTBUG-10215 Reviewed-by: Gunnar
| | | | * | | | | Compile with opengl enabled.Warwick Allison2010-05-071-0/+2
| | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0610-24/+27
| | | | |\ \ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-069-24/+25
| | | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativepainteditem.cpp
| | | | | | * | | | qdoc fixesYann Bodson2010-05-067-15/+15
| | | | | | | | | |
| | | | | | * | | | TextInput echoMode doc.Yann Bodson2010-05-061-7/+8
| | | | | | | | | |
| | | | | | * | | | Make sure to call base class implementation.Michael Brasser2010-05-061-0/+1
| | | | | | | | | |
| | | | | | * | | | Use enum for drag.axis in doc and examples.Yann Bodson2010-05-061-2/+2
| | | | | | | | | |
| | | | | * | | | | Call QDeclarativeItem::geometryChanged() base implementationAaron Kennedy2010-05-061-0/+2
| | | | | |/ / / /
| | | | * | | | | Avoid warnings as delegates with bindings to parent are created and destroyed.Martin Jones2010-05-066-9/+29
| | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10359
| | | | * | | | Add QML_XHR_DUMP optionAaron Kennedy2010-05-061-0/+21
| | | | | | | |
| | | | * | | | Doc: more clarification of cacheBufferMartin Jones2010-05-052-0/+6
| | | | | | | |
| | | | * | | | Fix some compiler warnings.Martin Jones2010-05-052-24/+25
| | | | |/ / /
| | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-0537-1016/+320
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-0531-243/+315
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-056-6/+6
| | | | | |\ \ \
| | | | | | * | | Use enum rather than string for easing type.Yann Bodson2010-05-056-6/+6
| | | | | | | | |
| | | | | * | | | Fix cacheBuffer documentation.Martin Jones2010-05-053-12/+28
| | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10385
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-055-11/+8
| | | | | |\ \ \
| | | | | | * | | Fix qdoc errorsBea Lam2010-05-055-11/+8
| | | | | | | | |
| | | | | * | | | Document delegate life cycle.Martin Jones2010-05-053-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10353
| | | | | * | | | little doc fix.Martin Jones2010-05-051-1/+1
| | | | | |/ / /
| | | | | * | | Turn off smooth rendering for qDrawBorderPixmap() with transforms.Martin Jones2010-05-051-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On non-gl graphics systems smooth rendering of qDrawBorderPixmap() with a transform applied resulted in ugly artifacts. Better to draw without smooth and get a correct looking result, though with jaggy edges. Task-number: QTBUG-5687 Reviewed-by: Gunnar
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0520-205/+221
| | | | | |\ \ \