Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow QML types defined in both C++ and QML files to be in the same module. | Warwick Allison | 2010-01-08 | 9 | -31/+135 |
| | |||||
* | Load qmlmodules plugins. | Warwick Allison | 2010-01-07 | 4 | -0/+136 |
| | | | | | | This allows projects which use the declarative module to add QML types through C++ modules, such that qmlviewer (or any QML) can import those types. | ||||
* | Remove loader. Its functionality is now available in qmlviewer. | Martin Jones | 2009-12-22 | 12 | -1086/+0 |
| | |||||
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-17 | 9 | -76/+113 |
|\ | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro | ||||
| * | Merge remote branch 'staging/4.6' into 4.6 | Simon Hausmann | 2009-12-17 | 7 | -75/+90 |
| |\ | |||||
| | * | Doc: Modified the coding style of the Audio Devices example. | David Boddie | 2009-12-15 | 4 | -69/+84 |
| | | | | | | | | | | | | | | | | | | This commit will be a duplicate of the same change applied elsewhere. Reviewed-by: Kurt Korbatits | ||||
| | * | Change some examples of Webkit to create the mainwindow on the stack | Benjamin Poulain | 2009-12-14 | 3 | -6/+6 |
| | | | |||||
| * | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6 | Justin McPherson | 2009-12-14 | 2 | -1/+23 |
| |\ \ | | |/ | |/| | | | | | | | Conflicts: configure.exe | ||||
| | * | audioinput and audiooutput examples not using isFormatSupported | Kurt Korbatits | 2009-12-07 | 2 | -1/+23 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | function. The examples failed to easy, added check to test and get if required a format to use from the backend. Increases the chance of examples working on various platforms like n900. Reviewed-by:Justin McPherson | ||||
* | | | Allow a ListView.section.delegate to avoid creating sections in delegate. | Martin Jones | 2009-12-16 | 1 | -15/+10 |
| | | | |||||
* | | | Faster sections. | Martin Jones | 2009-12-16 | 1 | -1/+2 |
| | | | |||||
* | | | spring follows do not like to operate on "var" sources | mae | 2009-12-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui | Michael Brasser | 2009-12-10 | 1 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Merge oslo-staging-2/4.6 into upstream/4.6 | Olivier Goffart | 2009-12-09 | 1 | -2/+2 |
| |\ \ | |||||
| | * \ | Merge commit 'origin/4.6' into 4.6 | Olivier Goffart | 2009-12-04 | 7 | -22/+25 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'ooo-sequential' of ↵ | Jan-Arve Sæther | 2009-12-01 | 1 | -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 tests | Eduardo M. Fleury | 2009-11-27 | 1 | -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> | ||||
* | | | | | | 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 |