summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtPeter Hartmann2009-07-1510-22/+19
|\
| * Make the mainwindow examples use setWindowFilePathNorwegian Rock Cat2009-07-146-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 CEJoerg Bornemann2009-07-133-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 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>
* | Merge branch 'master' of git://gitorious.org/qt/qtTobias Koenig2009-07-051113-2201/+4732
|\ \ | |/
| * 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
| * 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
| | * Merge commit 'origin/4.5'Oswald Buddenhagen2009-06-237-0/+372
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/sql/drivers/psql/qsql_psql.cpp
| | | * Doc - Adding the new Frozen Column Example by Pierre Rossi into our list ofKavindra Devi Palaraja2009-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | examples Reviewed-By: TrustMe
| | | * Doc - Adding Pierre Rossi's frozen column exampleKavindra Devi Palaraja2009-06-236-0/+371
| | | | | | | | | | | | | | | | Reviewed-By: TrustMe
| * | | 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
| | * | Demo: fixed colors in the calendar when May 1st is a FridayThierry Bastian2009-06-181-14/+14
| | | | | | | | | | | | | | | | Task-number: 255114
| * | | 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
| | * | Use the unified toolbar on Mac.Morten Sørvig2009-06-183-0/+3
| | | |
| * | | 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
| | * | Update license headers in files that are new in 4.6.Jason McDonald2009-06-1785-170/+170
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | Merge license header changes from 4.5Volker Hilsheimer2009-06-16990-1989/+1989
| | |\ \ | | | |/
| | | * Cleanup our usage of the term "Qt Software".Jason McDonald2009-06-164-9/+9
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * Update license headers as requested by the marketing department.Jason McDonald2009-06-16988-1976/+1976
| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * Make the codeeditor example compile on Windows.Jason McDonald2009-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Local includes should use the double-quote form of #include rather than the angle-bracket form. Reviewed-by: Trust Me
| * | | 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
| * | | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-2916-17/+39
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-26173-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/qtBradley T. Hughes2009-05-2227-57/+64
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-209-0/+314
| |\ \ \ \ \ \ \ \ \ \