summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-257-26/+33
|\
| * Namespace build fails for webkit exampleRichard Moe Gustavsen2009-11-241-0/+2
| * A few tweaks to the frozen column examplePierre Rossi2009-11-233-2/+11
| * Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 int...Simon Hausmann2009-11-233-24/+20
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-202-7/+1
| | |\
| | * | Fixing the frame hierarchy traversing in framecapture WebKit example.Andre Pedralho2009-11-192-21/+18
| | * | Updated the 'framecapture' WebKit example according to WebKit API changes.Andre Pedralho2009-11-192-4/+3
* | | | StandardDialogs example: Fix warning about QKeySequence::mnemonic.Friedemann Kleint2009-11-251-1/+1
|/ / /
* | | Merge commit 'd9fa92' into origin-4.6Olivier Goffart2009-11-201-0/+2
|\ \ \ | |_|/ |/| |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-201-0/+2
| |\ \
| | * | Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-191-1/+1
| | * | Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-191-0/+2
| * | | Merge upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-195-27/+27
| |\ \ \ | | |/ / | |/| |
| * | | Fixed effects.pro after customshader demo removalGabriel de Dietrich2009-11-191-6/+0
* | | | Use a lowercase name for the binary of the Form Extractor exampleBenjamin Poulain2009-11-191-1/+1
* | | | Fix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012Jason McDonald2009-11-191-6/+0
| |_|/ |/| |
* | | Merge branch '4.6' of oslo-staging-1 into 4.6Simon Hausmann2009-11-193-5/+8
|\ \ \ | |_|/ |/| |
| * | Fix compilation with Sun CC: no semi-colon after Q_PROPERTYThiago Macieira2009-11-181-1/+1
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-185-27/+27
| |\ \
| * | | fancybrowser example: make sure that images are rotated for loaded pagesJocelyn Turcotte2009-11-182-4/+7
* | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-1978-807/+231
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Remove examples/effects/customshader which uses private APITom Cooksey2009-11-1919-572/+0
| * | Ran the script utils/normalizeOlivier Goffart2009-11-1858-217/+217
| * | Make the layout not grow in filndfiles example whne one clicks findThierry Bastian2009-11-181-1/+1
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-st...axis2009-11-182-17/+13
| |\ \ | | |/ | |/|
| | * Fix DrillDown for moblie devices.Alessandro Portale2009-11-171-15/+11
| | * showMaximized() lets us see SoftKeysAlessandro Portale2009-11-171-2/+2
* | | Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-1711-30/+51
|\ \ \ | |/ /
| * | Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-11-177-6/+27
| |\ \ | | |/ | |/|
| | * Prospective Symbian/abld build fixSimon Hausmann2009-11-161-1/+1
| | * Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-136-69/+84
| | |\
| | * \ Merge commit 'coreteam/4.6' into oslo1-4.6Marius Storm-Olsen2009-11-134-4/+25
| | |\ \
| | | * \ Merge branch '4.6' into core-4.6Thiago Macieira2009-11-0938-125/+452
| | | |\ \
| | | * | | network examples: unify the fortune server/client examplesPeter Hartmann2009-11-094-4/+25
| | * | | | Compile securesocketclient example also with openssl-linkedMarkus Goetz2009-11-131-0/+1
| | * | | | Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-132-3/+10
| | |\ \ \ \
| | * \ \ \ \ Merge commit 'upstream/4.6' into 4.6Bradley T. Hughes2009-11-1211-2/+599
| | |\ \ \ \ \
| | * | | | | | xmlpatterns filetree example: make app a bundle on MacPeter Hartmann2009-11-121-1/+0
| * | | | | | | Make pbuffers example compile under OpenGL/ES 1.1Rhys Weatherley2009-11-151-0/+8
| * | | | | | | Make it clear that the two semi-floating widget should overflow.Jan-Arve Sæther2009-11-131-2/+2
| * | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Gunnar Sletta2009-11-137-90/+97
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge commit upstream/4.6 into oslo-staging-2/4.6Olivier Goffart2009-11-1313-5/+609
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | * | | | | | | Clean up example (remove unused ifdef).Jan-Arve Sæther2009-11-131-14/+6
| | * | | | | | | Compile fix Solaris: "sun" is defined to 1 on Solaris :)Jan-Arve Sæther2009-11-131-9/+9
| * | | | | | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6Gunnar Sletta2009-11-1347-79/+1045
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| * | | | | | | | Use a non-cosmetic 1-width pen in example to match graphicsview specsGunnar Sletta2009-11-101-1/+1
* | | | | | | | | Fix some spelling errors and a broken namespace.kh12009-11-165-27/+27
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-136-69/+84
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | |
| * | | | | | Merge commit 'widget/4.6' into oslo-staging-2/4.6Olivier Goffart2009-11-116-69/+84
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Make the new examples for effects use the Qt Animation FrameworkThierry Bastian2009-11-106-69/+84