summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\| | |
| * | | 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
| | * | | 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
* | / 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
* | 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
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6axis2009-10-273-8/+145
|\
| * Doc: Reviewed and revised QGraphicsAnchorLayout documentation.David Boddie2009-10-233-8/+145
| | | | | | | | Reviewed-by: Trust Me
* | 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
* Compile fix.Denis Dzyubenko2009-10-221-3/+3
| | | | | | | QPanGesture was changed to use QPointF instead of QSizeF, also need to change all usages of the pan gesture. Reviewed-by: trustme
* Fixed clock() function return values in audio class's.Kurt Korbatits2009-10-222-2/+2
| | | | | | | clock() function should return microseconds, fixed example, alsa backend and win32 backend. Reviewed-by:Justin McPherson
* Doc: Documentation for gesture features. Still a moving target.David Boddie2009-10-163-12/+13
| | | | Reviewed-by: Trust Me
* Doc: Moving the Image Gestures example.David Boddie2009-10-167-1/+1
| | | | Reviewed-by: Trust Me
* Doc: Gesture API documentation review and improvements.David Boddie2009-10-165-37/+133
| | | | Reviewed-by: Trust Me
* Move audio and video examples into the common multimedia directory.Andrew den Exter2009-10-1631-28/+27
| | | | | | | | | Brings the video examples into multimedia directory, and removes the audio sub-directory so the directory structure is in line with the other example categories. Task-number: QT-667 Reviewed-by: Kurt Korbatits
* compile fix with namepaceshjk2009-10-153-0/+6
|
* customshader won't work on OpenGL/ES 1.1 so disable for those platformsRhys Weatherley2009-10-151-1/+5
| | | | Reviewed-by: trustme
* Mac: implement gestures conforming to the new APIRichard Moe Gustavsen2009-10-131-4/+4
|
* Remove the ahigl example screen driver.Rhys Weatherley2009-10-136-1608/+0
| | | | | | | | This example is very old, doesn't work, and confuses anyone who reads about it into thinking that OpenGL compositing is possible with Qt/Embedded, which is not accurate. Reviewed-by: trustme
* Doc: Added an example to the list of Graphics View examples to build.David Boddie2009-10-121-0/+1
| | | | Reviewed-by: Trust Me
* Doc: Gesture API documentation review.David Boddie2009-10-121-0/+2
| | | | Reviewed-by: Trust Me
* Enable mouse cursor in drilldown exampleShane Kearns2009-10-121-0/+3
| | | | | | | This example is unusable with keypad navigation, virtual cursor makes it possible to use without touch screen Reviewed-by: TrustMe
* A new implementation of the Gesture API.Denis Dzyubenko2009-10-095-273/+64
| | | | | | | Implemented gestures using gesture events and separate QGesture/QGestureRecognizer classes. Reviewed-by: trustme
* Fix build on Symbian: make sure sym_iap_util.h can be found.Frans Englich2009-10-093-3/+3
| | | | | | | | Amend commit faef2f5101287ad8ce94cf8e7a4d574a7d6267fd, with this build fix. Task-number: QTBUG-4743 Reviewed-by: Shane Kearns
* Symbian fix: rename examples ftp and musicplayer to start with q.Frans Englich2009-10-0915-8/+8
| | | | | | | | | | | | | | | | Symbian already has the executables musicplayer.exe, mediaplayer.exe and ftp.exe, with the result that we overwrite them with Qt. We solve this by renaming the examples, and do it not only on Symbian, such that Qt remains consistent across platforms. This was previously partly done for mediaplayer. The folder name needs to be consistent with the executable, for qtdemo to work. Done jointly with Alessandro. Task-number: QTBUG-4743 Reviewed-by: Alessandro Portale Reviewed-by: Frans Englich
* hellogl now runs on QT_OPENGL_ES_1 (ie N95).Sarah Smith2009-10-097-6/+38
| | | | | | | effort to have examples show portable GL code continues. One #ifdef in whole example and it now runs on N95 and desktop. Reviewed-by: Rhys Weatherley
* Fixing some GCC warningsJoão Abecasis2009-10-071-2/+2
| | | | Reviewed-by: Markus Goetz
* Integrate the GuiPlatformPlugin interfaceOlivier Goffart2009-10-071-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | This is an internal interface for plugins that can be provided by the platform to give platform-specific features by platforms built on top of Qt. We can easlily integrate Qt on Windows, Mac, Gnome, ... without any plugin because we can link to their respective library (dynamically if we don't want to depend on it). On Gnome, we can dynamically resolve Gtk+ symbols. This is however not possible for KDE or other platform built on top of Qt: we can't link against their library because they depend on us and we can't dynamically resolve the symbols because they are mangled (C++) So this plugin provides hooks inside Qt to be able to do things like native File or Color dialog, native icons, accurate reading of the config file, and so on. This is currently private API. Task-number: QT-406 Reviewed-by: Jens Bache-Wiig Reviewed-by: Oswald Buddenhagen
* Fix build error introduced in change ffeb6900.Jason McDonald2009-10-072-2/+2
| | | | | | Change ffeb6900 renamed a function but didn't rename all the calls. Reviewed-by: Trust Me