summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Improve loader exampleYann Bodson2009-07-165-17/+49
| | | | Use system palette and icons.
* Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-1414-0/+58
|\ | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * Libraries and library versioning.Warwick Allison2009-07-1414-0/+58
| |
* | Move QmlTimer to util/Martin Jones2009-07-141-0/+14
|/
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-1086-14662/+74
|\ | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/kernel/qmetaobject.cpp tools/qdoc3/generator.cpp tools/qdoc3/test/qt-cpp-ignore.qdocconf tools/qdoc3/test/qt-inc.qdocconf
| * general wording change for some file type namesFrederik Schwarzer2009-07-061-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 apiDenis Dzyubenko2009-07-0282-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 Macieira2009-07-023-16/+14
| | | | | | | | The other files here don't, so I see no reason why these should
* | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-097-6/+119
|\ \ | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-0847-7/+1236
| |\ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Add a modulus property to Follow to allow "wrapping".Martin Jones2009-07-086-0/+83
| | | | | | | | | | | | | | | | Also add clock example to demonstrate.
| * | | Browser UI improvements.Martin Jones2009-07-081-6/+36
| | | |
* | | | DocAaron Kennedy2009-07-0734-0/+1418
| |/ / |/| |
* | | Improve QmlComponent APIAaron Kennedy2009-07-076-6/+6
| | | | | | | | | | | | Having to use QUrl::fromLocalFile() is crummy. Add appropriate overloads the QmlComponent, and resolve relative paths against a "base url" set on the QmlEngine.
* | | Merge branch 'kinetic-declarativeui' of ↵Aaron Kennedy2009-07-063-7/+10
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Fix bug in createQmlObjectAlan Alpert2009-07-062-2/+2
| | | | | | | | | | | | | | | | | | | | Wasn't actually loading the object's context properly, with regard to url resolution.
| * | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-07-02116-22/+16819
| |\ \ \ | | |/ / | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | Improve JS dynamic creationAlan Alpert2009-07-022-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renamed evalQml to be consistent with us, not javascript. Fixed bug where createComponent never had the right path. createQmlObject (evalQml) now has a parent as a argument. It also still has a bug where that parent doesnt get set properly, although it is used as the creation context also.
* | | | DocAaron Kennedy2009-07-0644-0/+1226
| |/ / |/| |
* | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-07-02125-52/+16814
|\ \ \ | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-02114-18/+16762
| |\ \ \ | | |/ / | |/| / | | |/ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| | * Animation: fixed a NOTIFY signal name that was wrongThierry Bastian2009-07-011-6/+6
| | | | | | | | | | | | Also slightly updated a demo
| | * Made QPainter / OpenGL intermixing in hellogl_es2 work properly again.Samuel Rødal2009-07-011-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-Olsen2009-07-011-1/+1
| | | | | | | | | | | | | | | Merge-request: 604 Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
| | * Doc: Documented the Move Blocks example.Geir Vattekar2009-06-291-4/+32
| | | | | | | | | | | | Reviewed-by: Andreas Aardal Hanssen
| | * Fix license headers after multitouch+gestures merge.Jason McDonald2009-06-2961-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/qtJason McDonald2009-06-291-2/+1
| | |\
| | | * Make compile when -no-webkit is passed to configureBill King2009-06-291-2/+1
| | | |
| | * | Fix old/missing license headers from multitouch+gestures merge.Jason McDonald2009-06-2969-193/+398
| | |/ | | | | | | | | | Reviewed-by: Trust Me
| | * Cleanup includes in public headers.Bradley T. Hughes2009-06-261-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 disabledBradley T. Hughes2009-06-261-1/+4
| | |
| | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-247-0/+372
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qapplication_x11.cpp
| | * | Don't build the gesture browser "example" if webkit or svg are disabledBradley T. Hughes2009-06-231-1/+2
| | | |
| | * | Don't crash in the fingerpaint example if the touch id gets too largeBradley T. Hughes2009-06-221-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/qtBradley T. Hughes2009-06-221-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/qtBradley T. Hughes2009-06-183-0/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem_p.h
| | * | | | update examples now that we get both touch and mouse events at the same timeBradley T. Hughes2009-06-185-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/qtBradley T. Hughes2009-06-171075-2159/+2159
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsscene_p.h
| | * | | | | Merge of masterBradley T. Hughes2009-06-1510-53/+31
| | | | | | |
| | * | | | | enable touch events on all views if an item has touch enabledBradley T. Hughes2009-06-111-1/+0
| | | | | | |
| | * | | | | remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent)Bradley T. Hughes2009-06-111-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. Hughes2009-06-111-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/qtBradley T. Hughes2009-06-101-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/qtBradley T. Hughes2009-06-101-3/+2
| | |\ \ \ \ \ \
| | * | | | | | | add gesture examples to the examples.pro SUBDIRSBradley T. Hughes2009-06-101-1/+2
| | | | | | | | |
| | * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-06-087-29/+29
| | |\ \ \ \ \ \ \
| | * | | | | | | | Compile after API updatesBradley T. Hughes2009-06-053-21/+21
| | | | | | | | | |
| | * | | | | | | | Accept TouchBegin events by default if they are enabledBradley T. Hughes2009-06-053-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/qtBradley T. Hughes2009-06-0511-39/+19
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Add support for touch point contact areaBradley T. Hughes2009-06-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add QTouchEvent::TouchPoint::area() and implement support for it on Windows
generated by cgit v0.12 at 2024-10-23 16:25:06 (GMT)