Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | implement name() function of custom property iterator | Kent Hansen | 2009-07-15 | 1 | -1/+1 |
| | |||||
* | Merge branch 'qtwebkit-4.6-staging' into qtscript-jsc-backend | Kent Hansen | 2009-07-14 | 39 | -35/+2191 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/webkit/JavaScriptCore/interpreter/Interpreter.cpp src/script/qscriptecmafunction.cpp src/script/qscriptecmaglobal.cpp src/script/qscriptengine.cpp src/script/qscriptengine_p.cpp src/script/qscriptenginefwd_p.h src/script/qscriptextqobject.cpp src/script/qscriptextqobject_p.h tests/auto/qscriptqobject/tst_qscriptqobject.cpp | ||||
| * | general wording change for some file type names | Frederik Schwarzer | 2009-07-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | - .ts file -> TS file - .qm file -> QM file - .ui file -> UI file + a handfull of typos I stumbled over Merge-request: 802 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | ||||
| * | Refactored gesture api | Denis Dzyubenko | 2009-07-02 | 82 | -14645/+59 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewritten the api almost from scratch, making it simplier and more flexible at the same time. The current implementation will not have complex gseturemanager class inside Qt, but the QGesture base class, which represents both a gesture recognizer and a gesture itself with a set of properties. A set of common gestures that can use used in third-party applications (and in Qt itself internally) is supposed to be found in qstandardgestures.h, and a base class for user-defined gestures is in qgesture.h Gesture implementation for Pan on Windows7 has also been added as a reference implementation for platform gestures. | ||||
| * | These files don't have to have CRLF line-termination. | Thiago Macieira | 2009-07-02 | 3 | -16/+14 |
| | | | | | | | | The other files here don't, so I see no reason why these should | ||||
| * | Animation: fixed a NOTIFY signal name that was wrong | Thierry Bastian | 2009-07-01 | 1 | -6/+6 |
| | | | | | | | | Also slightly updated a demo | ||||
| * | Made QPainter / OpenGL intermixing in hellogl_es2 work properly again. | Samuel Rødal | 2009-07-01 | 1 | -0/+3 |
| | | | | | | | | | | | | | | Need to call syncState() to let the paint engine set depth clipping state parameters back to their OpenGL defaults. Reviewed-by: Trond | ||||
| * | examples: QString::fromUtf16() -> QString::fromWCharArray() | Marius Storm-Olsen | 2009-07-01 | 1 | -1/+1 |
| | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com> | ||||
| * | 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 | ||||
| * | | 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 | ||||
| * \ \ | 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 | ||||
| * | | | | 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 | ||||
| * | | | | | 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 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Added a gesture-enabled browser demo. | Denis Dzyubenko | 2009-05-11 | 56 | -0/+12906 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Added a dummy button on top of the webview to show how input events | Denis Dzyubenko | 2009-05-11 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are delayed. | ||||
| * | | | | | | | | | | | | | | | | Added pannablewebview example. | Denis Dzyubenko | 2009-05-11 | 3 | -1/+50 |
| | | | | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Removed obsolete Qt::AA_EnableGestures attribute from example apps. | Denis Dzyubenko | 2009-05-11 | 3 | -3/+0 |
| | | | | | | | | | | | | | | | | |