summaryrefslogtreecommitdiffstats
path: root/examples/examples.pro
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-10-191-2/+1
|\
| * Move audio and video examples into the common multimedia directory.Andrew den Exter2009-10-161-2/+1
* | Remove redundant QFxItem::activeFocusChanged(); is not used anywhere,Bea Lam2009-10-071-1/+0
* | Compile!Andreas Aardal Hanssen2009-09-031-1/+0
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarati...Michael Brasser2009-08-251-3/+23
|\ \ | |/
| * Remove the 'script' sub-directory from the symbian scope.Jason Barron2009-08-251-1/+0
| * Integrate QAbstractVideoSurface API.Andrew den Exter2009-08-241-1/+6
| * renamed examplebase.pri to symbianpkgrules.priEspen Riskedal2009-08-211-1/+1
| * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60axis2009-08-211-0/+1
| |\
| | * Merge commit 'qt/master' into kinetic-graphicseffectBjørn Erik Nilsen2009-08-211-1/+1
| | |\
| | * | Move examples/graphicsview/blurpicker|lighting to examples/effects.Bjørn Erik Nilsen2009-08-191-0/+1
| * | | Merge commit 'qt/master'Jason Barron2009-08-211-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | add configure options for (not) building the QtScript moduleKent Hansen2009-08-071-1/+1
| | |/
| * | Merge commit 'qt/master-stable'Jason Barron2009-08-061-0/+1
| |\ \ | | |/
| * | Merge commit 'origin/master'Jason Barron2009-08-041-0/+1
| |\ \
| | * | Enabled QtUiTools and related example building for Symbian OS.Janne Anttila2009-07-271-0/+1
| * | | Merge commit 'qt/master-stable'Jason Barron2009-07-271-0/+1
| |\ \ \ | | |/ / | |/| |
| * | | Merge commit 'qt/master-stable' into 4.6-mergedJason Barron2009-06-301-1/+3
| |\ \ \
| * \ \ \ Merge commit 'qt/master-stable' into 4.6-stableJason Barron2009-06-251-0/+2
| |\ \ \ \
| * \ \ \ \ Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qtaxis2009-04-271-1/+1
| |\ \ \ \ \
| * | | | | | Long live Qt for S60!axis2009-04-241-0/+57
| / / / / /
* | | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-08-131-0/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge AudioServices into mainline.Justin McPherson2009-08-051-0/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Aaron Kennedy2009-07-231-0/+1
|\ \ \ \ \ | |/ / / /
| * | | | Add the "star" example, which demonstrates how to mix OpenVG and QPainterRhys Weatherley2009-07-201-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-07-021-1/+3
|\ \ \ \ | |/ / /
| * | | add gesture examples to the examples.pro SUBDIRSBradley T. Hughes2009-06-101-1/+2
| * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qtBradley T. Hughes2009-05-261-0/+2
| |\ \ \ | | | |/ | | |/|
| * | | build the multitouch examples from the top-level buildBradley T. Hughes2009-05-081-1/+2
| | |/ | |/|
* | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declar...Michael Brasser2009-05-271-1/+1
|\ \ \ | | |/ | |/|
| * | fix two .pro file bugsKent Hansen2009-05-201-1/+1
| * | Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-statemachineAlexis Menard2009-05-121-1/+1
| |\ \ | | |/
| * | Initial import of statemachine branch from the old kinetic repositoryAlexis Menard2009-04-171-0/+45
| /
* | Merge branch 'master' of ../../qt/qt into kinetic-declarativeuiMichael Brasser2009-04-221-1/+1
|\ \ | |/
| * Unable to build ActiveQt with Opensource edition.Prasanth Ullattil2009-04-201-1/+1
| * Long live Qt 4.5!Lars Knoll2009-03-231-0/+43
* Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-0/+3
* Long live Qt!Lars Knoll2009-03-231-0/+43