summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix Flipable crash.Michael Brasser2010-03-213-3/+23
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-2115-60/+86
| |\
| | * Reduce amount of qmldir parsingmae2010-03-194-34/+38
| | * Fix local type lookupmae2010-03-1910-17/+41
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-193-9/+7
| | |\
| | | * Initialize variable.Martin Jones2010-03-191-1/+1
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-192-1/+4
| | | |\
| | | * | Setting stacking order from top to bottom seems to work better.Martin Jones2010-03-191-8/+4
| | | * | Don't crash if an out of bounds model index is accessed.Martin Jones2010-03-191-0/+2
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-219-54/+126
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Moved QMAKE_MOC etc. variable declarations after symbian.conf inclusionMiikka Heikkinen2010-03-191-7/+8
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-03-198-47/+118
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Use libusb to auto-detect the port to use to communicate with the phoneThomas Zander2010-03-193-15/+85
| | * | | WhitespaceThomas Zander2010-03-194-38/+38
| | * | | Make multimedia only depend on opengl when the latter is buildThomas Zander2010-03-191-1/+2
| | * | | gcc for Symbian doesn't support gcc extensions like atomicity.h - disableIain2010-03-192-4/+4
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-214-4/+42
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-03-191-2/+9
| |\ \ \ \
| | * | | | Make an attemt to upload QPixmap in the most optimal format on 16-bitGunnar Sletta2010-03-191-2/+9
| * | | | | Let QImageReader open the device if it is not open alreadyaavit2010-03-191-1/+1
| |/ / / /
| * | | | clicking on a non focused ItemView would change the cirrent item twiceThierry Bastian2010-03-192-1/+32
|/ / / /
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-03-193-7/+7
|\ \ \ \
| * | | | Removed an assert in the print dialog on windowsThierry Bastian2010-03-191-1/+1
| * | | | simple cleanup in QSplitterThierry Bastian2010-03-191-1/+1
| * | | | Actually use GL texture cache when bindoptions are providedGunnar Sletta2010-03-191-5/+5
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-03-198-150/+364
|\ \ \ \ \
| * | | | | Add autoLoad property to multimedia declarative elements.Justin McPherson2010-03-197-8/+90
| * | | | | Fix; QML Video item is sensitive to property assignment orderJustin McPherson2010-03-198-149/+281
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-19289-3772/+7293
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-19289-3772/+7293
| |\ \ \ \ |/ / / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-03-19139-1607/+3098
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-19139-1607/+3098
| | |\ \ \ | | | | |/ | | | |/|
| * | | | Skip until after CI succeedsMartin Jones2010-03-191-0/+3
| |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Martin Jones2010-03-1935-292/+384
| |\ \ \
| * | | | Fixed install of qml imports when doing a vcproj build.Rohan McGovern2010-03-191-1/+1
| * | | | Disable tests temporarilyBea Lam2010-03-191-0/+3
| * | | | Remove warningsYann Bodson2010-03-182-29/+31
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18287-3744/+7257
| |\ \ \ \
| | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-18287-3744/+7257
| | |\ \ \ \
| | | * | | | Add missing semicolons. moc was confused and positionViewAtIndex not invokable.Yann Bodson2010-03-182-2/+2
| | | * | | | Use the correct base URL in resolveUriMartin Jones2010-03-181-3/+2
| | | * | | | Remove timing sensitivity.Warwick Allison2010-03-181-2/+2
| | | * | | | Optimize id checking.Warwick Allison2010-03-181-10/+0
| | | * | | | Fix examples after 47fb07c9fdf47584ae55f3412102bbeef5576b04.Yann Bodson2010-03-187-0/+0
| | | * | | | Don't use QScriptValueIterator to iterate over arrays.Bea Lam2010-03-181-4/+3
| | | * | | | Skip test, to be fixed.Bea Lam2010-03-181-0/+2
| | | * | | | Only release the binding once we're finished with its memoryAaron Kennedy2010-03-181-1/+1
| | | * | | | Make it harder to accidentally delete a bindingAaron Kennedy2010-03-181-5/+7
| | | * | | | Adjust test now that redundant contexts are not create dueWarwick Allison2010-03-181-2/+2