| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-08-27 | 4 | -44/+116 |
|\ |
|
| * | Merge branch 4.7 into qt-4.8-from-4.7 | Sergio Ahumada | 2011-08-26 | 4 | -44/+116 |
| |\ |
|
| | * | Fix for qml1shaderplugin GPU resource handling on Symbian | Marko Niemelä | 2011-08-24 | 4 | -44/+116 |
|
|
| | * | Re-apply licenseheader text in source files for qt4.7 | Jyri Tahtela | 2011-07-01 | 13 | -225/+225 |
|
|
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master... | Qt Continuous Integration System | 2011-08-19 | 2 | -50/+0 |
|\ \ \ |
|
| * | | | Doc: Fixed qdoc warnings. | David Boddie | 2011-08-15 | 2 | -50/+0 |
| |/ / |
|
* | | | uikit: Fixes for Open GL ES 1 and for pre-3GS devices | Eike Ziller | 2011-08-17 | 1 | -1/+1 |
|/ / |
|
* | | Re-apply licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-06-27 | 13 | -225/+225 |
|
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Liang Qi | 2011-06-24 | 3 | -124/+8 |
|\ \
| |/ |
|
| * | Qmlshadersplugin API documentation enhancements. | Marko Niemelä | 2011-06-13 | 3 | -124/+8 |
|
|
* | | Merge remote branch 'upstream/4.7' into qt-4.8-from-4.7 | Toby Tomkins | 2011-06-08 | 1 | -10/+10 |
|\ \
| |/ |
|
| * | Fixed qmlshadersplugin on windows VC2008 toolchain. | Marko Niemelä | 2011-06-08 | 1 | -10/+10 |
|
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7 | Olivier Goffart | 2011-05-31 | 16 | -0/+2855 |
|\ \
| |/ |
|
| * | Fixed more CI-errors caused by qmlshadersplugin addition. | Marko Niemelä | 2011-05-26 | 1 | -1/+1 |
|
|
| * | Fixed CI-errors caused by qmlshadersplugin addition. | Marko Niemelä | 2011-05-26 | 4 | -9/+9 |
|
|
| * | Backported QML ShaderEffectItem from QML2.0 into Qt Quick 1.1 | Marko Niemelä | 2011-05-25 | 16 | -0/+2855 |
|
|
| * | Update licenseheader text in source files | Jyri Tahtela | 2011-05-13 | 8 | -136/+136 |
|
|
* | | Update licenseheader text in source files for qt4.8 | Jyri Tahtela | 2011-05-13 | 8 | -136/+136 |
|
|
* | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-31 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-03-09 | 2 | -1/+5 |
| |\ |
|
| * \ | Merge branch 'mimir' into 4.7 | David Boddie | 2011-02-23 | 1 | -1/+1 |
| |\ \ |
|
* | \ \ | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-03 | 1 | -0/+4 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Doc: remove experimental GestureArea from contents and add PinchArea | Martin Jones | 2011-03-02 | 1 | -0/+4 |
|
|
* | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-01 | 1 | -1/+1 |
|\ \ \ \
| |/ / / |
|
| * | | | FolderListModel emitted incorrect rowsRemoved range causing crash. | Martin Jones | 2011-02-28 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-02-10 | 1 | -9/+9 |
|\ \ \
| |/ / |
|
| * | | Doc: Fixed invalid/incomplete QML code snippets. | David Boddie | 2011-01-17 | 1 | -9/+9 |
|
|
* | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-01-17 | 8 | -8/+8 |
|\ \ \
| |/ / |
|
| * | | Update copyright year to 2011. | Jason McDonald | 2011-01-10 | 8 | -8/+8 |
|
|
* | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-12-23 | 1 | -0/+33 |
|\ \ \
| |/ / |
|
| * | | More docs for FolderListModel | Martin Jones | 2010-12-23 | 1 | -0/+33 |
| |/ |
|
* | | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-12-06 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Fix Browser.qml warnings | Joona Petrell | 2010-11-30 | 1 | -1/+1 |
|
|
* | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2010-10-30 | 3 | -3/+0 |
|\ \
| |/ |
|
| * | Remove unnecessary QML import project dependency to Symbian deployment pri fi... | Joona Petrell | 2010-10-29 | 3 | -3/+0 |
|
|
* | | Align .pro with qmake: s/\.sources/.files/. | Miikka Heikkinen | 2010-10-08 | 3 | -6/+6 |
|/ |
|
* | Replace all occurances of "Qt 4.7" with "QtQuick 1.0" | Aaron Kennedy | 2010-09-29 | 1 | -1/+1 |
|
|
* | Do not set DESTDIR to the current directory | Denis Dzyubenko | 2010-09-24 | 3 | -7/+7 |
|
|
* | Doc fix. | Michael Brasser | 2010-09-23 | 1 | -1/+1 |
|
|
* | Fix slot naming clash | Martin Jones | 2010-09-12 | 2 | -3/+3 |
|
|
* | Doc: Worked on two more elements, replacing an image. | David Boddie | 2010-09-06 | 1 | -24/+72 |
|
|
* | Remove pointless \internal docs (that contain no information) | Aaron Kennedy | 2010-08-27 | 1 | -33/+0 |
|
|
* | qdoc: Reorganized the QML elements table to be a dictionary... | Martin Smith | 2010-08-16 | 3 | -0/+7 |
|
|
* | Fixed the scope when evaluating GestureArea javascript expressions | Denis Dzyubenko | 2010-07-23 | 1 | -1/+1 |
|
|
* | Report errors when evaluating JavaScript expressions from the GestureArea QML... | Denis Dzyubenko | 2010-07-23 | 1 | -1/+4 |
|
|
* | Register a few gesture-related types in the meta-type system. | Denis Dzyubenko | 2010-07-23 | 1 | -0/+7 |
|
|
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7 | Martin Smith | 2010-07-22 | 1 | -3/+16 |
|\ |
|
| * | Clean up particle motion documentation | Alan Alpert | 2010-07-14 | 1 | -3/+16 |
|
|
* | | qdoc: Fixed reporting of read-only status for QML properties. | Martin Smith | 2010-07-22 | 2 | -5/+5 |
|/ |
|
* | Private variable cleanup. | Michael Brasser | 2010-07-13 | 1 | -1/+1 |
|
|