summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | QGlyphRun: make operator != inlinedKonstantin Ritt2011-09-022-5/+5
| * | QGlyphRun: don't detach if the decoration wasn't actually changedKonstantin Ritt2011-09-021-0/+9
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-teamaavit2011-08-301-1/+1
| |\ \
| | * | QPA event loop: Set a timeout != 0 if there are no timers.Eike Ziller2011-08-291-1/+1
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-09-1011-35/+115
|\ \ \ \
| * | | | Merge fixes for QDir::operator==Shane Kearns2011-09-071-2/+13
| * | | | QSslCertificate: block all DigiNotar (intermediate and root) certsPeter Hartmann2011-09-062-8/+34
| * | | | Restore Qt4.7 behaviour of QFileInfo::absolute(File)PathShane Kearns2011-09-053-9/+3
| * | | | Fix comparison of absolute, unclean paths in QDirShane Kearns2011-09-023-1/+33
| * | | | Wrap calls to Sequence::push_backJoão Abecasis2011-09-023-15/+32
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into master...Qt Continuous Integration System2011-09-091-5/+2
|\ \ \ \ \
| * | | | | Fix double click and drag not extending word selection.Andrew den Exter2011-09-081-5/+2
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-0819-132/+84
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Ensure that the proxystyle is used over the style's own functionsAndy Shaw2011-09-071-11/+7
| * | | | | QSettings: don't assume XDG_CONFIG_HOME is latin1-encodedKonstantin Ritt2011-09-071-2/+2
| * | | | | QSettings: use the common appdata dir when bootstrapping qmake on winKonstantin Ritt2011-09-071-8/+2
| * | | | | Replace explicit surrogate handlers by inline methods of QChar classsuzuki toshiya2011-09-0717-111/+73
* | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-09-084-2/+18
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-09-074-2/+18
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-09-074-2/+18
| | |\ \ \ \ \ \
| | | * | | | | | Dragging in nested views no longer works as expectedMartin Jones2011-09-071-1/+1
| | | * | | | | | Fix implicit height not growing when pre-edit text wraps.Andrew den Exter2011-09-061-1/+3
| | | * | | | | | Fix leak in State element.Michael Brasser2011-09-021-0/+12
| | | * | | | | | Fix leak in bindings created by PropertyChanges.Michael Brasser2011-09-011-0/+2
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-09-075-3/+19
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Fix the build with -qtnamespace configure optionssuzuki toshiya2011-09-065-3/+19
* | | | | | | | | Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-0626-77/+364
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated WebKit to a2bd2bb (qtwebkit-2.2-week35)Ademar de Souza Reis Jr2011-09-0626-77/+364
* | | | | | | | | | Merge remote-tracking branch 'qt-air-review/master'Sergio Ahumada2011-09-067-6/+65
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Updated WebKit to fb3b4700aa5abbb2db471b4f0eb7946ce4850cc4Ademar de Souza Reis Jr2011-08-307-6/+65
* | | | | | | | | Merge remote-tracking branch 'origin/4.8' into qt-4.8-from-4.7Liang Qi2011-09-0310-24/+514
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update license headersGabriel de Dietrich2011-09-013-54/+57