summaryrefslogtreecommitdiffstats
path: root/src/imports
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-08-264-44/+116
|\
| * Fix for qml1shaderplugin GPU resource handling on SymbianMarko Niemelä2011-08-244-44/+116
| * Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-07-0113-225/+225
* | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-2713-225/+225
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-06-243-124/+8
|\ \ | |/
| * Qmlshadersplugin API documentation enhancements.Marko Niemelä2011-06-133-124/+8
* | Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7Toby Tomkins2011-06-081-10/+10
|\ \ | |/
| * Fixed qmlshadersplugin on windows VC2008 toolchain.Marko Niemelä2011-06-081-10/+10
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Olivier Goffart2011-05-3116-0/+2855
|\ \ | |/
| * Fixed more CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-261-1/+1
| * Fixed CI-errors caused by qmlshadersplugin addition.Marko Niemelä2011-05-264-9/+9
| * Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1Marko Niemelä2011-05-2516-0/+2855
| * Update licenseheader text in source filesJyri Tahtela2011-05-138-136/+136
* | Update licenseheader text in source files for qt4.8Jyri Tahtela2011-05-138-136/+136
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-311-1/+1
|\ \ | |/
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-03-092-1/+5
| |\
| * \ Merge branch 'mimir' into 4.7David Boddie2011-02-231-1/+1
| |\ \
* | \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-031-0/+4
|\ \ \ \ | | |_|/ | |/| |
| * | | Doc: remove experimental GestureArea from contents and add PinchAreaMartin Jones2011-03-021-0/+4
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-011-1/+1
|\ \ \ \ | |/ / /
| * | | FolderListModel emitted incorrect rowsRemoved range causing crash.Martin Jones2011-02-281-1/+1
| |/ /
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-02-101-9/+9
|\ \ \ | |/ /
| * | Doc: Fixed invalid/incomplete QML code snippets.David Boddie2011-01-171-9/+9
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-01-178-8/+8
|\ \ \ | |/ /
| * | Update copyright year to 2011.Jason McDonald2011-01-108-8/+8
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-12-231-0/+33
|\ \ \ | |/ /
| * | More docs for FolderListModelMartin Jones2010-12-231-0/+33
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-12-061-1/+1
|\ \ | |/
| * Fix Browser.qml warningsJoona Petrell2010-11-301-1/+1
* | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-303-3/+0
|\ \ | |/
| * Remove unnecessary QML import project dependency to Symbian deployment pri fi...Joona Petrell2010-10-293-3/+0
* | Align .pro with qmake: s/\.sources/.files/.Miikka Heikkinen2010-10-083-6/+6
|/
* Replace all occurances of "Qt 4.7" with "QtQuick 1.0"Aaron Kennedy2010-09-291-1/+1
* Do not set DESTDIR to the current directoryDenis Dzyubenko2010-09-243-7/+7
* Doc fix.Michael Brasser2010-09-231-1/+1
* Fix slot naming clashMartin Jones2010-09-122-3/+3
* Doc: Worked on two more elements, replacing an image.David Boddie2010-09-061-24/+72
* Remove pointless \internal docs (that contain no information)Aaron Kennedy2010-08-271-33/+0
* qdoc: Reorganized the QML elements table to be a dictionary...Martin Smith2010-08-163-0/+7
* Fixed the scope when evaluating GestureArea javascript expressionsDenis Dzyubenko2010-07-231-1/+1
* Report errors when evaluating JavaScript expressions from the GestureArea QML...Denis Dzyubenko2010-07-231-1/+4
* Register a few gesture-related types in the meta-type system.Denis Dzyubenko2010-07-231-0/+7
* Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-07-221-3/+16
|\
| * Clean up particle motion documentationAlan Alpert2010-07-141-3/+16
* | qdoc: Fixed reporting of read-only status for QML properties.Martin Smith2010-07-222-5/+5
|/
* Private variable cleanup.Michael Brasser2010-07-131-1/+1
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-07-054-4/+7
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-07-031-1/+1
| |\
| | * fix doc linksBea Lam2010-07-021-1/+1
| * | Fixed deployment locations for various profiles.axis2010-07-023-3/+6
| |/