summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | Updated WebKit to d14495f006a09eaee01d155fa57c80537408a835Alexis Menard2011-05-309314-6/+2836068
| | * | | | | | | Remove old QtWebKit.Alexis Menard2011-05-305254-1758183/+0
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2011-07-024-165/+69
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Compile with DEBUG_FONTENGINE defineHarald Fernengel2011-07-011-4/+4
| * | | | | | | | | minor optimizationRitt Konstantin2011-07-011-2/+2
| * | | | | | | | | remove the old compatibility codeRitt Konstantin2011-07-011-95/+2
| * | | | | | | | | make QFontEngineQPF1 work even without mmap(2) supportRitt Konstantin2011-07-011-62/+59
| * | | | | | | | | Doc: Fixing typoSergio Ahumada2011-06-302-3/+3
* | | | | | | | | | Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-027-25/+65
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-017-25/+65
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | / / / | | | |_|_|_|_|/ / / | | |/| | | | | | |
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-291-4/+19
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | |
| | | * | | | | | | Fix QWidget::palettePropagation2() autotest on Symbian (part 2)Sami Merila2011-06-291-0/+1
| | | * | | | | | | Fix QWidget::palettePropagation2() autotest on SymbianSami Merila2011-06-291-4/+18
| | * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-06-293-10/+17
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-293-10/+17
| | * | | | | | | | Added qmlshadersplugin to Symbian s60installs.pro-file.Marko Niemelä2011-06-291-1/+4
| | * | | | | | | | Fix KERN-EXEC 0 errors in symbian bearer pluginShane Kearns2011-06-282-4/+19
| | | |_|_|_|_|_|/ | | |/| | | | | |
* | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into mast...Qt Continuous Integration System2011-07-017-19/+54
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cocoa: QFileDialog: fix filename filter not applied correctlyRichard Moe Gustavsen2011-06-301-2/+3
| * | | | | | | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-06-29247-2017/+3633
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Fix typo in docs: occurred.Frederik Gladhorn2011-06-291-1/+1
| * | | | | | | | | Use Q_SLOTS instead of slots in public headers.Frederik Gladhorn2011-06-281-1/+1
| * | | | | | | | | Fix a11y crash: dock doesn't always have a widget.Frederik Gladhorn2011-06-281-7/+12
| * | | | | | | | | Fix typo in comment.Frederik Gladhorn2011-06-281-1/+1
| * | | | | | | | | Mac: respect WA_ShowWithoutActivating flagRichard Moe Gustavsen2011-06-281-1/+4
| * | | | | | | | | Merge branch '4.8'Richard Moe Gustavsen2011-06-281-1/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Mac: switch raster off as default paint engineRichard Moe Gustavsen2011-06-151-1/+1
| * | | | | | | | | | Remove misleading and incorrect information from dropMimeData docs.Stephen Kelly2011-06-271-7/+8
| * | | | | | | | | | Provide the resetInternalData slot to cleanly reset data in proxy subclasses.Stephen Kelly2011-06-272-0/+25
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-014-4/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Symbian socket engine: remove remaining todo commentsShane Kearns2011-06-302-4/+3
| * | | | | | | | | | Fix invalid read in QUrl::removeAllEncodedQueryItemsOlivier Goffart2011-06-281-0/+1
| * | | | | | | | | | Push the data together with the error in the synchronous case.Pierre Rossi2011-06-281-0/+1
* | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-2917-92/+113
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix vertical positioning of glyphs in raster engine with FreeTypeJiang Jiang2011-06-281-3/+4
| * | | | | | | | | | | Ensure a small event check interval on uikit platform.con2011-06-281-1/+1
| * | | | | | | | | | | Change default application font for uikit platform.con2011-06-281-0/+6
| * | | | | | | | | | | Use the QPoint memory layout change only on Desktop Maccon2011-06-281-1/+1
| * | | | | | | | | | | Fix 2cb398e1d901e62384bb2b388761cfd18fc8804a in case of no coreservicescon2011-06-282-0/+5
| * | | | | | | | | | | Post key events via QWindowSystemInterface, don't post events direclyIan2011-06-272-27/+12
| * | | | | | | | | | | Use nicer fonts and a few little patches to uikit platform.Ian2011-06-276-18/+25
| * | | | | | | | | | | Update README and qmlapplicationviewer to suit 4.8.con2011-06-276-43/+60
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into mas...Qt Continuous Integration System2011-06-2820-346/+346
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Re-apply licenseheader text in source files for qt4.8Jyri Tahtela2011-06-2720-346/+346
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-283-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | / / / / | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'qt-mainline/4.8'aavit2011-06-2768-426/+540
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Reorder variable to eliminate warningsJiang Jiang2011-06-271-1/+1
| * | | | | | | | | | | Only compare styleNames if they are not emptyJiang Jiang2011-06-272-2/+2
| * | | | | | | | | | | Add styleName to QFontDef comparisonJiang Jiang2011-06-252-0/+4
* | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-06-279-18/+42
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |