Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-05 | 3 | -0/+541 |
|\ | |||||
| * | Make it compile on Mac OS X 10.5 | Robert Griebl | 2010-12-03 | 1 | -2/+2 |
| * | Touch events do not work on Mac OS 10.5 | Robert Griebl | 2010-12-03 | 1 | -2/+10 |
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-12-03 | 3 | -0/+533 |
| |\ | |||||
| | * | QScroller merge, part 1 | Robert Griebl | 2010-12-02 | 3 | -0/+533 |
* | | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-04 | 2 | -2/+2 |
|\ \ \ | |/ / | |||||
| * | | Changed various DEPLOYMENT variable ".sources" suffixes to ".files" | Miikka Heikkinen | 2010-12-02 | 2 | -2/+2 |
| |/ | |||||
* | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-12-02 | 1 | -0/+41 |
|\ \ | |/ | |||||
| * | Fix license headers | Jason McDonald | 2010-12-01 | 1 | -0/+41 |
* | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-27 | 3 | -51/+41 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master... | Qt Continuous Integration System | 2010-11-26 | 1 | -35/+35 |
| |\ | |||||
| | * | Line ending fix. | Kim Motoyoshi Kalland | 2010-11-26 | 1 | -35/+35 |
| * | | QFileSystemWatcher: don't try to stop non-running thread | João Abecasis | 2010-11-26 | 1 | -0/+1 |
| * | | Fix QSettings auto test to use QTRY_VERIFY | João Abecasis | 2010-11-26 | 1 | -8/+5 |
| * | | tst_QFileSystemWatcher: Don't exit the event loop on first signal. | Tijl Coosemans | 2010-11-26 | 1 | -8/+0 |
| |/ | |||||
* | | Compile fix on solaris | Thierry Bastian | 2010-11-26 | 1 | -1/+1 |
* | | Merge branch 'master-upstream' into master-water | Thierry Bastian | 2010-11-26 | 157 | -5238/+19695 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-11-25 | 2 | -0/+68 |
| |\ | |||||
| | * | Allow QDial to wrap value when wrapping property is set. | Andy Nichols | 2010-11-25 | 1 | -0/+64 |
| | * | QtScript variant conversion: Convert numbers to (u)int if applicable (reviewe... | Thomas Senyk | 2010-11-25 | 1 | -0/+4 |
| * | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2010-11-25 | 146 | -5174/+19163 |
| |\ \ | |||||
| | * \ | Merge remote branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2010-11-25 | 146 | -5174/+19163 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-24 | 6 | -17/+22 |
| | | |\ | |||||
| | | | * | Fixed tst_qwidget::winIdChangeEvent | Gareth Stockwell | 2010-11-24 | 1 | -12/+17 |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-24 | 5 | -5/+5 |
| | | | |\ | |||||
| | | | | * | Merge remote branch 'qt/4.7' into 4.7 | Jason McDonald | 2010-11-23 | 103 | -5133/+7201 |
| | | | | |\ | |||||
| | | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-19 | 5 | -5/+5 |
| | | | | |\ \ | |||||
| | | | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-18 | 5 | -5/+5 |
| | | | | | |\ \ | |||||
| | | | | | | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-18 | 5 | -5/+5 |
| | | | | | | |\ \ | |||||
| | | | | | | | * \ | Merge remote branch 'qt/4.7' into 4.7 | Jason McDonald | 2010-11-18 | 428 | -13242/+10315 |
| | | | | | | | |\ \ | |||||
| | | | | | | | * \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2010-11-12 | 5 | -5/+5 |
| | | | | | | | |\ \ \ | |||||
| | | | | | | | | * | | | Bump Qt version to 4.7.2. | Jason McDonald | 2010-11-12 | 5 | -5/+5 |
| | | * | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2010-11-24 | 32 | -0/+11289 |
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | | | |||||
| | | | * | | | | | | | | Flickable and MouseArea were too eager to take/keep mouse grab. | Martin Jones | 2010-11-24 | 13 | -0/+5108 |
| | | | * | | | | | | | | Allow javascript date and regexp objects in WorkerScript messages | Bea Lam | 2010-11-24 | 1 | -0/+5 |
| | | | * | | | | | | | | Avoid lockup in ListView when animating delegates. | Martin Jones | 2010-11-24 | 2 | -0/+52 |
| | | | * | | | | | | | | Fix asynchronous reload call in test, broken by previous submit | Damian Jansen | 2010-11-24 | 1 | -0/+3 |
| | | | * | | | | | | | | Ensure WebView press delay timer is cancelled when grab is taken. | Martin Jones | 2010-11-23 | 15 | -0/+6121 |
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | | | |||||
| | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-24 | 1 | -0/+41 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | tst_qthread: fix compilation | Olivier Goffart | 2010-11-22 | 1 | -1/+2 |
| | | | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-22 | 1 | -0/+40 |
| | | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | | | |||||
| | | | | * | | | | | | | QThread::exec(): Fix possibility to enter several time the event loop | Olivier Goffart | 2010-11-22 | 1 | -0/+40 |
| | | | | |/ / / / / / | |||||
| | | * | | | | | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-22 | 103 | -5133/+7201 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-22 | 1 | -2/+2 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-19 | 1 | -2/+2 |
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | | | |||||
| | | | | | * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2010-11-19 | 1 | -2/+2 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | Fix compilation with Sun Studio 12.1. | Thiago Macieira | 2010-11-19 | 1 | -2/+2 |
| | | | | | | |/ / / / / | |||||
| | | | * | | | | | | | | Update qml visual tests on mac. | Yann Bodson | 2010-11-22 | 102 | -5131/+7199 |
| | | | |/ / / / / / / | |||||
| | | * | | | | | | | | Merge branch '4.7-upstream' into 4.7-water | Thierry Bastian | 2010-11-19 | 5 | -5/+30 |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | |||||
| | | | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2010-11-19 | 3 | -2/+25 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | | |