summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.8-upstream' into master-waterWater-Team2011-09-1611-107/+39
|\
| * Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-169-14/+29
| |\
| | * Merge remote branch 'origin/4.8' into 4.8-from-4.7Rohan McGovern2011-09-1415854-1116867/+2318053
| | |\
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-122-5/+8
| | |\ \
| | | * | StrictlyEnforceRange with snapOneItem/Row and header behavior changeMartin Jones2011-09-122-5/+8
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-09-093-5/+12
| | |\ \ \
| | | * | | Release font engine refcount when done using it in QTextEngineJiang Jiang2011-09-093-5/+12
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-081-0/+5
| | |\ \ \ \
| | | * | | | update the proxy info before session is opened in QNAM by Aapo MakelaKranthi Kuntala2011-09-081-0/+5
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-09-071-2/+3
| | |\ \ \ \ \
| | | * \ \ \ \ Merge remote-tracking branch 'mainline/4.7' into 4.7Casper van Donderen2011-09-0230-113/+320
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7David Boddie2011-08-17259-54226/+28871
| | | |\ \ \ \ \ \
| | | * | | | | | | Doc: Fixed the example of an encoded URL in the class description.David Boddie2011-07-211-2/+3
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-09-075-21/+48
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+35
| | | * | | | | | | QSslCertificate: also check common name for blacklisted certificatesPeter Hartmann2011-09-061-11/+12
| | | * | | | | | | Fix typo in header guard.Jason McDonald2011-09-061-1/+1
| | | * | | | | | | fix doc typoOswald Buddenhagen2011-09-051-1/+1
| | | * | | | | | | Ensure that the corewlan plugin can be built with the Mac OS X 10.7 sdkOswald Buddenhagen2011-09-051-1/+1
| | | * | | | | | | remove obsolete defineOswald Buddenhagen2011-09-051-1/+0
| | | | |_|_|/ / / | | | |/| | | | |
| * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-152-93/+10
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge remote-tracking branch 'mainline/4.8'Oswald Buddenhagen2011-09-15567-5296/+11912
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | * | | | | | | | wtf? .pro.user files? congrats to overriding the hook!Oswald Buddenhagen2011-09-131-83/+0
| | * | | | | | | | Fix QNetworkReply::errorString returning an untranslated stringGiuseppe D'Angelo2011-09-121-10/+10
* | | | | | | | | | minor docu fixesKonstantin Ritt2011-09-151-5/+5
* | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-1530-54/+351
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into master...Qt Continuous Integration System2011-09-1527-50/+339
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Updated WebKit to 64cce10 (qtwebkit-rc1, week36)Ademar de Souza Reis Jr2011-09-1327-50/+339
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-09-153-4/+12
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix crash in compiled bindingsAaron Kennedy2011-09-143-4/+12
* | | | | | | | | | Mingw compile error src/gui/accessible/qaccessible_win.cppMarkku Heikkila2011-09-151-1/+1
* | | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-09-1026-255/+273
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-09-1015-220/+158
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Generate glyphs in un-transformed coordinate system.Samuel Rødal2011-09-091-3/+4
| | * | | | | | | | | Use QT_MAX_CACHED_GLYPH_SIZE in QFontEngineFTAleksandar Stojiljkovic2011-09-091-2/+6
| | * | | | | | | | | Reset trailingSpaces in relayoutJiang Jiang2011-09-091-0/+1
| | * | | | | | | | | Prevent QPixmapCache potentially growing indefinitely.Samuel Rødal2011-09-091-2/+1
| | * | | | | | | | | Allocate 16-byte aligned memory independent of platform for raster pool.Samuel Rødal2011-09-091-37/+17
| | * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-09-083-5/+6
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix trailing spaces problem by not adding it to QScriptLine.lengthJiang Jiang2011-09-083-5/+6
| | * | | | | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-09-08110-274/+1389
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Fix RTL layout for fonts when non-printable character has an advanceJohn Tapsell2011-09-082-2/+4
| | * | | | | | | | | | Fix regression in tst_qrawfontEskil Abrahamsen Blomfeldt2011-09-081-1/+3
| | * | | | | | | | | | Make it compile on macaavit2011-09-071-3/+3
| | * | | | | | | | | | micro optimizationsKonstantin Ritt2011-09-024-109/+48
| | * | | | | | | | | | fix "comparison between signed and unsigned" warningsKonstantin Ritt2011-09-021-7/+5
| | * | | | | | | | | | on windows, don't resolve the gdi32's symbols for each QRawFont instanceKonstantin Ritt2011-09-022-37/+26
| | * | | | | | | | | | fix typo in the docsKonstantin Ritt2011-09-021-1/+1
| | * | | | | | | | | | QRawFont: add missed operator !=Konstantin Ritt2011-09-022-0/+9
| | * | | | | | | | | | optimize QGlyphRun's operator == a bitKonstantin Ritt2011-09-021-7/+11