Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7 | Olivier Goffart | 2011-03-22 | 44 | -402/+1755 |
|\ | |||||
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-03-22 | 22 | -46/+45 |
| |\ | |||||
| | * | Merge remote-tracking branch 'mainline/4.7' into 4.7 | Oswald Buddenhagen | 2011-03-21 | 78 | -513/+2392 |
| | |\ | |||||
| | * | | Bump Qt version to 4.7.4 | Timo Turunen | 2011-03-21 | 21 | -41/+57 |
| | * | | Fix endianness detection with gcc 4.6 -flto -fwhole-program | Bernhard Rosenkraenzer | 2011-03-21 | 1 | -4/+4 |
| | * | | remove redundand validateModes() call | Oswald Buddenhagen | 2011-03-21 | 1 | -1/+0 |
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-22 | 2 | -4/+7 |
| |\ \ \ | |||||
| | * | | | Return SV_S60_5_2 / SV_SF_3 for next gen Symbian platform. | Miikka Heikkinen | 2011-03-21 | 1 | -1/+1 |
| | * | | | Remove incorrect check in qpixmap autotest. | Laszlo Agocs | 2011-03-21 | 1 | -3/+6 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-22 | 1 | -1/+1 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Don't crash calling QTextDocument::blockBoundingRect on invalid block | Eskil Abrahamsen Blomfeldt | 2011-03-21 | 1 | -1/+1 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-21 | 9 | -151/+174 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Merge branch '4.7' of git://scm.dev.nokia.troll.no/qt/qt-s60-public into 4.7 | Laszlo Agocs | 2011-03-21 | 1 | -0/+31 |
| | |\ \ \ | |||||
| | | * | | | Started changes-4.7.4 file | Eckhart Koppen | 2011-03-21 | 1 | -0/+31 |
| | * | | | | Change the pooled QGLPixmapData to be backed by QVolatileImage. | Laszlo Agocs | 2011-03-21 | 5 | -141/+128 |
| | |/ / / | |||||
| | * | | | Changed s60 style not to rely on QPixmapData::toNativeType(). | Laszlo Agocs | 2011-03-21 | 2 | -7/+6 |
| | * | | | Add missing bitmap locking to QVGPixmapData::fromNativeType. | Laszlo Agocs | 2011-03-21 | 1 | -2/+4 |
| | * | | | Prepare fromSymbianCFbsBitmap autotest for 16 bpp format. | Laszlo Agocs | 2011-03-21 | 1 | -1/+5 |
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-21 | 3 | -9/+29 |
| |\ \ \ \ | |||||
| | * | | | | Fix writing to an attached property from script. | Michael Brasser | 2011-03-21 | 3 | -9/+29 |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-03-21 | 27 | -225/+1535 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | fixes/improvements for new QML right-to-left docs | Bea Lam | 2011-03-21 | 13 | -108/+152 |
| | * | | | | Fix license headers in example code | Bea Lam | 2011-03-21 | 1 | -1/+41 |
| | * | | | | Write Qt Quick 1.1 right-to-left documentation and examples | Joona Petrell | 2011-03-18 | 22 | -186/+1412 |
| | * | | | | Doc fix - QtQuick 1.1 scheduling | Bea Lam | 2011-03-18 | 1 | -1/+1 |
* | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-22 | 12 | -22/+93 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-20 | 12 | -22/+93 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-19 | 5 | -14/+34 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Add flag for forcibly propagating backing store alpha to framebuffer | Gareth Stockwell | 2011-03-18 | 4 | -13/+33 |
| | | * | | | | Fixed unmatched quotes in s60installs.pro | Gareth Stockwell | 2011-03-18 | 1 | -1/+1 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-19 | 6 | -7/+58 |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | |||||
| | | * | | | | Added setSwitchPolicy to MeeGo graphicssystem helper API. | Samuel Rødal | 2011-03-18 | 6 | -7/+58 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr... | Qt Continuous Integration System | 2011-03-19 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Add /q switch to QMAKE_DEL_FILE command in symbian | Miikka Heikkinen | 2011-03-18 | 1 | -1/+1 |
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-03-22 | 3 | -5/+17 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Designer: Remember default of main container's object name. | Friedemann Kleint | 2011-03-21 | 2 | -3/+15 |
| * | | | | | | | Designer: Do not translate page object names of QMdiArea. | Friedemann Kleint | 2011-03-21 | 1 | -2/+2 |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-03-22 | 53 | -915/+2565 |
|\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge remote branch 'qt/master' into staging-master | Samuel Rødal | 2011-03-21 | 440 | -4580/+19637 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | |||||
* | | | | | | | | | Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration... | Qt Continuous Integration System | 2011-03-19 | 6 | -26/+234 |
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge branch 4.7 into qt-master-from-4.7 | Qt Continuous Integration System | 2011-03-19 | 6 | -26/+234 |
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-03-18 | 3 | -5/+76 |
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | | | |||||
| | | * | | | | | | Changes to driver workarounds. | Robin Burchell | 2011-03-17 | 1 | -2/+25 |
| | | * | | | | | | Switch to raster also when last window is destroyed (on MeeGo). | Samuel Rødal | 2011-03-17 | 1 | -1/+38 |
| | | * | | | | | | Clipboard/Windows: Fix a hang when sending to non-responsive clients. | Friedemann Kleint | 2011-03-17 | 1 | -2/+13 |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-03-18 | 3 | -21/+158 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Fix accidental population of the disk cache with partial content | Simon Hausmann | 2011-03-17 | 2 | -0/+100 |
| | | * | | | | | | Fix disk cache interaction for range retrieval HTTP requests. | Simon Hausmann | 2011-03-17 | 2 | -21/+58 |
* | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into mast... | Qt Continuous Integration System | 2011-03-19 | 2 | -4/+5 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | |||||
| * | | | | | | | | qmake vcproj generator: do not insert $(INHERIT) | Joerg Bornemann | 2011-03-18 | 2 | -4/+5 |