Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'master/master' into kinetic-graphicseffect | Ariya Hidayat | 2009-06-30 | 1 | -4/+32 |
|\ | |||||
| * | Doc: Documented the Move Blocks example. | Geir Vattekar | 2009-06-29 | 1 | -4/+32 |
| | | | | | | | | Reviewed-by: Andreas Aardal Hanssen | ||||
* | | Merge commit 'master/master' into kinetic-graphicseffect | Ariya Hidayat | 2009-06-29 | 1190 | -2258/+19324 |
|\ \ | |/ | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/graphicsview.pri src/gui/graphicsview/qgraphicsitem_p.h src/gui/graphicsview/qgraphicsscene.cpp src/gui/graphicsview/qgraphicsview.cpp | ||||
| * | 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 commit 'origin/4.5' | Bjørn Erik Nilsen | 2009-06-12 | 7 | -21/+6 |
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/boxes/glshaders.cpp src/gui/graphicsview/qgraphicsitem.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp tools/linguist/shared/cpp.cpp translations/linguist_ja.qm translations/qt_ru.qm | ||||
| | | * | Trafficinfo example: One more asynchronous call | Markus Goetz | 2009-06-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Task-number: 254455 | ||||
| | | * | Trafficinfo example: Asynchronous call to webservice at launch | Markus Goetz | 2009-06-11 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes the main window shown immediatly even when the webservice of traffikanten.no cannot be reached. Does not properly fix the associated task yet, e.g. display an error message. Task-number: 254455 | ||||
| | | * | Doc - fixed another typo | Kavindra Devi Palaraja | 2009-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Reviewed-By: TrustMe | ||||
| | | * | Doc - removing redundant return statements | Kavindra Devi Palaraja | 2009-06-08 | 5 | -14/+0 |
| | | | | | | | | | | | | | | | | Reviewed-By: Ariya Hidayat <ariya.hidayat@nokia.com> | ||||
| * | | | 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 commit 'qt-mainline/master' into master-recursivepaint | Andreas Aardal Hanssen | 2009-06-10 | 1 | -3/+2 |
| | |\ \ | |||||
| | * | | | Add ItemSendsGeometryChanges, replacing itemChangeEnabled(). | Andreas Aardal Hanssen | 2009-06-09 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag toggles whether we should send notifications for setPos, setMatrix, and setTransform. It's off by default. Docs have been updated. All autotests pass. This change also cleans up a bit so that we both have readable code, and keeping the optimized path for when we need to send the notifications. By enabling this flag by default we are going to trigger regressions in end-user code. Reviewed-by: bnilsen | ||||
| * | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-06-10 | 1 | -3/+2 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | WinCE doesn't have time() function, use QTime | Kent Hansen | 2009-06-09 | 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 |
| |\ \ \ | | |/ / | |||||
| | * | | Sync the French tutorial with the English version | Benjamin Poulain | 2009-06-08 | 5 | -15/+1 |
| | | | | | | | | | | | | | | | | Reviewed-by: Pierre | ||||
| | * | | Make sure we draw the complete curve. | Jan-Arve Sæther | 2009-06-08 | 1 | -1/+1 |
| | | | | |||||
| | * | | Use a QPainterPath instead to draw the graph. | Jan-Arve Sæther | 2009-06-08 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | This enables the antialiazing to be done on the graph as a whole, and not on every tiny line segment. The result is that the curve is painter prettier. | ||||
| | * | | Remove trailing whitespace. | Jan-Arve Sæther | 2009-06-08 | 1 | -7/+7 |
| | | | | |||||
| | * | | Make the easing curve icons more beautiful. | Ariya Hidayat | 2009-06-08 | 1 | -3/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Draw the curve with anti-aliasing. Do not use absolute black, but rather a dark black color for the lines. Draw the red and blue dots, indicating the start and end points. Reviewed-by: Jan-Arve | ||||
| * | | | 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. |