Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-20 | 9 | -0/+314 |
|\ | |||||
| * | Doc: First attempt at a simpler widgets tutorial. | David Boddie | 2009-05-20 | 9 | -0/+314 |
| | | | | | | | | | | Task-number: 253710 Reviewed-by: Trust Me | ||||
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-18 | 5 | -0/+229 |
|\ \ | |/ | |||||
| * | compile (rand()) | Warwick Allison | 2009-05-15 | 1 | -0/+1 |
| | | |||||
| * | Merge branch 'master' of ../master into contiguouscache | Ian Walters | 2009-05-14 | 36 | -76/+93 |
| |\ | |||||
| * \ | Merge branch 'master' into contiguouscache | Ian Walters | 2009-05-12 | 36 | -46/+1471 |
| |\ \ | |||||
| * | | | Update licensing headers. | Ian Walters | 2009-04-07 | 3 | -0/+121 |
| | | | | | | | | | | | | | | | | | | | | Update files to have consistent licencesing with the rest of Qt. | ||||
| * | | | Merge branch 'master' into contiguouscache | Ian Walters | 2009-04-06 | 19 | -15/+1233 |
| |\ \ \ | |||||
| * | | | | Rename OffsetVector to ContiguousCache | Ian Walters | 2009-04-03 | 6 | -12/+12 |
| | | | | | |||||
| * | | | | Squashed commit of the following: | Rhys Weatherley | 2009-03-24 | 5 | -0/+107 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 39de3862f5678b3226b4932eeb342c4a023d2f2b Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 14:16:05 2009 +1000 Fixes: Test runs (and passes), doc links. Task: QT-308 Details: Minor changes related to the code having moved. commit 5a8910dd1018fb228d0e2e2819ea429577bfa834 Author: Ian Walters <ian.walters@nokia.com> Date: Thu Feb 19 09:47:20 2009 +1000 Fixes: Checkin of QOffsetVector stuff for branch Task: QT-308 Details: Files originally from research/qcircularbuffer This checkin likely won't compile. Just a copy for now. | ||||
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt | Bradley T. Hughes | 2009-05-13 | 36 | -76/+93 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge commit 'origin/4.5' | Olivier Goffart | 2009-05-13 | 2 | -2/+22 |
| |\ \ \ \ | |||||
| | * | | | | Adding documentation to the fancy browser example | Morten Engvoldsen | 2009-05-12 | 2 | -2/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added documentation to the fancy browser example. Task-number:252097 Rev-by: Geir Vattekar Rev-by: Ariya Hidayat | ||||
| * | | | | | Replace all instances of "Ctrl+Q" with QKeySequence::Quit. | Norwegian Rock Cat | 2009-05-12 | 34 | -74/+71 |
| | |_|_|/ | |/| | | | | | | | | | | | | | We introduce this new enum, we should be using it. | ||||
* | | | | | 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 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '4.5' | Thiago Macieira | 2009-05-11 | 2 | -5/+13 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Only link against opengles .LIB files if on WinCE | Tom Cooksey | 2009-05-11 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: 251685 Reviewed-by: mauricek | ||||
| | * | | | Fixing hellogl_es2 for Windows CE | Thomas Hartmann | 2009-05-08 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We hardcode the lib names for 4.5 Reviewed-by: Maurice | ||||
* | | | | | 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 |
| | | | | | |||||
* | | | | | fix link error on windows | Bradley T. Hughes | 2009-05-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Make sure gestures/collidingmice example is build with all gesture | Denis Dzyubenko | 2009-05-11 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | examples. | ||||
* | | | | | Removed QWidget::gestureEvent() functions since adding a new virtual | Denis Dzyubenko | 2009-05-11 | 2 | -0/+10 |
| | | | | | | | | | | | | | | | | | | | | function breaks binary compatibility. | ||||
* | | | | | Gestures/imageviewer example compiles | Denis Dzyubenko | 2009-05-11 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Gesture examples compile now. | Denis Dzyubenko | 2009-05-11 | 6 | -92/+77 |
| | | | | | |||||
* | | | | | Added QGraphicsSceneGestureEvent that extends plain QGestureEvent by | Denis Dzyubenko | 2009-05-11 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | providing some additional info (like a widget that received a gesture - for coordinates conversions). | ||||
* | | | | | Added animation to zooming gesture in collidingmice example. | Denis Dzyubenko | 2009-05-11 | 2 | -4/+38 |
| | | | | | |||||
* | | | | | Implemented LinjaZax-like gesture in collidingmice example. | Denis Dzyubenko | 2009-05-11 | 6 | -4/+335 |
| | | | | | |||||
* | | | | | Added colliding mice example with gesture support. | Denis Dzyubenko | 2009-05-11 | 5 | -0/+405 |
| | | | | | |||||
* | | | | | Fixes: Compilation fixes | Denis Dzyubenko | 2009-05-11 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | Fixed lastDirection in the Pan gesture. | Denis Dzyubenko | 2009-05-11 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge of the maemo-gestures branch onto qt/4.5.0 | Denis Dzyubenko | 2009-05-11 | 7 | -0/+724 |
| | | | | | | | | | | | | | | | | | | | | | | | | | This is a squashed merge of all of the changes in the maemo-gestures branch on-top of the qt/4.5.0 branch. | ||||
* | | | | | build the multitouch examples from the top-level build | Bradley T. Hughes | 2009-05-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | just needed to add multitouch to SUBDIRS in examples/examples.pro | ||||
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Bradley T. Hughes | 2009-05-08 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | windows-7-multitouch | ||||
| * | | | | Merge branch '4.5' of git@scm.dev.troll.no:qt/qt | Simon Hausmann | 2009-05-06 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoaview_mac_p.h src/gui/widgets/qmainwindow.cpp | ||||
| | * | | | Fixed typo in README file | Nils Christian Roscher-Nielsen | 2009-05-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Reviewed-by: David Boddie <dboddie@trolltech.com> | ||||
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Bradley T. Hughes | 2009-05-04 | 4 | -6/+30 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | windows-7-multitouch | ||||
| * | | | | Merge commit 'origin/4.5' | Bjoern Erik Nilsen | 2009-04-29 | 4 | -6/+30 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Corrected bugs in the flow layout example | Morten Engvoldsen | 2009-04-29 | 4 | -6/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Corrected bugs in the example and added markers for snippets in the documentation. Task-number: 250616 Rev-by: Geir Vattekar | ||||
| | * | | | fixed minor issue with the piechart demo | Pierre Rossi | 2009-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis | ||||
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Bradley T. Hughes | 2009-04-27 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | windows-7-multitouch | ||||
| * | | | | fixed minor issue with the piechart demo | Pierre Rossi | 2009-04-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rubberband was not set on the viewport, leading to an offset when adding margins. Task-number: 251892 Reviewed-by: Alexis | ||||
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵ | Bradley T. Hughes | 2009-04-23 | 19 | -1/+1340 |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | windows-7-multitouch |