summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-063-12/+5
|\
| * Fixed modal dialog not to have automatic "Exit" right softkey in S60.Janne Anttila2010-04-063-12/+5
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-064-38/+24
|\ \ | |/ |/|
| * Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Toby Tomkins2010-04-062-2/+1
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-061-1/+1
| | |\
| | * | QAudioInput: possible change of state without emitting stateChange()Kurt Korbatits2010-04-062-2/+1
| * | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-061-23/+13
| | |/ | |/|
| * | Did not include updated repaint number for parent item in revert.Toby Tomkins2010-04-061-1/+1
| |/
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-051-14/+11
| |\ |/ /
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-031-14/+11
| |\
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-011-14/+11
| | |\
| | | * Partially revert "Remove qWait functions as it is used in QTRY_* macros."Toby Tomkins2010-04-011-172/+314
| | | * Merge commit 'origin/4.6' into 4.6-multimediaToby Tomkins2010-04-01100-821/+1581
| | | |\
| | | * \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Toby Tomkins2010-04-019-3/+365
| | | |\ \
| | | * | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-011-327/+182
* | | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-04-052-0/+32
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Implementing QFontEngineS60::getSfntTableData()Alessandro Portale2010-04-052-0/+32
| | |_|_|/ | |/| | |
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-032-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix doc for deprecated QGridLayout::colSpacing: point to existing methodDavid Faure2010-04-031-1/+1
| * | | | qDebug() << myPointF would remove spaces in following arguments.David Faure2010-04-031-1/+1
|/ / / /
* | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-011-2/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Fix crash in the fileiconprovider for WindowsJens Bache-Wiig2010-04-011-2/+4
* | | | 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
| | | | |/ / / / | | | |/| | | |