Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-08-19 | 1 | -0/+31 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | more docs | Yann Bodson | 2009-08-19 | 1 | -0/+31 |
| | | |||||
* | | Update Positioner Tests | Alan Alpert | 2009-08-19 | 1 | -20/+20 |
| | | | | | | | | | | | | | | Note that it still doesn't pass tests, due at least partially to an error in the test code. This change also slips in a change to the QLayoutItem example less of a bad example of how to integrate QGraphicsLayouts. | ||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-08-19 | 1 | -2/+2 |
|\ \ | |/ | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Rename filter to targets. | Michael Brasser | 2009-08-18 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-08-18 | 12 | -20/+22 |
|\ \ | |/ | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/fx/qfxpositioners.cpp | ||||
| * | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-08-18 | 6 | -8/+8 |
| |\ | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-08-18 | 7 | -16/+16 |
| | |\ | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| | * | | Change Item.contents to Item.childrenRect. | Michael Brasser | 2009-08-18 | 6 | -8/+8 |
| | | | | |||||
| * | | | MouseRegion API changes following review. | Martin Jones | 2009-08-18 | 6 | -12/+14 |
| | |/ | |/| | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-08-18 | 1109 | -1248/+4030 |
|\ \ \ | |/ / | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Make pong example scale. | Martin Jones | 2009-08-17 | 1 | -6/+6 |
| | | | |||||
| * | | Add smooth: true to dial example. | Martin Jones | 2009-08-17 | 2 | -4/+4 |
| | | | |||||
| * | | Update more often to avoid odd intervals beteeen second movements. | Martin Jones | 2009-08-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Martin Jones | 2009-08-17 | 3 | -5/+5 |
| |\ \ | | |/ | |/| | | | | kinetic-declarativeui | ||||
| | * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-14 | 1078 | -1136/+1134 |
| | |\ | |||||
| | | * | Get the pinchzoom working again | Bradley T. Hughes | 2009-08-13 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | Touch events on scrollarea based classes should enable touch on the viewport and handle the events in a viewportEvent() reimplementation. | ||||
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-10 | 34 | -60/+2615 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-04 | 5 | -28/+237 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-03 | 2 | -3/+8 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-08-02 | 2 | -2/+5 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-07-31 | 128 | -9285/+251 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Warwick Allison | 2009-07-17 | 18 | -9/+631 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | unwarn | Warwick Allison | 2009-07-17 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Slightly more key friendly loader. | Martin Jones | 2009-08-17 | 2 | -8/+19 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Get rid of QmlFont and use the QFont value type instead. | Michael Brasser | 2009-08-14 | 11 | -18/+18 |
| | | | | | | | | | | |||||
| * | | | | | | | | | react on mouse press rather than click (feels faster) | mae | 2009-08-13 | 1 | -2/+2 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix flowview example VisualModel -> VisualDataModel | Martin Jones | 2009-08-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Fix angle. | Michael Brasser | 2009-08-13 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Michael Brasser | 2009-08-13 | 23 | -24/+32 |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | | | | | | QGraphicsRotation3D has been merged into QGraphicsRotation. | Michael Brasser | 2009-08-13 | 2 | -3/+4 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Michael Brasser | 2009-08-13 | 1091 | -1199/+3969 |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h | ||||
| | * | | | | | | | | | Update obsolete email addresses. | Jason McDonald | 2009-08-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | | Replace some mentions of Trolltech with more appropriate terms. | Jason McDonald | 2009-08-12 | 9 | -23/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | | Update obsolete URL's in code and docs. | Jason McDonald | 2009-08-12 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | | Update references to online documentation. | Jason McDonald | 2009-08-12 | 9 | -18/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | | Eliminate last mentions of "Qt Software". | Jason McDonald | 2009-08-12 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | | Update URL's to use new domain. | Jason McDonald | 2009-08-12 | 6 | -16/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | | Update contact URL in license headers. | Jason McDonald | 2009-08-12 | 1068 | -1068/+1068 |
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | Compile fix with namespaces | hjk | 2009-08-10 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Doc: Integrated the Rogue (state machine) example. | Geir Vattekar | 2009-08-07 | 6 | -0/+465 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kent Hansen | ||||
| | * | | | | | | | | implement name() function of custom property iterator | Kent Hansen | 2009-08-06 | 1 | -1/+1 |
| | | | | | | | | | | |||||
| | * | | | | | | | | make the calculator example use only standard JS | Kent Hansen | 2009-08-06 | 1 | -45/+62 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __qt_sender__ is evil. Gah. | ||||
| | * | | | | | | | | Fixed compilation of the gestures/imagewidget example. | Denis Dzyubenko | 2009-08-06 | 3 | -12/+35 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also improved an example a bit to optionally support TapAndHold gesture with plain mouse events. Reviewed-by: trustme | ||||
| | * | | | | | | | | Added example that uses WebKit to capture Web page frames. | Andre Pedralho | 2009-08-06 | 4 | -0/+278 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The framecapture is based on GraphicsDojo/WebCapture and shows how to use WebKit toolkit to capture a web page and save its internal frames in different image files using the new property QWebFrame::clipRenderToViewPort. Merge-request: 1103 Reviewed-by: Ariya Hidayat <ariya.hidayat@nokia.com> | ||||
| | * | | | | | | | | Merge AudioServices into mainline. | Justin McPherson | 2009-08-05 | 17 | -0/+1772 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Merge branch '4.5' | Bill King | 2009-08-05 | 2 | -2/+0 |
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp | ||||
| | | * | | | | | | | Fix obsolete license headers | Jason McDonald | 2009-08-04 | 3 | -8/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | | | | | | | Added the license header to the example. | Denis Dzyubenko | 2009-08-04 | 2 | -0/+82 |
| | | | | | | | | | | |||||
| | * | | | | | | | | Removed the QTapAndHoldGesture | Denis Dzyubenko | 2009-08-04 | 5 | -8/+151 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the gesture implementation to the imageviewer example as it cannot be fully implemented in a crossplatform way - for example on Windows tap and hold is a system gesture that is transparent to the application. Reviewed-by: trustme |