summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'origin/4.6' into 4.6-multimediaToby Tomkins2010-04-01100-821/+1581
|\
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-313-6/+11
| |\
| | * Ensure Phonon MMF backend emits aboutToFinishGareth Stockwell2010-03-312-5/+10
| | * Remove compiler warningGareth Stockwell2010-03-311-1/+1
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-314-3/+20
| |\ \
| | * | Fix compile error with QT_NO_NETWORKDISKCACHE in QtNetworkTasuku Suzuki2010-03-312-1/+6
| | * | Fix crash when using qDebug() on a QBrush with Qt::TexturePattern style.David Faure2010-03-312-2/+14
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-311-6/+13
| |\ \ \ | | |/ / | |/| |
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Rhys Weatherley2010-03-3110-294/+8
| | |\ \
| | * | | Allow attributes to be bound after a QGLShaderProgram is linked.Rhys Weatherley2010-03-311-6/+13
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-311-1/+1
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Fix translation mistake spotted by Laurent MontelDavid Faure2010-03-311-1/+1
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-3115-306/+60
| |\ \ \ \
| | * | | | Revert "Add a children private property needed for QML to support QGraphicsOb...Alexis Menard2010-03-317-273/+0
| | * | | | Revert "struct -> class, it's better."Alexis Menard2010-03-311-2/+1
| | * | | | Revert "Add NOTIFY to size property so QML bindings are working fine."Alexis Menard2010-03-313-12/+2
| | * | | | Revert "Better handling for NOTIFY in QGraphicsWidget regarding geometry chan...Alexis Menard2010-03-313-5/+7
| | * | | | Revert "Add a a layout property in QGraphicsWidget."Alexis Menard2010-03-313-5/+1
| | * | | | Add a workaround for a bug in Mac filesystem watcher.Alexis Menard2010-03-301-1/+1
| | | |/ / | | |/| |
| | * | | Another "off by 1" problem in OpenVG - in paths this time.Rhys Weatherley2010-03-301-19/+22
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-3010-3/+40
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Doc: Added links and notes to modules, ActiveQt and XMLPatterns docs.David Boddie2010-03-303-1/+19
| | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-307-2/+21
| | | |\ \
| | | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Eskil Abrahamsen Blomfeldt2010-03-3041-172/+590
| | | | |\ \
| | | | | * | struct -> class, it's better.Alexis Menard2010-03-301-1/+2
| | | | | * | Add a a layout property in QGraphicsWidget.Alexis Menard2010-03-303-1/+5
| | | | | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-03-301-0/+10
| | | | | |\ \
| | | | | | * | Fix QFileSystemModel to not install useless watchers on the filesystemAlexis Menard2010-03-301-0/+10
| | | | * | | | Compile on MingWEskil Abrahamsen Blomfeldt2010-03-302-0/+4
| | | | | |/ / | | | | |/| |
| * | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-301-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-301-1/+1
| | |\ \ \ \ | |/ / / / /
| | * | | | QS60Style: Custom QPushButton: Heigth is calculated wronglySami Merila2010-03-301-1/+1
| * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-3012-95/+322
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-307-39/+305
| | * | | | do not detect the echo-without-newline syntax over and overOswald Buddenhagen2010-03-301-30/+12
| | * | | | speed up by removing nonsenseOswald Buddenhagen2010-03-301-6/+1
| | * | | | no need for CONFIG += ordered hereOswald Buddenhagen2010-03-301-2/+0
| | * | | | Autotest: don't allow choosing between debug/release mode.Thiago Macieira2010-03-303-18/+4
| | |/ / /
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-304-3/+44
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Added additional logging to Phonon MMF backendGareth Stockwell2010-03-304-3/+44
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-301-0/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix a crash in QGtkStyle when theme not availableJens Bache-Wiig2010-03-301-0/+3
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-293-0/+7
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Exporting QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-292-0/+2
| | * | | Adding QFontDatabase::removeAllApplicationFonts()Alessandro Portale2010-03-291-0/+5
| |/ / /
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-03-292-11/+17
| |\ \ \
| | * | | Fixed crash in Phonon MMF backend during application shutdownGareth Stockwell2010-03-291-1/+7
| | * | | Fixed bitfield-related crash on Symbian WINSCWGareth Stockwell2010-03-291-10/+10
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-03-296-14/+51
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-03-295-14/+46