summaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Allow QML types defined in both C++ and QML files to be in the same module.Warwick Allison2010-01-089-31/+135
|
* Load qmlmodules plugins.Warwick Allison2010-01-074-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 Jones2009-12-2212-1086/+0
|
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-179-76/+113
|\ | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro
| * Merge remote branch 'staging/4.6' into 4.6Simon Hausmann2009-12-177-75/+90
| |\
| | * Doc: Modified the coding style of the Audio Devices example.David Boddie2009-12-154-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 stackBenjamin Poulain2009-12-143-6/+6
| | |
| * | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6Justin McPherson2009-12-142-1/+23
| |\ \ | | |/ | |/| | | | | | | Conflicts: configure.exe
| | * audioinput and audiooutput examples not using isFormatSupportedKurt Korbatits2009-12-072-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 Jones2009-12-161-15/+10
| | |
* | | Faster sections.Martin Jones2009-12-161-1/+2
| | |
* | | spring follows do not like to operate on "var" sourcesmae2009-12-141-1/+1
| | |
* | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-101-2/+2
|\ \ \ | |/ /
| * | 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>
* | | | | | Update FlowPositioner to the new BasePositioner implementationAlan Alpert2009-12-091-5/+0
| | | | | |
* | | | | | Merge branch 'kinetic-declarativeui' of ↵Alan Alpert2009-12-091-9/+53
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
| * | | | | | Add a Flow positioner.Martin Jones2009-12-081-9/+53
| | | | | | |
* | | | | | | Update positioners exampleAlan Alpert2009-12-091-18/+2
|/ / / / / /
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-071-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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 kinetic-declarativeuiMichael Brasser2009-12-077-22/+25
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: src/tools/moc/generator.cpp
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-294-13/+17
| |\ \ \ \ | | |/ / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6Simon Hausmann2009-11-271-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | 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
* | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-023-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 Jones2009-12-022-3/+19
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| * | | | | | Remove qlistmodelinterface.h duplicateMartin Jones2009-12-023-87/+2
| | | | | | |
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-12-022-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 Kennedy2009-12-011-60/+0
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | into kinetic-declarativeui
| * | | | | | Merge branch 'kinetic-declarativeui' of /Users/akennedy/Qt/kinetic2 into ↵Aaron Kennedy2009-11-304-13/+17
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
| | * \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiAaron Kennedy2009-11-304-13/+17
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/animation/qabstractanimation.cpp
| * | | | | | | Two way WorkerScript communicationsAaron Kennedy2009-11-302-3/+19
| |/ / / / / /
* | | | | | | When loading QML, reset the Browser view.Martin Jones2009-12-021-4/+17
| |_|/ / / / |/| | | | |
* | | | | | Remove accidentally added file.Michael Brasser2009-12-011-60/+0
| | | | | |
* | | | | | Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2009-11-304-13/+17
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp
| * | | | 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 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵Aaron Kennedy2009-11-301-7/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | into kinetic-declarativeui
| * \ \ \ \ \ Merge branch 'kinetic-declarativeui' of ↵Martin Jones2009-11-303-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 Jones2009-11-301-7/+1
| | | | | | | |
* | | | | | | | Basic WorkerScript functionalityAaron Kennedy2009-11-302-0/+46
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2009-11-293-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui