summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Change some examples of Webkit to create the mainwindow on the stackBenjamin Poulain2009-12-143-6/+6
|
* Merge oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-12-091-2/+2
|\
| * Merge commit 'origin/4.6' into 4.6Olivier Goffart2009-12-047-22/+25
| |\
| * \ Merge branch 'ooo-sequential' of ↵Jan-Arve Sæther2009-12-011-2/+2
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | git://gitorious.org/~fleury/qt/fleury-openbossa-clone into fleury-ooo-sequential Conflicts: tests/auto/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
| | * | QGAL (Test): Fix memory leaks in example and testsEduardo M. Fleury2009-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some tests and the example were leaking memory what made it harder to investigate leaks on the layout itself. Those were simple errors like not deleting the layout at the end of the test and were corrected. Signed-off-by: Eduardo M. Fleury <eduardo.fleury@openbossa.org> Reviewed-by: Artur Duque de Souza <artur.souza@openbossa.org>
* | | | Stylesheets example: Fix warning about multiple &-mnemonics.Friedemann Kleint2009-12-041-1/+1
| |_|/ |/| | | | | | | | Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-294-13/+17
|\ \ \ | |/ /
| * | Merge commit oslo-staging-2/4.6 into upstream/4.6Olivier Goffart2009-11-274-13/+17
| |\ \ | | |/ | |/|
| | * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2009-11-263-11/+14
| | |\ | | | | | | | | | | | | 4.6-staging2
| | | * Made layout of the Softkeys example more compactMiikka Heikkinen2009-11-262-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Softkeys example didn't fit on the screen in landscape mode due to the widget minimum size enforcement done by Qt. Changed the layout of the example from QVBoxLayout to QGridlayout to make better use of the available space. Also shortened button texts. Task-number: QTBUG-6126 Reviewed-by: Janne Anttila
| | | * Fix for "saxbookmarks - file dialog starts in wrong directory (winscw)"Janne Anttila2009-11-251-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCoreApplication::applicationFilePath() in emulator returns path to Z drive. Use QDesktopServices instead which always returns the writable drive. Task-number: QTBUG-6117 Reviewed-by: Miikka Heikkinen
| | * | Fixes performance problem with scribble avoiding to redraw whole screen on ↵Daniil Ivanov2009-11-261-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | every MotionNotify event. Merge-request: 2210 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-271-1/+1
|\ \ \ \ | |/ / /
| * | | 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
* | | | | create application object in qsdbg exampleKent Hansen2009-11-261-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 4.6, it's required that the Q(Core)Application object is constructed before QScriptEngine objects. Reviewed-by: TrustMe
* | | | | rename .qs files to .jsKent Hansen2009-11-265-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QtScript _is_ JavaScript, there's no need to use a custom extension. Most of the other examples were already using .js, but there were two files that still had the .qs extension. Agreed with Simon. Reviewed-by: TrustMe
* | | | | Use a pixmap instead of an image in the tablet exampleBenjamin Poulain2009-11-252-19/+19
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The transformations QImage->QPixmap are killing the performance of the tablet example. This is noticeable because of the number of events sent by the tablet (painting MUST be fast in tabletEvent()). Reviewed-by: David Boddie
* | | | 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
| | |\ \