summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2631-102/+594
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-05-2531-102/+594
| | |\
| | | * Updated WebKit to 807157e42add842605ec67d9363dd3f1861748caSimon Hausmann2010-05-2531-102/+594
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-2610-170/+179
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Bea Lam2010-05-2692-170/+843
| |\ \ \
| | * | | Mention TextInput/Edit::selectByMouse property in QmlChanges.Martin Jones2010-05-253-2/+3
| | * | | Add inherits Item to TextEdit and TextInput docs.Martin Jones2010-05-252-2/+4
| * | | | Clean up and don't allow clicks on already filled placesBea Lam2010-05-243-139/+149
| * | | | Clean up project files for c++ examplesBea Lam2010-05-244-28/+23
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-05-251-7/+3
|\ \ \ \ \
| * | | | | Doc: Removed a misleading sentence about signals.David Boddie2010-05-251-7/+3
* | | | | | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-05-2557-101/+278348
|\ \ \ \ \ \
| * | | | | | Fix compilation of qegl.cpp after the last mergeThiago Macieira2010-05-251-1/+2
| * | | | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-05-2557-102/+278348
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-244-35/+84
| | |\ \ \ \ \
| | | * | | | | Fix a race condition with QtDBus blocking for replies.Thiago Macieira2010-05-244-34/+83
| | | * | | | | QtDBus: Debug message updateThiago Macieira2010-05-241-1/+1
| | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-213-14/+19
| | |\ \ \ \ \ \
| | | * | | | | | Removed DEPLOYMENT from demos/spectrum/spectrum.proGareth Stockwell2010-05-211-13/+0
| | | * | | | | | Install source for spectrum demoGareth Stockwell2010-05-213-0/+18
| | | * | | | | | Fixed path for copying launcher script for spectrum demoGareth Stockwell2010-05-211-1/+1
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-213-15/+88
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | | * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-05-213-15/+88
| | | |\ \ \ \ \ \
| | | | * | | | | | Fixed an assert in QMenuThierry Bastian2010-05-212-11/+55
| | | | * | | | | | Call eglTerminate() when the last QEglContext is destroyed to free mem.Trond Kjernåsen2010-05-211-4/+33
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-2143-17/+278235
| | |\ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | | * | | | | | | My 4.6.3 changes.Yoann Lopes2010-05-211-0/+21
| | | * | | | | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-05-217-17/+206
| | | * | | | | | | tst_bic: Add the Qt 4.5 and 4.6 baselines for x86-64Thiago Macieira2010-05-2135-0/+278008
| | | |/ / / / / /
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-217-30/+86
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Backport multitouch bug fixes to 4.6Shane Kearns2010-05-212-7/+19
| | | * | | | | | Removed double EINTR loop from nativeWrite and nativeRead.Janne Anttila2010-05-211-8/+2
| | | * | | | | | Fixed qsslkey test deployment for Symbian and fixed compiler warnings.Janne Anttila2010-05-212-5/+9
| | | * | | | | | Fixing the race condition in event dispatcher implementation onAleksandar Sasha Babic2010-05-212-10/+56
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-211-1/+21
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | changes-4.6.3 updatedJoerg Bornemann2010-05-211-1/+21
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-05-212-1/+5
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-1/+1
| | | * | | | | | Fixing the compile issue.Aleksandar Sasha Babic2010-05-211-0/+4
| | * | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-05-211-1/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Typo.Trond Kjernåsen2010-05-211-1/+1
| | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-213-13/+71
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-05-217-16/+140
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-202-2/+71
| | | | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | | | * | | | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-202-2/+71
| | | | |\ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-202-2/+71
| | | | | |\ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-05-192-2/+71
| | | | | | |\ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Removed nearest test from qaudiodeviceinfo unit test.Kurt Korbatits2010-05-201-11/+0
| | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | QAudioDeviceInfo::nearestFormat() consistent across all platformsKurt Korbatits2010-05-191-1/+61