summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-123-6/+19
|\ | | | | | | kinetic-declarativeui
| * Merge branch '4.6-platform' into 4.6Denis Dzyubenko2009-11-113-6/+19
| |\
| | * Pinchzoom example zooms more smoothDenis Dzyubenko2009-11-112-5/+18
| | | | | | | | | | | | | | | | | | | | | Remember the scale factor so it won't reset each time a new touch sequence starts. Reviewed-by: Bradley T. Hughes
| | * Fixed opening files in the findfile example.Denis Dzyubenko2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | QDesktopServices::openUrl expects a proper url, not just a filename. Reviewed-by: Jedrzej Nowacki
* | | Merge remote branch 'qt/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-11-1113-51/+69
|\ \ \ | |/ /
| * | Improvements to graphics effects API after review round.Samuel Rødal2009-11-104-6/+6
| |/ | | | | | | | | | | | | | | | | | | | | | | * Get rid of QGraphicsEffectSource from the public API, instead add convenience functions in QGraphicsEffect. This way we commit to less API, and are free to introduce a customizable QGraphicsEffectSource in a future release. * Move PixmapPadMode into QGraphicsEffect and tweak the names of the enum values. * Make QGraphicsBlurEffect::BlurHint into a bit flag, for extensibility. Reviewed-by: Bjørn Erik Nilsen
| * Changes to low-level audio API.Kurt Korbatits2009-11-103-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
| * Changes to low-level audio API.Kurt Korbatits2009-11-103-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
| * Merge branch '4.6' of ../qt into 4.6Kurt Korbatits2009-11-1026-67/+424
| |\
| | * Merge commit 'qtwebkit/qtwebkit-4.6' into 4.6Jocelyn Turcotte2009-11-091-4/+3
| | |\
| | | * Corrects bug in fancybrowser example where image rotation did not work.Jocelyn Turcotte2009-11-061-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is actually only a workaround of what seems to be a QtWebKit bug. See QTBUG-4649. Reviewed-by: Jedrzej Nowacki
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Morten Engvoldsen2009-11-091-2/+2
| | |\ \
| | | * \ Merge branch '4.6-api-review' into 4.6Marius Storm-Olsen2009-11-091-2/+2
| | | |\ \
| | | | * | API review: QRegExp::numCaptures() -> QRegExp::captureCount()Marius Storm-Olsen2009-11-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QRegExp::numCaptures() is marked as obsolete. Replaced all usage in Qt and test-cases. Reviewed-by: Andreas Aardal Hanssen
| | * | | | ÿþdMorten Engvoldsen2009-11-094-27/+46
| | |/ / /
| * | | | Changes to low-level audio API.Kurt Korbatits2009-11-053-12/+12
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QAudioFormat::isNull() -> QAudioFormat::isValid() (inverse logic) QAudio::SuspendState -> QAudio::SuspendedState QAudio::StopState -> QAudio::StoppedState QAudioDeviceInfo::deviceList() -> QAudioDeviceInfo::availableDevices() clock() -> elapsedUSecs() totalTime() -> processedUSecs() QIODevice* start(QIODevice*) -> void start(QIODevice*), QIODevice* start() Reviewed-by:Justin McPherson
* | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-11-111-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/util/util.pri
| * | | | look nicerWarwick Allison2009-11-111-2/+3
| | | | |
* | | | | Update SameGame tutorial to discuss offline storageAlan Alpert2009-11-111-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | Also removed the \target and got the navigation set up properly. Task-number: QT-2375
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-102-31/+33
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Fix samegame tutorial 3Alan Alpert2009-11-101-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | the js file hadn't been updated to avoid global vars Also updating a missed particles element
| * | | | Clarify the role of positioner transitionsAlan Alpert2009-11-101-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are only for the positioner's position changes, other changes are under the designers control and the designer should animate them. Task-number: QT-2239
* | | | | Remove WebView::pagewidth and tidy up - it's not needed and interferedWarwick Allison2009-11-101-2/+2
|/ / / / | | | | | | | | | | | | with zoomFactor.
* | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-092-5/+8
|\ \ \ \ | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | Fix perspective in dynamic exampleAlan Alpert2009-11-092-5/+8
| | | | | | | | | | | | | | | | | | | | working Z and items can no longer be placed in the sky (due to scaling).
* | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-0929-77/+395
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h
| * | | Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-11-0610-33/+72
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * \ \ Merge branch '4.6-s60' into 4.6axis2009-11-066-3/+27
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-052-15/+0
| | | |\ \ | | | | |/
| | | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60axis2009-11-0410-32/+28
| | | |\ \
| | | * | | Added UIDs to projects lacking themMiikka Heikkinen2009-11-046-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also added symbianpkgrules.pri include to some examples Reviewed-by: Janne Koskinen
| | * | | | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-062-17/+25
| | |\ \ \ \
| | | * | | | Modify QGLShader and QGLShaderProgram in response to API reviewRhys Weatherley2009-11-052-17/+25
| | | | |_|/ | | | |/| | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * | | | Fixed pinching in the imagegestures example.Denis Dzyubenko2009-11-051-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the gesture finishes it might not necessery set the ScaleFactorChanged flag. Also fixed the touch-event based pinch gesture. Reviewed-by: trustme
| | * | | | Small improvement in the imagegesture example.Denis Dzyubenko2009-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need to fill the backgroup in the example as it will be done by Qt. And when double-clicked we need to reset the scale factor properly. Reviewed-by: trustme
| | * | | | Implemented QSwipeGesture recognizer using touch events.Denis Dzyubenko2009-11-051-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Bradley T. Hughes
| | * | | | Merge remote branch 'qt-official/4.6' into 4.6Morten Johan Sørvig2009-11-0511-41/+15
| | |\ \ \ \ | | | |/ / /
| | * | | | Mac: pinch gesture scales to fast and event below zeroRichard Moe Gustavsen2009-11-042-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the math correct. Plus, update the imagegesture example. Rev-By: denis
| * | | | | Pro file fixes wrt anchor layout examples.Jan-Arve Sæther2009-11-062-4/+3
| | | | | |
| * | | | | Make sure the pixmap is properly initialized.Jan-Arve Sæther2009-11-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: sroedal
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-widget-team into 4.6Jan-Arve Sæther2009-11-054-35/+16
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Eskil Abrahamsen Blomfeldt2009-11-047-29/+23
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge commit '51c9b68' into 4.6Morten Johan Sørvig2009-11-042-20/+16
| | | |\ \ \ | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0 src/gui/kernel/qevent.h
| | | | * | Compile fix after the last gesture api changeDenis Dzyubenko2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | Gesture api review.Denis Dzyubenko2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to the gesture api after the review. Reviewed-by: Jasmin Blanchette
| | | | * | Implemented pinch gesture recognizer.Denis Dzyubenko2009-11-031-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | | | * | Fixed the imagegestures project file.Denis Dzyubenko2009-11-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: trustme
| | * | | | Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-042-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| * | | | | Merge branch 'fixes' of git://gitorious.org/~morphbr/qt/morphbrs-clone into ↵Jan-Arve Sæther2009-11-059-0/+300
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | morpheuz-fixes
| | * | | | Weather Anchor Layout exampleArtur Duque de Souza2009-11-059-0/+300
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was a design that was not possible before with the other layouts. To do this, the developer would need to hardcode all the positions and resize would not work. Besides the fact that we use "pixmap widgets" no it's not totally usefull widgets, it shows how anchors can help developers an designers with to create applications with new layouts. Signed-off-by: Artur Duque de Souza <artur.souza@openbossa.org>