summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-051-1/+1
| |\
| | * syntax updateWarwick Allison2010-05-051-1/+1
| * | Move Qt.widgets import to be an unsupported exampleAlan Alpert2010-05-056-772/+1
| |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-302-1/+7
| |\
| | * Make QDeclarativeParserStatus method pure virtual to encourage right code.Warwick Allison2010-04-302-1/+7
* | | Removed mediaservices.Kurt Korbatits2010-05-1812-2990/+0
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-282-2/+33
|\ \ | |/ |/|
| * update multimedia qml element doc samplesKurt Korbatits2010-04-272-2/+33
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-242-3/+2
|\ \ | |/ |/|
| * no export in pluginWarwick Allison2010-04-231-1/+1
| * compileWarwick Allison2010-04-221-2/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-2310-163/+163
|\ \ | |/ |/|
| * Fixed Qt build with mediaservices disabled.Dmytro Poplavskiy2010-04-201-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-169-162/+162
| |\
| | * QtMediaservices -> QtMediaServices.Justin McPherson2010-04-168-161/+161
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-155-5/+9
| | |\
| | * | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-159-162/+162
* | | | Fix versioning of Qt Declarative's in-built typesAlan Alpert2010-04-211-3/+3
* | | | Fill out QGraphicsLayout bindingsAlan Alpert2010-04-212-3/+187
* | | | More QML doc consistency.Martin Jones2010-04-163-20/+20
* | | | Simplify QML import plugin deployment linesJoona Petrell2010-04-165-10/+5
|/ / /
* | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-151-2/+8
| |/ |/|
* | Rename remaining import Qt 4.6 lines to import Qt 4.7Joona Petrell2010-04-143-3/+3
* | Bring support of anchors in QML for QGraphicsWidget derived classes.Alexis Menard2010-04-141-2/+1
* | Make it clear that Qt.labs modules may not remain compatible.Martin Jones2010-04-142-0/+5
|/
* Some cleanup in widgets module. Deletion of GraphicsObjectContainer.Alexis Menard2010-04-095-179/+3
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-064-4/+4
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-065-0/+461
| |\
| * \ Merge remote branch 'origin/4.7' into HEADThiago Macieira2010-04-014-2/+12
| |\ \
| * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-314-4/+4
| |\ \ \
| | * | | Fix 'make sis' finding the dll on symbianThomas Zander2010-03-314-4/+4
* | | | | Fix anchors, etc.Warwick Allison2010-04-062-2/+1
| |_|_|/ |/| | |
* | | | Labs (experimental) Gesture support.Warwick Allison2010-04-065-0/+461
| |_|/ |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-011-1/+1
|\ \ \
| * | | typoWarwick Allison2010-04-011-1/+1
| |/ /
* | | Add media elements to the QML Elements docs.Martin Jones2010-04-013-1/+11
|/ /
* | docWarwick Allison2010-03-311-0/+8
|/
* Fix installation of qmldir filesAlan Alpert2010-03-304-4/+4
* docWarwick Allison2010-03-291-0/+4
* Add Symbian deploy section for qml import pluginsJoona Petrell2010-03-264-0/+44
* Document Particles module import.Martin Jones2010-03-261-0/+5
* Merge remote branch 'main/4.7' into 4.7Morten Johan Sørvig2010-03-254-93/+1
|\
| * Remove support for QML-in-HTML-in-WebViewWarwick Allison2010-03-242-88/+0
| * Remove dead performance measurement code from QMLAaron Kennedy2010-03-221-4/+0
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-191-1/+1
| |\
| | * Initialize variable.Martin Jones2010-03-191-1/+1
* | | doc: Fixed all the remaining qdoc errors. For now.Martin Smith2010-03-242-2/+2
* | | Rename m_volume to m_volThiago Macieira2010-03-202-6/+6
|/ /
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-196-115/+267
|\ \ | |/ |/|
| * Add autoLoad property to multimedia declarative elements.Justin McPherson2010-03-196-8/+62