Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add the "star" example, which demonstrates how to mix OpenVG and QPainter | Rhys Weatherley | 2009-07-20 | 7 | -0/+290 |
| | | | | Reviewed-by: trustme | ||||
* | Update the documentation after the change in the completer exemple | Olivier Goffart | 2009-07-17 | 1 | -2/+2 |
| | |||||
* | Lets the size of the completer be configurable in a way similar to QComboBox. | Frédéric Mercille | 2009-07-17 | 2 | -4/+23 |
| | | | | | Merge-request: 884 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> | ||||
* | Doc: show warnings about unrecognized or unsupported devices in the status | Volker Hilsheimer | 2009-07-16 | 1 | -8/+25 |
| | | | | | | | bar where TabletPC users can also see them. Fixes: task 216859 Rev-by: TrustMe | ||||
* | And again in the examples | Thiago Macieira | 2009-07-16 | 3 | -3/+3 |
| | |||||
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Peter Hartmann | 2009-07-15 | 10 | -22/+19 |
|\ | |||||
| * | Make the mainwindow examples use setWindowFilePath | Norwegian Rock Cat | 2009-07-14 | 6 | -18/+15 |
| | | | | | | | | | | | | | | | | | | | | Should have done this a while ago. Use setWindowFilePath to get proxy icons on mac and simplify window title handling on the other platforms. The only downside is that we do have to specify the application name to get the exact same behavior. But on the other hand, QSettings handlig is a bit better. | ||||
| * | make examples/activeqt/webbrowser work on Windows CE | Joerg Bornemann | 2009-07-13 | 3 | -3/+3 |
| | | | | | | | | | | | | | | | | | | This example only worked on desktop Windows and Windows mobile. Windows CE uses the same GUID for the Internet Explorer ActiveX control like desktop Windows. Task-number: 255111 Reviewed-by: thartman | ||||
| * | 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> | ||||
* | | Merge branch 'master' of git://gitorious.org/qt/qt | Tobias Koenig | 2009-07-05 | 1113 | -2201/+4732 |
|\ \ | |/ | |||||
| * | 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 | ||||
| | * | 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 | ||||
| * | | | 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 |
| |\ \ \ \ \ \ |