Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-09-16 | 11 | -107/+39 |
|\ | |||||
| * | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in... | Qt Continuous Integration System | 2011-09-16 | 9 | -14/+29 |
| |\ | |||||
| | * | Merge remote branch 'origin/4.8' into 4.8-from-4.7 | Rohan McGovern | 2011-09-14 | 15854 | -1116867/+2318053 |
| | |\ | |||||
| | * \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration | Qt Continuous Integration System | 2011-09-12 | 2 | -5/+8 |
| | |\ \ | |||||
| | | * | | StrictlyEnforceRange with snapOneItem/Row and header behavior change | Martin Jones | 2011-09-12 | 2 | -5/+8 |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ... | Qt Continuous Integration System | 2011-09-09 | 3 | -5/+12 |
| | |\ \ \ | |||||
| | | * | | | Release font engine refcount when done using it in QTextEngine | Jiang Jiang | 2011-09-09 | 3 | -5/+12 |
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-09-08 | 1 | -0/+5 |
| | |\ \ \ \ | |||||
| | | * | | | | update the proxy info before session is opened in QNAM by Aapo Makela | Kranthi Kuntala | 2011-09-08 | 1 | -0/+5 |
| | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ... | Qt Continuous Integration System | 2011-09-07 | 1 | -2/+3 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge remote-tracking branch 'mainline/4.7' into 4.7 | Casper van Donderen | 2011-09-02 | 30 | -113/+320 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7 | David Boddie | 2011-08-17 | 259 | -54226/+28871 |
| | | |\ \ \ \ \ \ | |||||
| | | * | | | | | | | Doc: Fixed the example of an encoded URL in the class description. | David Boddie | 2011-07-21 | 1 | -2/+3 |
| | * | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ... | Qt Continuous Integration System | 2011-09-07 | 5 | -21/+48 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | | | |||||
| | | * | | | | | | | QSslCertificate: block all DigiNotar (intermediate and root) certs | Peter Hartmann | 2011-09-06 | 2 | -8/+35 |
| | | * | | | | | | | QSslCertificate: also check common name for blacklisted certificates | Peter Hartmann | 2011-09-06 | 1 | -11/+12 |
| | | * | | | | | | | Fix typo in header guard. | Jason McDonald | 2011-09-06 | 1 | -1/+1 |
| | | * | | | | | | | fix doc typo | Oswald Buddenhagen | 2011-09-05 | 1 | -1/+1 |
| | | * | | | | | | | Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdk | Oswald Buddenhagen | 2011-09-05 | 1 | -1/+1 |
| | | * | | | | | | | remove obsolete define | Oswald Buddenhagen | 2011-09-05 | 1 | -1/+0 |
| | | | |_|_|/ / / | | | |/| | | | | | |||||
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2011-09-15 | 2 | -93/+10 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge remote-tracking branch 'mainline/4.8' | Oswald Buddenhagen | 2011-09-15 | 567 | -5296/+11912 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | * | | | | | | | | wtf? .pro.user files? congrats to overriding the hook! | Oswald Buddenhagen | 2011-09-13 | 1 | -83/+0 |
| | * | | | | | | | | Fix QNetworkReply::errorString returning an untranslated string | Giuseppe D'Angelo | 2011-09-12 | 1 | -10/+10 |
* | | | | | | | | | | minor docu fixes | Konstantin Ritt | 2011-09-15 | 1 | -5/+5 |
* | | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-09-15 | 30 | -54/+351 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master... | Qt Continuous Integration System | 2011-09-15 | 27 | -50/+339 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Updated WebKit to 64cce10 (qtwebkit-rc1, week36) | Ademar de Souza Reis Jr | 2011-09-13 | 27 | -50/+339 |
| | | |/ / / / / / / | | |/| | | | | | | | |||||
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master... | Qt Continuous Integration System | 2011-09-15 | 3 | -4/+12 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| | * | | | | | | | | Fix crash in compiled bindings | Aaron Kennedy | 2011-09-14 | 3 | -4/+12 |
* | | | | | | | | | | Mingw compile error src/gui/accessible/qaccessible_win.cpp | Markku Heikkila | 2011-09-15 | 1 | -1/+1 |
* | | | | | | | | | | Merge branch '4.8-upstream' into master-water | Water-Team | 2011-09-10 | 26 | -255/+273 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste... | Qt Continuous Integration System | 2011-09-10 | 15 | -220/+158 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | Generate glyphs in un-transformed coordinate system. | Samuel Rødal | 2011-09-09 | 1 | -3/+4 |
| | * | | | | | | | | | Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFT | Aleksandar Stojiljkovic | 2011-09-09 | 1 | -2/+6 |
| | * | | | | | | | | | Reset trailingSpaces in relayout | Jiang Jiang | 2011-09-09 | 1 | -0/+1 |
| | * | | | | | | | | | Prevent QPixmapCache potentially growing indefinitely. | Samuel Rødal | 2011-09-09 | 1 | -2/+1 |
| | * | | | | | | | | | Allocate 16-byte aligned memory independent of platform for raster pool. | Samuel Rødal | 2011-09-09 | 1 | -37/+17 |
| | * | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-team | aavit | 2011-09-08 | 3 | -5/+6 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | | Fix trailing spaces problem by not adding it to QScriptLine.length | Jiang Jiang | 2011-09-08 | 3 | -5/+6 |
| | * | | | | | | | | | | Merge remote-tracking branch 'qt-mainline/4.8' | aavit | 2011-09-08 | 110 | -274/+1389 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Fix RTL layout for fonts when non-printable character has an advance | John Tapsell | 2011-09-08 | 2 | -2/+4 |
| | * | | | | | | | | | | Fix regression in tst_qrawfont | Eskil Abrahamsen Blomfeldt | 2011-09-08 | 1 | -1/+3 |
| | * | | | | | | | | | | Make it compile on mac | aavit | 2011-09-07 | 1 | -3/+3 |
| | * | | | | | | | | | | micro optimizations | Konstantin Ritt | 2011-09-02 | 4 | -109/+48 |
| | * | | | | | | | | | | fix "comparison between signed and unsigned" warnings | Konstantin Ritt | 2011-09-02 | 1 | -7/+5 |
| | * | | | | | | | | | | on windows, don't resolve the gdi32's symbols for each QRawFont instance | Konstantin Ritt | 2011-09-02 | 2 | -37/+26 |
| | * | | | | | | | | | | fix typo in the docs | Konstantin Ritt | 2011-09-02 | 1 | -1/+1 |
| | * | | | | | | | | | | QRawFont: add missed operator != | Konstantin Ritt | 2011-09-02 | 2 | -0/+9 |
| | * | | | | | | | | | | optimize QGlyphRun's operator == a bit | Konstantin Ritt | 2011-09-02 | 1 | -7/+11 |