summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'qt-4.8-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2011-07-028-25/+105
|\
| * Merge branch 4.7 into qt-4.8-from-4.7Qt Continuous Integration System2011-07-010-0/+0
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-07-0169-1182/+1182
| | |\
| | | * Re-apply licenseheader text in source files for qt4.7Jyri Tahtela2011-07-0169-1182/+1182
| * | | Merge remote-tracking branch 'origin/4.7' into qt-4.8-from-4.7Liang Qi2011-07-018-25/+105
| |\ \ \ | | |/ /
| | * | 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-1 into 4.7-integ...Qt Continuous Integration System2011-06-291-2/+4
| | |\ \ \ | | | | |/ | | | |/|
| | | * | QTBUG-19500 lupdate fails to run from the Mac binary package on Mac OS X 10.5Simo Fält2011-06-291-2/+4
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-06-294-10/+57
| | |\ \ \
| | | * | | Fix text color in some cases of QML and QStaticTextEskil Abrahamsen Blomfeldt2011-06-294-10/+57
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-291-1/+4
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Added qmlshadersplugin to Symbian s60installs.pro-file.Marko Niemelä2011-06-291-1/+4
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-06-282-4/+19
| | |\ \ \ \ | | | |/ / / | | | | | / | | | |_|/ | | |/| |
| | | * | 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-0112-19/+255
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-301-2/+3
| |\ \ \ \
| | * | | | Cocoa: QFileDialog: fix filename filter not applied correctlyRichard Moe Gustavsen2011-06-301-2/+3
| * | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-292478-8415/+82909
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge branch '4.8-upstream' into master-waterWater-Team2011-06-292478-8415/+82909
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-teamQt Continuous Integration System2011-06-2911-17/+252
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Fix typo in docs: occurred.Frederik Gladhorn2011-06-291-1/+1
| | * | | | | Cocoa: fix qtabwidget auto test failureRichard Moe Gustavsen2011-06-291-0/+5
| | * | | | | Cocoa: fix qwidget auto test failuresRichard Moe Gustavsen2011-06-291-0/+19
| | * | | | | Cocoa: Fix qgraphicsproxywidget auto testRichard Moe Gustavsen2011-06-291-0/+4
| | * | | | | 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-274-0/+198
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into mast...Qt Continuous Integration System2011-07-017-9/+32
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Symbian socket engine: remove remaining todo commentsShane Kearns2011-06-302-4/+3
| * | | | | | | Symbian: tune network autotest heap size so they can run on emulatorShane Kearns2011-06-302-2/+2
| * | | | | | | Fix invalid read in QUrl::removeAllEncodedQueryItemsOlivier Goffart2011-06-282-3/+26
| * | | | | | | 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/oslo-staging-1 into master...Qt Continuous Integration System2011-06-301-1/+15
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Update 4.8.0 changes fileShane Kearns2011-06-301-1/+15
* | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into maste...Qt Continuous Integration System2011-06-2925-225/+236
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-06-2825-225/+236
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 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
| | * | | | | | | | Add IPHONEOS deployment vars to makespecIan2011-06-272-2/+4
| | * | | | | | | | Post key events via QWindowSystemInterface, don't post events direclyIan2011-06-272-27/+12