summaryrefslogtreecommitdiffstats
path: root/src/imports/shaders
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-4.8-from-4.7Sergio Ahumada2011-11-151-0/+4
|\
| * Compile when -no-rtti is specified as a configure optionAndy Shaw2011-11-071-0/+4
* | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-10-251-1/+1
|\ \ | |/
| * Fix deployment for declarative tests, examples on SymbianDamian Jansen2011-10-041-1/+1
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-08-274-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
* | Doc: Fixed qdoc warnings.David Boddie2011-08-152-50/+0
* | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-2713-225/+225
|/
* Qmlshadersplugin API documentation enhancements.Marko Niemelä2011-06-133-124/+8
* Fixed qmlshadersplugin on windows VC2008 toolchain.Marko Niemelä2011-06-081-10/+10
* 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-2515-0/+2854