summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-1275-176/+482
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (24 commits) Provide a way to specify the final sis name with createpackage/make sis Update DEF files for Qt 4.7 Symbian/trk: Fix debugging output for the N8. Add license header Fix slider stepping when used with keypad navigation fix webkit crash when accessing network on Symbian 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 ...
| * Provide a way to specify the final sis name with createpackage/make sisMiikka Heikkinen2010-05-122-8/+26
| | | | | | | | | | | | | | | | The -n parameter can be used to specify the final sis name when using createpackage script or "make sis" with QT_SIS_OPTIONS. Task-number: QTBUG-9400 Reviewed-by: Janne Koskinen
| * Update DEF files for Qt 4.7Shane Kearns2010-05-116-41/+129
| | | | | | | | | | Task-Number: QTBUG-10251 Reviewed-by: Trust Me
| * Symbian/trk: Fix debugging output for the N8.Shane Kearns2010-05-113-7/+41
| | | | | | | | | | | | | | | | | | 1. Fix hanging behaviour when we receive a message on the wrong mux in framed mode 2. Treat messages on the trace mux (0102) as debug output 3. Separate timestamp from text in trace messages Reviewed-by: Friedemann Kleint
| * Add license headerThomas Zander2010-05-111-0/+40
| |
| * 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-11372-3583/+7106
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-1162-117/+239
| | |\ | |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-11372-3583/+7106
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (144 commits) Correct Flipable back item based on parent, not scene transform Round ideal width up to prevent incorrect word wrapping on Mac OS X Correct ownership of signal handlers in state changes. Remove unnecesary check for debug output. Error message on QWS appears to have changed. Removed multimedia effects from tvtennis declarative example Add some test asserts Fixes doc of mouse area's onEntered Remove debug messages from mousearea autotest file Prevent handling of Up/Down on Mac OS X, for consistency with other platforms. Optimize QGW constructor. There is no Qt.widgets Avoid changing header dependencies. 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 ...
| * | | 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-113-6/+5
| |\ \ \
| | * | | Round ideal width up to prevent incorrect word wrapping on Mac OS XAaron Kennedy2010-05-112-3/+5
| | | | | | | | | | | | | | | | | | | | QTBUG-10539
| | * | | Remove unnecesary check for debug output.Martin Jones2010-05-101-3/+0
| | | | |
| * | | | Correct ownership of signal handlers in state changes.Michael Brasser2010-05-113-7/+68
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | 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.7Martin Jones2010-05-10107-1126/+1702
| |\ \ \
| | * | | Removed multimedia effects from tvtennis declarative exampleLeonardo Sobral Cunha2010-05-103-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The multimedia elements are not part of 4.7 anymore. Reviewed-by: Martin Jones
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-108-21/+34
| | |\ \ \
| | | * | | Fixes doc of mouse area's onEnteredLeonardo Sobral Cunha2010-05-101-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-9227
| | | * | | Remove debug messages from mousearea autotest fileLeonardo Sobral Cunha2010-05-101-6/+6
| | | | | |
| | | * | | Prevent handling of Up/Down on Mac OS X, for consistency with other platforms.Warwick Allison2010-05-102-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | There is no Qt.widgetsWarwick Allison2010-05-101-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10469
| | * | | | 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-08368-3549/+6999
| | |\ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-07368-3549/+6999
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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-07103-557/+955
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0738-375/+593
| | | | |\ \ \
| | | | | * | | DocAaron Kennedy2010-05-071-9/+24
| | | | | | | |
| | | | | * | | Fix autotestsAaron Kennedy2010-05-076-153/+9
| | | | | | | |
| | | | | * | | Fix autotests (remove import Qt.widgets)Aaron Kennedy2010-05-072-2/+0
| | | | | | | |
| | | | | * | | Add missing qml file to qdeclarativemouseareaLeonardo Sobral Cunha2010-05-071-0/+28
| | | | | | | |
| | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-0769-177/+585
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: examples/declarative/dynamic/qml/PerspectiveItem.qml
| | | | | | * | | Update mouse area qmlvisual test to follow change QTBUG-10162Leonardo Sobral Cunha2010-05-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Michael Brasser
| | | | | | * | | Fix autotest bug in MouseAreaLeonardo Sobral Cunha2010-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Martin Jones
| | | | | | * | | Avoid emitting release when the mouse is ungrabbedLeonardo Sobral Cunha2010-05-073-3/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-078-18/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-07330-3187/+6439
| | | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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. ...
| | | | | * | | | | Doc fixBea Lam2010-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10458
| | | | | * | | | | Clean up example code, add white background behind textBea Lam2010-05-077-171/+206
| | | | | | | | | |
| | | | * | | | | | 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 git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-051-0/+1
| | | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-05131-829/+1687
| | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | Make component.createObject require a parent argumentAlan Alpert2010-05-0513-28/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For graphical objects (the common case) a common mistake is to not parent a dynamically created item. Since you almost always want to add a parent, and it's hard for a beginner to diagnose this problem, a parent is now a required argument and dealt with by the createObject function. Task-number: QTBUG-10110
| * | | | | | | | | | | Error message on QWS appears to have changed.Martin Jones2010-05-101-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
| * | | | | | | | | | Avoid repeated create/destroy at top list boundary with sub-pixel movement.Martin Jones2010-05-061-5/+5
| | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-0641-90/+147
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-0636-89/+98
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/declarative/graphicsitems/qdeclarativepainteditem.cpp
| | | * | | | | | | | | qdoc fixes.Yann Bodson2010-05-061-0/+11
| | | | | | | | | | | |