summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-11-1045-143/+470
|\ | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * 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
| | |/ / /
| | * | | 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 '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>
| * | | | | | | 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 '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
| | * | | QVideoFrame API review changes.Andrew den Exter2009-11-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename equivalentImageFormat() to imageFormatFromPixelFormat(). Rename equivalentPixelFormat() to pixelFormatFromImageFormat(). Rename numBytes() to mappedBytes(). Reviewed-by: Justin McPherson
| | * | | QAbstractVideoSurface API review changes.Andrew den Exter2009-11-044-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename isStarted() and startedChanged() to is active() and activeChanged(). Remove the the similar format argument from isFormatSupported() and add a new nearestFormat() function which provides the same functionality. Reviewed-by: Justin McPherson
| * | | | Fixed hardcoded GL library names on WinCE.Trond Kjernåsen2009-11-042-15/+0
| |/ / / | | | | | | | | | | | | | | | | Task-number: QTBUG-5148 Reviewed-by: Tom Cooksey
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-042-1/+3
| |\ \ \
| | * \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-doc-team into 4.6David Boddie2009-11-032-1/+3
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qevent.cpp src/network/ssl/qsslerror.cpp
| | | * | Fixed main window closing when subwindows cancel their close events.David Boddie2009-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me Reported-here: http://lists.trolltech.com/pipermail/qt4-preview-feedback /2009-October/001023.html
| | | * | Doc: i18n overhaul for QObject::tr() and the Qt Linguist manual.David Boddie2009-11-021-0/+2
| | | |/ | | | | | | | | | | | | Reviewed-by: Trust Me
| * | | Merge branch 'statemachine-api-changes' into 4.6Eskil Abrahamsen Blomfeldt2009-11-031-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | Conflicts: doc/src/frameworks-technologies/statemachine.qdoc src/corelib/statemachine/qstatemachine.cpp
| | * | Rename QState::polished() signal to "propertiesAssigned"Eskil Abrahamsen Blomfeldt2009-11-031-2/+2
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | "Polished" was never a very descriptive word, and it already has a meaning attached in the QStyle API. Additionally, "propertiesAssigned" has the benefit of giving the relation to the assignProperty() function as part of the name. Reviewed-by: Kent Hansen
| * | Add QScriptString::toArrayIndex() functionKent Hansen2009-10-301-14/+3
| |/ | | | | | | | | | | | | | | | | | | Avoid hacking a custom toArrayIndex() in the example; instead provide an ECMA-compliant conversion that's as fast as possible (having to convert the QScriptString to a QString and then convert the result to a number is considerably slower than calling JSC's Identifier::toArrayIndex() function directly). Reviewed-by: Olivier Goffart
* | Add "View Page Source" and support for URL on the command lineDavid Faure2009-11-093-4/+36
| | | | | | | | | | | | | | | | | | This example app is useful for debugging QtWebKit problems, it was just missing a way to load the url from the command-line (to avoid loading google first), and a "view page source" action. Reviewed-By: Markus Goetz Merge-Request: 2021
* | Merge branch '4.6'Thiago Macieira2009-10-291-0/+4
|\ \ | |/ | | | | | | Conflicts: tools/qdoc3/test/qt-inc.qdocconf
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-273-8/+145
| |\
| * | Emulator IAP fix for SymbianJanne Koskinen2009-10-261-0/+4
| | | | | | | | | | | | | | | | | | | | | Don't display multiple useless IAP dialogs in the emulator environment. If you need specific IAP then you need to revert this commit. Reviewed-by: Aleksandar Babic
* | | Merge remote branch 'origin/4.6'Thiago Macieira2009-10-264-11/+148
|\ \ \ | | |/ | |/| | | | | | | Conflicts: tools/qdoc3/test/qt-build-docs.qdocconf
generated by cgit v0.12 at 2024-11-27 01:53:08 (GMT)