Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bearer Management Integration 4. | Aaron McCarthy | 2010-01-29 | 3 | -211/+219 |
| | |||||
* | Bearer Management Integration 2. | Aaron McCarthy | 2010-01-04 | 5 | -28/+26 |
| | |||||
* | Bearer Management Integration 1. | Aaron McCarthy | 2009-12-22 | 19 | -0/+3027 |
| | |||||
* | Merge commit oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-27 | 4 | -13/+17 |
|\ | |||||
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | axis | 2009-11-26 | 3 | -11/+14 |
| |\ | | | | | | | | | | 4.6-staging2 | ||||
| | * | Made layout of the Softkeys example more compact | Miikka Heikkinen | 2009-11-26 | 2 | -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 Anttila | 2009-11-25 | 1 | -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 Ivanov | 2009-11-26 | 1 | -2/+3 |
| | | | | | | | | | | | | | | | | | | | | | every MotionNotify event. Merge-request: 2210 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | ||||
* | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6 | David Boddie | 2009-11-25 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Merge remote branch 'mainline/4.6' into 4.6 | Oswald Buddenhagen | 2009-11-25 | 7 | -26/+33 |
| |\ \ | |||||
| * | | | StandardDialogs example: Fix warning about QKeySequence::mnemonic. | Friedemann Kleint | 2009-11-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | ... with several '&'. Task-number: QTBUG-5667 Reviewed-by: Gabriel | ||||
* | | | | Fix Broadcast receiver example. | Jedrzej Nowacki | 2009-11-25 | 1 | -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 example | Richard Moe Gustavsen | 2009-11-24 | 1 | -0/+2 |
| |/ |/| | | | | | | | | | | | Forward declarations outside namespace scope will fail in this case. Reviewed-by: brad | ||||
* | | A few tweaks to the frozen column example | Pierre Rossi | 2009-11-23 | 3 | -2/+11 |
| | | | | | | | | Reviewed-By: Thierry | ||||
* | | Merge commit '01fec63b7b8f8cae94f92fca1d806fe8c6156299' of oslo-staging-1 ↵ | Simon Hausmann | 2009-11-23 | 3 | -24/+20 |
|\ \ | |/ |/| | | | into 4.6 | ||||
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-20 | 2 | -7/+1 |
| |\ | |||||
| * | | Fixing the frame hierarchy traversing in framecapture WebKit example. | Andre Pedralho | 2009-11-19 | 2 | -21/+18 |
| | | | | | | | | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> | ||||
| * | | Updated the 'framecapture' WebKit example according to WebKit API changes. | Andre Pedralho | 2009-11-19 | 2 | -4/+3 |
| | | | | | | | | | | | | | | | Merge-request: 2142 Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com> | ||||
* | | | Merge commit 'd9fa92' into origin-4.6 | Olivier Goffart | 2009-11-20 | 1 | -0/+2 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into ↵ | axis | 2009-11-20 | 1 | -0/+2 |
| |\ \ | | | | | | | | | | | | | 4.6-staging2 | ||||
| | * | | Enabled Qt icon in Symbian also for demos/examples without UID3. | Janne Anttila | 2009-11-19 | 1 | -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 Anttila | 2009-11-19 | 1 | -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.6 | Olivier Goffart | 2009-11-19 | 5 | -27/+27 |
| |\ \ \ | | |/ / | |/| | | |||||
| * | | | Fixed effects.pro after customshader demo removal | Gabriel de Dietrich | 2009-11-19 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes commit 9a0f7a1ef Reviewed-by: Olivier | ||||
* | | | | Use a lowercase name for the binary of the Form Extractor example | Benjamin Poulain | 2009-11-19 | 1 | -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 1b14c3d33dea0fe4814f2749c49cf916ca13e012 | Jason McDonald | 2009-11-19 | 1 | -6/+0 |
| |_|/ |/| | | | | | | | | Reviewed-by: Bradley T. Hughes | ||||
* | | | Merge branch '4.6' of oslo-staging-1 into 4.6 | Simon Hausmann | 2009-11-19 | 3 | -5/+8 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fix compilation with Sun CC: no semi-colon after Q_PROPERTY | Thiago Macieira | 2009-11-18 | 1 | -1/+1 |
| | | | | | | | | | | | | Reviewed-By: Peter Hartmann | ||||
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-18 | 5 | -27/+27 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: configure.exe | ||||
| * | | | fancybrowser example: make sure that images are rotated for loaded pages | Jocelyn Turcotte | 2009-11-18 | 2 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | See QTBUG-5532. Reviewed-by: Jedrzej Nowacki | ||||
* | | | | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-11-19 | 78 | -807/+231 |
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/| | |||||
| * | | Remove examples/effects/customshader which uses private API | Tom Cooksey | 2009-11-19 | 19 | -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/normalize | Olivier Goffart | 2009-11-18 | 58 | -217/+217 |
| | | | | | | | | | | | | Over src/ tools/ examples/ and demos/ | ||||
| * | | Make the layout not grow in filndfiles example whne one clicks find | Thierry Bastian | 2009-11-18 | 1 | -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 ↵ | axis | 2009-11-18 | 2 | -17/+13 |
| |\ \ | | |/ | |/| | | | | 4.6-staging2 | ||||
| | * | Fix DrillDown for moblie devices. | Alessandro Portale | 2009-11-17 | 1 | -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 SoftKeys | Alessandro Portale | 2009-11-17 | 1 | -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.6 | Oswald Buddenhagen | 2009-11-17 | 11 | -30/+51 |
|\ \ \ | |/ / | |||||
| * | | Merge remote branch 'staging/4.6' into 4.6 | Simon Hausmann | 2009-11-17 | 7 | -6/+27 |
| |\ \ | | |/ | |/| | |||||
| | * | Prospective Symbian/abld build fix | Simon Hausmann | 2009-11-16 | 1 | -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.6 | Bradley T. Hughes | 2009-11-13 | 6 | -69/+84 |
| | |\ | |||||
| | * \ | Merge commit 'coreteam/4.6' into oslo1-4.6 | Marius Storm-Olsen | 2009-11-13 | 4 | -4/+25 |
| | |\ \ | |||||
| | | * \ | Merge branch '4.6' into core-4.6 | Thiago Macieira | 2009-11-09 | 38 | -125/+452 |
| | | |\ \ | |||||
| | | * | | | network examples: unify the fortune server/client examples | Peter Hartmann | 2009-11-09 | 4 | -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-linked | Markus Goetz | 2009-11-13 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-5742 Reviewed-by: andreas | ||||
| | * | | | | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-11-13 | 2 | -3/+10 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge commit 'upstream/4.6' into 4.6 | Bradley T. Hughes | 2009-11-12 | 11 | -2/+599 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | xmlpatterns filetree example: make app a bundle on Mac | Peter Hartmann | 2009-11-12 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... like all the other examples. Reviewed-by: Gabriel Task-number: QTBUG-5533 | ||||
| * | | | | | | | Make pbuffers example compile under OpenGL/ES 1.1 | Rhys Weatherley | 2009-11-15 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Sarah Smith | ||||
| * | | | | | | | Make it clear that the two semi-floating widget should overflow. | Jan-Arve Sæther | 2009-11-13 | 1 | -2/+2 |
| | | | | | | | |