summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-148-18/+259
|\
| * Revert "Optimize QPixmapIconEngine's pixmap() function"Olivier Goffart2010-05-141-21/+14
| * Limit the lower glyph texture cache size to 16x16 in GL.Trond Kjernåsen2010-05-141-0/+12
| * Added workarounds for two MBX/SGX specific GL ES bugs/problems.Trond Kjernåsen2010-05-147-18/+39
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-05-14790-7593/+15697
| |\
| | * Merge branch '4.7' of scm.dev-nokia.troll.no:qt/oslo-staging-2 into 4.7Andreas Aardal Hanssen2010-05-14454-3307/+7326
| | |\
| | * | Add missing file!Andreas Aardal Hanssen2010-05-141-0/+208
| * | | Optimize QPixmapIconEngine's pixmap() functionaavit2010-05-111-14/+21
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-14166-1294/+2010
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update the dependencies in src.pro because we don't have a good buildsystemThiago Macieira2010-05-141-5/+15
| * | | QtDeclarative doesn't use QtXml, so don't link to it or require others toThiago Macieira2010-05-141-2/+2
| * | | Add new logo for QML Launcher (Mac OS X)Kai Koehne2010-05-143-0/+3
| * | | Rename QML Runtime (executable) to QML LauncherKai Koehne2010-05-1412-46/+50
| * | | Remove skins from qml launcher.Kai Koehne2010-05-144-271/+2
| * | | Fix compilation of QtDeclarative module (gcc)Kai Koehne2010-05-141-1/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-14152-970/+1938
| |\ \ \ |/ / / /
| * | | Qt.include() support in worker scriptsAaron Kennedy2010-05-144-1/+69
| * | | Only add "include" property in non-workerscript threadsAaron Kennedy2010-05-141-1/+2
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-141-4/+8
| |\ \ \
| | * | | Reduce the chance of AnchorAnimation animating geometry changes itMichael Brasser2010-05-141-4/+8
| * | | | Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89Aaron Kennedy2010-05-1410-12/+182
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-14166-1265/+1890
| |\ \ \
| | * | | Fix crash in ParentAnimation.Michael Brasser2010-05-146-13/+16
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Michael Brasser2010-05-1475-120/+529
| | |\ \ \
| | | * | | Symbian build fix to declarative auto and benchmark testsJoona Petrell2010-05-1475-120/+529
| | * | | | Revert "Fix crash in ParentAnimation."Michael Brasser2010-05-141-9/+8
| | |/ / /
| | * | | Revert "Use raster graphicssystem for qml.app on OS X."Michael Brasser2010-05-141-1/+1
| | * | | Fix crash in ParentAnimation.Michael Brasser2010-05-141-8/+9
| | * | | Minor declarative webview tweaksAlan Alpert2010-05-1323-575/+235
| | * | | Removed dependency of QDeclarativeWebView to private Qt (Declarative) APISimon Hausmann2010-05-133-185/+113
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Alan Alpert2010-05-13151-596/+1602
| | |\ \ \
| | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1318-63/+245
| | | |\ \ \
| | | | * | | Follow-up on Flickable changes.Yann Bodson2010-05-135-44/+94
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1310-6/+125
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-132-11/+21
| | | | | |\ \ \
| | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-13151-772/+2271
| | | | | |\ \ \ \
| | | | | * | | | | Add an example spinner.Martin Jones2010-05-1310-6/+125
| | | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1395-237/+631
| | | | |\ \ \ \ \ \ | | | | | | |_|/ / / | | | | | |/| | | |
| | | | | * | | | | ListModel::get() should return undefined if bad index specifiedBea Lam2010-05-132-11/+21
| | | | | | |/ / / | | | | | |/| | |
| | | | * | | | | Fix crash on remote content.Warwick Allison2010-05-131-1/+3
| | * | | | | | | Note that you need to unset a flag to create a visual itemAlan Alpert2010-05-131-1/+4
| | | |/ / / / / | | |/| | | | |
| * | | | | | | Add Qt.include() method for scoped inclusion of JavaScript filesAaron Kennedy2010-05-1417-0/+540
| | |_|/ / / / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1395-226/+611
| |\ \ \ \ \ \
| * | | | | | | Dates and variants are not considered nested objectsAaron Kennedy2010-05-131-1/+2
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-1469-1242/+2000
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-1369-1242/+2000
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Avoid running animation when loopCount == 0Leonardo Sobral Cunha2010-05-132-0/+27
| | * | | | | | | Set the pictures for the examples of multitouchx29a2010-05-123-2/+2
| | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-1264-1240/+1971
| | |\ \ \ \ \ \ \
| | | * | | | | | | Compile fix on Windows.Kim Motoyoshi Kalland2010-05-123-3/+3