Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'qt/master-stable' into 4.6-merged | Jason Barron | 2009-06-30 | 1190 | -2210/+19319 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore configure.exe src/corelib/concurrent/qtconcurrentthreadengine.h src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicssceneevent.h src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication.h src/gui/kernel/qapplication_p.h src/gui/kernel/qapplication_qws.cpp src/gui/kernel/qwidget.h src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontdatabase.cpp src/network/access/qnetworkaccesshttpbackend.cpp tests/auto/network-settings.h tests/auto/qscriptjstestsuite/qscriptjstestsuite.pro tests/auto/qvariant/tst_qvariant.cpp | ||||
| * | Doc: Documented the Move Blocks example. | Geir Vattekar | 2009-06-29 | 1 | -4/+32 |
| | | | | | | | | Reviewed-by: Andreas Aardal Hanssen | ||||
| * | Fix license headers after multitouch+gestures merge. | Jason McDonald | 2009-06-29 | 61 | -305/+305 |
| | | | | | | | | | | | | | | Commercial license headers belong in source packages only. The repo must have the pre-release license headers. Reviewed-by: Trust Me | ||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Jason McDonald | 2009-06-29 | 1 | -2/+1 |
| |\ | |||||
| | * | Make compile when -no-webkit is passed to configure | Bill King | 2009-06-29 | 1 | -2/+1 |
| | | | |||||
| * | | Fix old/missing license headers from multitouch+gestures merge. | Jason McDonald | 2009-06-29 | 69 | -193/+398 |
| |/ | | | | | | | Reviewed-by: Trust Me | ||||
| * | Cleanup includes in public headers. | Bradley T. Hughes | 2009-06-26 | 1 | -0/+1 |
| | | | | | | | | We don't want to pull in too much if we can avoid it. | ||||
| * | Don't build the pannablewebview example if webkit is disabled | Bradley T. Hughes | 2009-06-26 | 1 | -1/+4 |
| | | |||||
| * | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-24 | 7 | -0/+372 |
| |\ | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp | ||||
| | * | Merge commit 'origin/4.5' | Oswald Buddenhagen | 2009-06-23 | 7 | -0/+372 |
| | |\ | | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp | ||||
| | | * | Doc - Adding the new Frozen Column Example by Pierre Rossi into our list of | Kavindra Devi Palaraja | 2009-06-23 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | examples Reviewed-By: TrustMe | ||||
| | | * | Doc - Adding Pierre Rossi's frozen column example | Kavindra Devi Palaraja | 2009-06-23 | 6 | -0/+371 |
| | | | | | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| * | | | Don't build the gesture browser "example" if webkit or svg are disabled | Bradley T. Hughes | 2009-06-23 | 1 | -1/+2 |
| | | | | |||||
| * | | | Don't crash in the fingerpaint example if the touch id gets too large | Bradley T. Hughes | 2009-06-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Some touch devices don't recycle touch id's, so for longer sequences we could easily see ids that become larger than the color list size. Make sure we constrain the index we use. | ||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-22 | 1 | -14/+14 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/qnamespace.qdoc src/corelib/global/qnamespace.h src/gui/graphicsview/qgraphicsscene.cpp | ||||
| | * | | Demo: fixed colors in the calendar when May 1st is a Friday | Thierry Bastian | 2009-06-18 | 1 | -14/+14 |
| | | | | | | | | | | | | | | | | Task-number: 255114 | ||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-18 | 3 | -0/+3 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h | ||||
| | * | | Use the unified toolbar on Mac. | Morten Sørvig | 2009-06-18 | 3 | -0/+3 |
| | | | | |||||
| * | | | update examples now that we get both touch and mouse events at the same time | Bradley T. Hughes | 2009-06-18 | 5 | -7/+100 |
| | | | | | | | | | | | | | | | | | | | | added a new example to show how to enable touch for an existing widget (QDial in this case), and that the mouse event emulation of QWidget does the Right Thing (tm) | ||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-17 | 1075 | -2159/+2159 |
| |\ \ \ | | |/ / | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h | ||||
| | * | | Update license headers in files that are new in 4.6. | Jason McDonald | 2009-06-17 | 85 | -170/+170 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | * | | Merge license header changes from 4.5 | Volker Hilsheimer | 2009-06-16 | 990 | -1989/+1989 |
| | |\ \ | | | |/ | |||||
| | | * | Cleanup our usage of the term "Qt Software". | Jason McDonald | 2009-06-16 | 4 | -9/+9 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | | * | Update license headers as requested by the marketing department. | Jason McDonald | 2009-06-16 | 988 | -1976/+1976 |
| | | | | | | | | | | | | | | | | Reviewed-by: Trust Me | ||||
| | | * | Make the codeeditor example compile on Windows. | Jason McDonald | 2009-06-16 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Local includes should use the double-quote form of #include rather than the angle-bracket form. Reviewed-by: Trust Me | ||||
| | * | | Ported the FormExtractor example to use the new QWebElement | Simon Hausmann | 2009-06-15 | 3 | -32/+25 |
| | | | | | | | | | | | | | | | | Reviewed-by: Tor Arne | ||||
| * | | | Merge of master | Bradley T. Hughes | 2009-06-15 | 10 | -53/+31 |
| | | | | |||||
| * | | | enable touch events on all views if an item has touch enabled | Bradley T. Hughes | 2009-06-11 | 1 | -1/+0 |
| | | | | |||||
| * | | | remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent) | Bradley T. Hughes | 2009-06-11 | 1 | -7/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the API for these 2 classes is identical, the implementation is almost identical, they share the same data structures, so bite the bullet and merge them. this means we go back to using screenPos() instead of globalPos() again | ||||
| * | | | another API review round: change Q*TouchEvent size() functions to return ↵ | Bradley T. Hughes | 2009-06-11 | 1 | -8/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | rects instead these are more useful, as already shown in the fingerpaint example | ||||
| * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-10 | 1 | -0/+1 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene_p.h | ||||
| * \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-10 | 1 | -3/+2 |
| |\ \ \ \ | |||||
| * | | | | | add gesture examples to the examples.pro SUBDIRS | Bradley T. Hughes | 2009-06-10 | 1 | -1/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-08 | 7 | -29/+29 |
| |\ \ \ \ \ | |||||
| * | | | | | | Compile after API updates | Bradley T. Hughes | 2009-06-05 | 3 | -21/+21 |
| | | | | | | | |||||
| * | | | | | | Accept TouchBegin events by default if they are enabled | Bradley T. Hughes | 2009-06-05 | 3 | -10/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After an API review round, we agreed that it makes sense for the TouchBegin event to default to accepted if the widget has subscribed to receive touch events. | ||||
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-05 | 11 | -39/+19 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Add support for touch point contact area | Bradley T. Hughes | 2009-06-03 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QTouchEvent::TouchPoint::area() and implement support for it on Windows | ||||
| * | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-29 | 16 | -17/+39 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-26 | 173 | -308/+13471 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/kernel/qcoreevent.h src/gui/graphicsview/qgraphicsitem_p.h | ||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-22 | 27 | -57/+64 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-20 | 9 | -0/+314 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-18 | 5 | -0/+229 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-13 | 36 | -76/+93 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | make the red and green children items larger | Bradley T. Hughes | 2009-05-13 | 1 | -4/+4 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-12 | 2 | -5/+13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | Added gesture enabled browser demo to project file. | Denis Dzyubenko | 2009-05-12 | 11 | -0/+531 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing files for building the demo. | ||||
| * | | | | | | | | | | | | | | Improved finding a scrollable QWebFrame in browser demo. | Denis Dzyubenko | 2009-05-11 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added support to pan frames inside browser window. | Denis Dzyubenko | 2009-05-11 | 2 | -9/+16 |
| | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | Added inertial to the browser demo. | Denis Dzyubenko | 2009-05-11 | 2 | -3/+29 |
| | | | | | | | | | | | | | | |