Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update FlowPositioner to the new BasePositioner implementation | Alan Alpert | 2009-12-09 | 1 | -5/+0 |
| | |||||
* | Merge branch 'kinetic-declarativeui' of ↵ | Alan Alpert | 2009-12-09 | 1 | -9/+53 |
|\ | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui | ||||
| * | Add a Flow positioner. | Martin Jones | 2009-12-08 | 1 | -9/+53 |
| | | |||||
* | | Update positioners example | Alan Alpert | 2009-12-09 | 1 | -18/+2 |
|/ | |||||
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 1 | -1/+1 |
|\ | |||||
| * | Stylesheets example: Fix warning about multiple &-mnemonics. | Friedemann Kleint | 2009-12-04 | 1 | -1/+1 |
| | | | | | | | | Reviewed-by: Olivier Goffart <ogoffart@trolltech.com> | ||||
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-07 | 7 | -22/+25 |
|\ \ | |/ | | | | | | | Conflicts: src/tools/moc/generator.cpp | ||||
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-29 | 4 | -13/+17 |
| |\ | |||||
| * \ | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6 | Simon Hausmann | 2009-11-27 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | create application object in qsdbg example | Kent Hansen | 2009-11-26 | 1 | -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 .js | Kent Hansen | 2009-11-26 | 5 | -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 example | Benjamin Poulain | 2009-11-25 | 2 | -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 | ||||
* | | | | 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> |