Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-02 | 3 | -87/+2 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-12-02 | 2 | -3/+19 |
| |\ | | | | | | | | | | into kinetic-declarativeui | ||||
| * | | Remove qlistmodelinterface.h duplicate | Martin Jones | 2009-12-02 | 3 | -87/+2 |
| | | | |||||
* | | | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-12-02 | 2 | -3/+19 |
|\ \ \ | | |/ | |/| | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-12-01 | 1 | -60/+0 |
| |\ \ | | |/ | | | | | | | into kinetic-declarativeui | ||||
| * | | Merge branch 'kinetic-declarativeui' of /Users/akennedy/Qt/kinetic2 into ↵ | Aaron Kennedy | 2009-11-30 | 4 | -13/+17 |
| |\ \ | | | | | | | | | | | | | kinetic-declarativeui | ||||
| | * \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Aaron Kennedy | 2009-11-30 | 4 | -13/+17 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/animation/qabstractanimation.cpp | ||||
| * | | | | Two way WorkerScript communications | Aaron Kennedy | 2009-11-30 | 2 | -3/+19 |
| |/ / / | |||||
* | | | | When loading QML, reset the Browser view. | Martin Jones | 2009-12-02 | 1 | -4/+17 |
| |_|/ |/| | | |||||
* | | | Remove accidentally added file. | Michael Brasser | 2009-12-01 | 1 | -60/+0 |
| | | | |||||
* | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-30 | 4 | -13/+17 |
|\ \ \ | |/ / |/| / | |/ | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp | ||||
| * | 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 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Aaron Kennedy | 2009-11-30 | 1 | -7/+1 |
|\ \ \ \ | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * \ \ \ | Merge branch 'kinetic-declarativeui' of ↵ | Martin Jones | 2009-11-30 | 3 | -2/+3 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | Add ListView snapMode to ensure flicking settles on an item boundary. | Martin Jones | 2009-11-30 | 1 | -7/+1 |
| | | | | | | |||||
* | | | | | | Basic WorkerScript functionality | Aaron Kennedy | 2009-11-30 | 2 | -0/+46 |
| |/ / / / |/| | | | | |||||
* | | | | | Merge branch 'kinetic-declarativeui' of ↵ | Warwick Allison | 2009-11-29 | 3 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | | | | | Fix tutorial3. | Michael Brasser | 2009-11-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-6306 | ||||
| * | | | | | Fix use of XmlHttpRequest in examples | Alan Alpert | 2009-11-27 | 1 | -0/+1 |
| |/ / / / | |||||
| * | | | | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-11-27 | 91 | -847/+277 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui | ||||
| * \ \ \ \ | Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵ | Martin Jones | 2009-11-27 | 3 | -3/+88 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui Conflicts: examples/declarative/loader/qmlfolderlistmodel.h | ||||
| * | | | | | | Symbian fixes. | Martin Jones | 2009-11-27 | 2 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Some UTF8 | Warwick Allison | 2009-11-29 | 1 | -1/+1 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵ | Warwick Allison | 2009-11-27 | 91 | -847/+277 |
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | | kinetic-declarativeui | ||||
| * | | | | 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 |