summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-111-1/+1
|\
| * Cocoa: Fixup wrong code in patch baaa5aeRichard Moe Gustavsen2011-04-111-1/+1
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-113-1/+11
|\ \
| * | Make sure removed QTextBlock is invalidJiang Jiang2011-04-113-1/+11
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-092-17/+30
|\ \ \
| * | | [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)Arnold Konrad2011-04-081-9/+25
| * | | HTTP cacheing: do not store the date header with the resourcePeter Hartmann2011-04-081-8/+5
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2011-04-081-3/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Let's not write to the source buffer when blending argb32 on rgb16.Samuel Rødal2011-04-081-3/+1
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-084-24/+34
|\ \ \ \ | | |_|/ | |/| |
| * | | Cocoa: p1 bug fix: fix auto test regressionsRichard Moe Gustavsen2011-04-071-5/+10
| * | | Cocoa: p1 bug fix: revert use of subWindowStackingRichard Moe Gustavsen2011-04-064-24/+29
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-072-10/+22
|\ \ \ \
| * | | | Image w/ PreserveAspectFit has its width changed once more than needed.Martin Jones2011-04-072-10/+22
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-072-2/+7
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Ensure shared network session deleted from correct threadShane Kearns2011-04-071-1/+6
| * | | | Revert "Remove SIGBUS emission from QNetworkSession destruction."Adrian Constantin2011-04-071-1/+1
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-072-1/+9
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debugKai Koehne2011-04-062-1/+9
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-064-20/+4
|\ \ \ \ \
| * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-04-0536-203/+419
| |\ \ \ \ \
| | * | | | | qdoc: Allowed multiple values for certain metadata tags.Martin Smith2011-04-051-4/+1
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7David Boddie2011-03-2921-60/+239
| |\ \ \ \ \ \
| * | | | | | | Doc: Fixed markup.David Boddie2011-03-251-2/+2
| * | | | | | | Doc: Added a missing command.David Boddie2011-03-251-1/+1
| * | | | | | | Doc: Removed duplicate documentation.David Boddie2011-03-251-13/+0
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-061-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Not possible to enter negative values to widgets with numeric fieldsSami Merila2011-04-061-0/+2
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-064-81/+186
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| * | | | | | | | Improve Flickable dynamics and allow platform specific tweaking.Martin Jones2011-04-064-81/+186
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2011-04-052-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Removing extra comma in `enum' declaration.Sergio Ahumada2011-04-051-1/+1
| * | | | | | | | Remove SIGBUS emission from QNetworkSession destruction.Cristiano di Flora2011-04-051-1/+1
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-051-5/+2
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Take phonon backend back in qt.ibyGuoqing Zhang2011-04-051-5/+2
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-051-3/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | / / | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Mac: p2 combobox regression fixRichard Moe Gustavsen2011-04-051-3/+3
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-041-13/+0
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Remove obsolete files from qt.ibyMiikka Heikkinen2011-04-041-13/+0
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2011-04-043-5/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Fix QGradient stop with NaN position on Symbian.Laszlo Agocs2011-04-041-2/+4
| * | | | | | | QApplication does not define flag for "single touch"Sami Merila2011-04-041-2/+7
| * | | | | | | Native dialog softkeys are covered by QApplication softkeysSami Merila2011-04-041-1/+2
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-int...Qt Continuous Integration System2011-04-043-8/+24
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Cocoa: p1 bugfix, add widget flag MacNoCocoaChildWindowRichard Moe Gustavsen2011-04-043-8/+24
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-042-3/+4
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | XmlListModel should allow types other than application/xmlBea Lam2011-04-041-1/+1
| * | | | | | | Document using Behaviors with States.Michael Brasser2011-04-041-2/+3
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging into 4.7-integ...Qt Continuous Integration System2011-04-015-4/+26
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Jerome Pasion2011-03-312-5/+12
| |\ \ \ \ \ \ \