summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6'Thiago Macieira2009-11-25104-902/+351
|\ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: doc/src/modules.qdoc examples/assistant/simpletextviewer/findfiledialog.cpp examples/webkit/fancybrowser/mainwindow.cpp src/gui/widgets/qtabbar.cpp src/gui/widgets/qtabbar_p.h tests/auto/qpixmap/tst_qpixmap.cpp tools/assistant/compat/helpdialog.cpp tools/assistant/compat/tabbedbrowser.cpp translations/translations.pri
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6David Boddie2009-11-251-1/+1
| |\
| | * Merge remote branch 'mainline/4.6' into 4.6Oswald Buddenhagen2009-11-257-26/+33
| | |\
| | * | StandardDialogs example: Fix warning about QKeySequence::mnemonic.Friedemann Kleint2009-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ... with several '&'. Task-number: QTBUG-5667 Reviewed-by: Gabriel
| * | | Fix Broadcast receiver example.Jedrzej Nowacki2009-11-251-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The broadcast receiver should share the port number. In most cases users won't run the example on a network, but only on one machine. In the case it simply should work too. According to our documentation the fix is platform specific, it will work only on Linux. Reviewed-by: Peter Hartmann
| * | Namespace build fails for webkit exampleRichard Moe Gustavsen2009-11-241-0/+2
| | | | | | | | | | | | | | | | | | | | | Forward declarations outside namespace scope will fail in this case. Reviewed-by: brad
| * | A few tweaks to the frozen column examplePierre Rossi2009-11-233-2/+11
| | | | | | | | | | | | Reviewed-By: Thierry
| * | Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 ↵Simon Hausmann2009-11-233-24/+20
| |\ \ | | |/ | |/| | | | into 4.6
| | * 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
| | | | | | | | | | | | | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| | * | Updated the 'framecapture' WebKit example according to WebKit API changes.Andre Pedralho2009-11-192-4/+3
| | | | | | | | | | | | | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
| * | | 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 ↵axis2009-11-201-0/+2
| | |\ \ | | | | | | | | | | | | | | | 4.6-staging2
| | | * | Enabled Qt icon in Symbian also for demos/examples without UID3.Janne Anttila2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICON keyword can be used without UID, since .mif filename is generated based on target instead of UID3 nowadays Task-number: QTBUG-4677 Reviewed-by: Miikka Heikkinen
| | | * | Added default Qt icon back for Qt demos/examples in Symbian.Janne Anttila2009-11-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit basically reverts fa35247d31bd35d72c307f4a6a231400aade0c0. It can be reverted now since mifconv invoking is changed to use relative paths instead of absolute one. Task-number: QTBUG-4745 Reviewed-by: TrustMe
| | * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes commit 9a0f7a1ef Reviewed-by: Olivier
| * | | | Use a lowercase name for the binary of the Form Extractor exampleBenjamin Poulain2009-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The name of the other examples are lowercase. The XML file of Qt Demo reference a lowercase name. Reviewed-by: Olivier Goffart
| * | | | Fix build breakage in 1b14c3d33dea0fe4814f2749c49cf916ca13e012Jason McDonald2009-11-191-6/+0
| | |_|/ | |/| | | | | | | | | | Reviewed-by: Bradley T. Hughes
| * | | 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
| | | | | | | | | | | | | | | | Reviewed-By: Peter Hartmann
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-185-27/+27
| | |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe
| | * | | fancybrowser example: make sure that images are rotated for loaded pagesJocelyn Turcotte2009-11-182-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See QTBUG-5532. Reviewed-by: Jedrzej Nowacki
| * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3f109fd85cbdc49dc3ef1c14066073079f4e34bf made QGraphicsShaderEffect private API, however the example showing how to use it was kept. This patch just removes that example. Reviewed-by: Samuel
| | * | Ran the script utils/normalizeOlivier Goffart2009-11-1858-217/+217
| | | | | | | | | | | | | | | | Over src/ tools/ examples/ and demos/
| | * | Make the layout not grow in filndfiles example whne one clicks findThierry Bastian2009-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5528 Reviewed-by: Gabriel
| | * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-182-17/+13
| | |\ \ | | | |/ | | |/| | | | | 4.6-staging2
| | | * Fix DrillDown for moblie devices.Alessandro Portale2009-11-171-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1) Use QFormLayout instead of QGridLayout 2) Remove Symbian specific size hack 3) Give button box a parent, so that it's buttons get properly added as the dialog's softkeys. 4) Add submitButton with a positive button role Task-number: QTBUG-5685 Reviewed-by: Jason Barron
| | | * showMaximized() lets us see SoftKeysAlessandro Portale2009-11-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation would not show Softkeys as long as we show a widget via showFullScreen. Therefore, on Symbian we will for now use showMaximized Reviewed-By: Jason Barron
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Include QtNetwork as module to work around abld issue of local includes not working. Reviewed-by: axis
| | | * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always use the first non-localhost IP address to listen/connect to, if there is one. Reviewed-by: Markus Goetz
| | | * | | | Compile securesocketclient example also with openssl-linkedMarkus Goetz2009-11-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5742 Reviewed-by: andreas
| | | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... like all the other examples. Reviewed-by: Gabriel Task-number: QTBUG-5533
| | * | | | | | | Make pbuffers example compile under OpenGL/ES 1.1Rhys Weatherley2009-11-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith
| | * | | | | | | 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
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: dist/changes-4.6.0
| | * | | | | | | | Use a non-cosmetic 1-width pen in example to match graphicsview specsGunnar Sletta2009-11-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | | | | | | | Fix some spelling errors and a broken namespace.kh12009-11-165-27/+27
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: Part of QTBUG-2455 Reviewed-by: ck