summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-103-3/+29
|\
| * Reimplemented event() and sceneEvent() in video item, for BC.Dmytro Poplavskiy2010-04-082-2/+24
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-071-1/+5
| |\
| | * Fix Phonon build with mingw.Andrew den Exter2010-04-071-1/+5
* | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-095-6/+32
|\ \ \
| * | | Regressions in Global Object prototype accessKent Hansen2010-04-092-4/+17
| * | | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-093-2/+15
* | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-0925-57/+178
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Corruption in data captured by QAudioInputKurt Korbatits2010-04-091-2/+2
| * | Just one (static) waveInCriticalSection but multiple QAudioInput toKurt Korbatits2010-04-094-11/+11
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-077-14/+33
| |\ \
| | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-063-1/+27
| | |\ \
| | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-063-1/+27
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integ...Qt Continuous Integration System2010-04-061-1/+1
| | |\ \ \
| | | * | | Fix crash for multiscript text in QTextEngine::boundingBox()Eskil Abrahamsen Blomfeldt2010-04-061-1/+1
| | * | | | 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
| * | | | | | Mismatch between reported and actual supported sample rates inKurt Korbatits2010-04-071-11/+63
| |/ / / / /
| * | | | | QAudioInput: possible change of state without emitting stateChange()Kurt Korbatits2010-04-062-2/+1
| |/ / / /
| * | | | 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
| * | | | 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-313-2/+8
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | 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-311-1/+2
| * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6Rhys Weatherley2010-03-319-261/+6
| |\ \ \ \ | | |/ / /
| * | | | Allow attributes to be bound after a QGLShaderProgram is linked.Rhys Weatherley2010-03-311-6/+13
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-065-15/+14
|\ \ \ \ \
| * | | | | Moved item wouldn't follow mouse cursor when ItemIgnoresTransformations is setGabriel de Dietrich2010-04-061-1/+2
| * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-04-06237-5238/+6081
| |\ \ \ \ \
| | * | | | | Prevented unnecessary copy in QImage::setAlphaChannel().Samuel Rødal2010-04-061-3/+4
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
| | |\ \ \ \ \
| | | * \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-061-1/+1
| | | |\ \ \ \ \
| | | | * | | | | Change the ifdef for resolving function ptrs to match declarationTom Cooksey2010-04-061-1/+1
| * | | | | | | | Fix painting artifacts on textEskil Abrahamsen Blomfeldt2010-04-062-10/+7
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Doc: Remove QDBusServer from the public documentation.Thiago Macieira2010-04-061-1/+1
* | | | | | | | [Cocoa] QDialogs with WindowStayOnStopHint parentCarlos Manuel Duclos Vergara2010-04-061-1/+8
* | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-061-0/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Fix a coding style issue of the GTK styleBenjamin Poulain2010-04-061-1/+1
| * | | | | | | Sunstudio12.1(5.10): Fix compile errors GTK style and other minor compile errorsJohan Hauan2010-04-061-0/+5
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-06223-4119/+4364
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-066-1/+462
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Make it possible to build QtDBus and its tools on Windows CE.Thiago Macieira2010-04-052-2/+3
| * | | | | | | Reapply 69e873e2bfae3fc028c21d93112a75008c3bb58b now that QLibrary is fixedThiago Macieira2010-04-041-1/+1