summaryrefslogtreecommitdiffstats
path: root/examples/animation/animation.pro
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'base/master' into refactorJørgen Lind2011-06-271-0/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: demos/demos.pro demos/embedded/digiflip/digiflip.pro examples/examples.pro examples/graphicsview/embeddeddialogs/embeddeddialogs.pro src/gui/kernel/qplatformglcontext_qpa.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_egl/qwaylandxcompositeeglcontext.cpp src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxcontext.cpp src/plugins/platforms/wayland/qwaylanddisplay.cpp src/plugins/platforms/wayland/qwaylandwindow.cpp Change-Id: I2a4ec9e2ca9c9aa9d57b55f98985e810b77bb745
| * Update sql and animation demos to be an example.Casper van Donderen2011-06-241-0/+1
| | | | | | | | | | | | | | Change-Id: I683383e2dab9428ea3fe4cfffba24bb7fefbc7c7 Reviewed-on: http://codereview.qt.nokia.com/618 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: David Boddie
* | fix pro filesLars Knoll2011-05-071-0/+1
|/ | | | all examples compile again
* Initial import from the monolithic Qt.Qt by Nokia2011-04-271-0/+15
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12