summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Bearer management changes from Qt Mobility.Aaron McCarthy2010-05-145-4/+25
| | | | 9286bfcc43d38e0cb3bfd1d3f99ac7ab5d88b7e3
* Cherry pick fix for MOBILITY-828 from Qt Mobility.Aaron McCarthy2010-05-146-386/+658
| | | | Change e5f8e3069d0de428a751e8a1dd88f3585f2d3f5f from Qt Mobility.
* 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
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-0827-648/+912
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 07b60cf799680fcfb7785ee88e14f8030a5dbfa2 Updated WebKit to e4b73bb0b173f21db8f0de3dae885a8a71282996 Updated WebKit to 992e57ee469bd8c6a2afef6b15896a161ab8aeb3
| * | | | | | | | | Updated WebKit to 07b60cf799680fcfb7785ee88e14f8030a5dbfa2Simon Hausmann2010-05-0718-52/+225
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bugzilla fixes integrated in this commit: || <https://webkit.org/b/37445> || [Qt] Regression: Google calendar edit event details gets stuck on loading || || <https://webkit.org/b/38439> || [Qt] QT_MOBILE_THEME compile time flag || || <https://webkit.org/b/37803> || Spatial Navigation: adapt the logic of {deep}findFocusableNodeInDirection to do traversal starting from Node* not Document* || || <https://webkit.org/b/36755> || [Qt] REGRESSION: Loading of external CSS and JS files over network fails in some cases || || <https://webkit.org/b/36533> || [Qt] Compilation error on Qt for Embedded Linux built with -qconfig small || || <https://webkit.org/b/38585> || Spatial Navigation: add a layout test which runs with Frame Flattening ON ||
| * | | | | | | | | Updated WebKit to e4b73bb0b173f21db8f0de3dae885a8a71282996Simon Hausmann2010-05-064-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated Ossy's fix for building without Qt Multimedia
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-05-069-19/+108
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | |
| * | | | | | | | | Updated WebKit to 992e57ee469bd8c6a2afef6b15896a161ab8aeb3Simon Hausmann2010-05-0515-598/+675
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes integrated since the last import: || <https://webkit.org/b/38339> || [Qt] Enable JIT for QtWebKit on Symbian || || <https://webkit.org/b/38116> || Media queries empty values || || <https://webkit.org/b/38125> || View modes names in CSSValueKeywords.in || Also disabled QtMultimedia support for HTML 5 Audio/Video elements and removed WebGL support.
* | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-073-6/+21
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix build error for S60 3.1 winscw target Gstreamer mediaservice backend: fixed check for X11/QWS build.
| * | | | | | | | | Fix build error for S60 3.1 winscw targetDerick Hawcroft2010-05-052-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Guard against AudioRouting API usage for this platform.
| * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-05-041-1/+1
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Gstreamer mediaservice backend: fixed check for X11/QWS build.
| | * | | | | | | | Gstreamer mediaservice backend: fixed check for X11/QWS build.Dmytro Poplavskiy2010-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Justin McPherson
* | | | | | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵Qt Continuous Integration System2010-05-059-19/+108
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: When one of the spin button subcontrol is activated, the state member of fix crash in QLocalServer::close on Windows QS60Style: QTabWidget icon size property doesn't work PowerVR screen driver using undefined symbols rename qt_iw.ts to qt_he.ts QS60Style: QComboBoxPrivateScroller draws holes into menu canvas QS60Style: QTabWidget Usability issue with capacitive screens Fixing small memory leak in testlib.
| * | | | | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-049-19/+108
| |\ \ \ \ \ \ \ \ \ |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: translations/translations.pri
generated by cgit v0.12 at 2025-02-02 23:15:32 (GMT)