summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| | * 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 remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-047-18/+107
| |\ \ | | | | | | | | | | | | | | | | Conflicts: translations/translations.pri
| | * | When one of the spin button subcontrol is activated, the state member ofKevin Ottens2010-05-041-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the style option object should have QStyle::State_Sunken set in order for styles to paint the button as pressed. Merge-Request: 607 Reviewed-by: Andreas
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-041-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: fix crash in QLocalServer::close on Windows
| | | * | fix crash in QLocalServer::close on WindowsJoerg Bornemann2010-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If _q_onNewConnection failed, then QLocalServer got into a bad state. QLocalServer::isListening() still returned true and QLocalServer::close() crashed. Task-number: QTBUG-10388 Reviewed-by: ossi
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-05-041-2/+3
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style: QTabWidget icon size property doesn't work
| | | * | QS60Style: QTabWidget icon size property doesn't workSami Merila2010-05-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style did check if the tab icon size was larger than pixel metric for default tab icon size. If it was, then it reset the icon size to match pixel metric. It was impossible to set large icon to tab widget. As a fix, this check was removed from style. Task-number: QTBUG-3102 Reviewed-by: Jason Barron
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-05-031-1/+1
| | |\ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: PowerVR screen driver using undefined symbols
| | | * | PowerVR screen driver using undefined symbolsRhys Weatherley2010-05-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PowerVR screen driver was using QTransformedScreen::tranformation() which is in a class that is Q_AUTOTEST_EXPORT. That means that it would only work with a developer build. This contributed patch changes it to QScreen::transformOrientation() instead which is Q_GUI_EXPORT. Task-number: QTBUG-10193 Reviewed-by: Lorn Potter
| | * | | QS60Style: QComboBoxPrivateScroller draws holes into menu canvasSami Merila2010-05-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QComboBoxPrivateScroller calls eraserects for menu scroller areas, expecting the style to fill the gaps. Unfortunately, the QS60Style does not draw menu scrollers at all (but they are functional when interacted with). Therefore, these areas are now drawn as holes. As a fix, the eraseRect call from provate class QComboBoxPrivateScroller is removed when "s60 flag" is defined. Task-number: QTBUG-10371 Reviewed-by: Janne Koskinen
| | * | | QS60Style: QTabWidget Usability issue with capacitive screensSami Merila2010-05-032-11/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally Qt uses scrollbuttons together at right (for LeftToRight UI) side of the horizontal QTabBar; for vertical tab bar, scrollbuttons are displayed below/above the widget. Using QTabBar's scroll buttons with touch device that has capacitive screen, is somewhat hard as the touch area for either of the scroll buttons is somewhat smallish. So user is experiencing frequent wrong taps. Making the touch area larger, would make the tabbar tab shape area smaller, so it isn't a very good solution. Therefore, when QS60Style is in use, QTabWidget draws the scrollbuttons on either side of the QTabBar. Task-number: QT-3104 Reviewed-by: Alessandro Portale
| | * | | Fixing small memory leak in testlib.Aleksandar Sasha Babic2010-05-031-0/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Jason Barron
* | | | | Doc fixBea Lam2010-05-071-1/+1
| |_|_|/ |/| | | | | | | | | | | Task-number: QTBUG-10458
* | | | 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
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-052-0/+11
| | |\ \ \ \
| | | * | | | Don't start valuesource animations until all component objects have been ↵Michael Brasser2010-05-052-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completed. Task-number: QTBUG-9413
| | * | | | | docWarwick Allison2010-05-0519-205/+210
| | |/ / / / | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10386
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-053-4/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-0530-316/+500
| | |\ \ \ \
| | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-051-1/+9
| | | |\ \ \ \
| | | | * | | | Enable states to be activated via their 'when' clause even if unnamed.Michael Brasser2010-05-051-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Autogenerate a name for unnamed states: "anonymousState1", etc. Task-number: QTBUG-10352 Reviewed-by: Aaron Kennedy
| | | * | | | | Null objects should appear as JS nullAaron Kennedy2010-05-051-1/+2
| | | |/ / / /
| | | * | | | Fix a crash with null objects returned from a Q_INVOKABLERhys Weatherley2010-05-051-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-10412 Reviewed-by: Aaron Kennedy
| | * | | | | syntax updateWarwick Allison2010-05-051-1/+1
| | | | | | |