summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-116-128/+150
|\
| * Fix some #ifdefs to compile for a specific combination of featuress that was ...Trever Fischer2010-08-111-0/+6
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-114-125/+140
| |\
| | * 64-bit versions of PREMUL, BYTE_MUL and INTERPOLATE_PIXEL_256Andreas Kling2010-08-111-73/+67
| | * QXmlStreamReader: avoid unnecessary detachingPeter Hartmann2010-08-111-1/+1
| | * QSslCertificate: support expiration dates > 2049Peter Hartmann2010-08-111-50/+71
| | * Doc: Fixing typoMorten Engvoldsen2010-08-111-1/+1
| * | doc: The QML Qt element was missing from the documentation.Martin Smith2010-08-111-3/+4
| |/
* | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-08-116-28/+71
|\ \
| * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-08-116-28/+71
| |\ \
| | * | QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-101-0/+5
| | * | fix build for -no-qt3supportPeter Hartmann2010-08-101-2/+2
| | * | Fix handling of SSL certificates with wildcard domain namesRichard J. Moore2010-08-102-4/+39
| | * | Doc: typo fixed in qlibraryinfo.cppJoerg Bornemann2010-08-091-1/+1
| | * | Fixes for combining multiple Qt::ImhXXXOnly with S60 FEPShane Kearns2010-08-061-22/+30
| | * | fix compile errorShane Kearns2010-08-061-1/+1
| | * | Make input methods work correctly with Symbian^3 FEP in numeric modeShane Kearns2010-08-061-6/+13
| | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-08-055-3/+47
| | * | Improving text coordinate rounding in the OpenVG paint engineAlessandro Portale2010-08-041-3/+7
| | * | Add QDir::homePath() for the log file in QTestFileLogger in testlib on Symbia...Liang Qi2010-08-031-3/+13
| | * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0312-20/+123
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integr...Qt Continuous Integration System2010-08-0312-20/+123
| | | |\ \
| | | | * | Fixed build break on Symbian versions earlier than S^3Gareth Stockwell2010-08-021-1/+1
| | | | * | Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-023-9/+9
| | | | * | Added support to Phonon MMF backend for playback of Qt resource filesGareth Stockwell2010-08-0212-20/+123
| | * | | | Don't resolve GLSL extensions if no shadersRhys Weatherley2010-08-031-0/+4
| | |/ / /
| | * | | setUniformValue(QSize) was setting (w,w) not (w,h)Rhys Weatherley2010-08-031-1/+1
| | |/ /
| | * | Fix proxy widgets with the OpenVG paint engine.Jason Barron2010-07-301-3/+13
| | * | Ensure that window rectangle is updated when CBA visibility changesGareth Stockwell2010-07-283-21/+33
| | * | Clear Qt::WA_OutsideWSRange when making window fullscreenGareth Stockwell2010-07-281-0/+2
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-111-1/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Henrik Hartz2010-08-1158-115/+195
| |\ \ \ | | | |/ | | |/|
| * | | Remember to reset clipping when overriding paint in QDeclarativeItemHenrik Hartz2010-08-111-1/+3
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-114-3/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-114-3/+16
| |\ \ \
| | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-08-104-3/+16
| | |\ \ \
| | | * | | Updated WebKit to 72b1c38579ca1fdb3f242e29cd16e5bfb4925813Simon Hausmann2010-08-104-3/+16
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-08-1151-78/+87
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-08-112-11/+28
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-1051-78/+87
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Fix memory leak in QtScript variable objectKent Hansen2010-08-102-2/+2
| | * | | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-08-101-0/+5
| | |\ \ \ \ \
| | | * | | | | QSslSocket: fix security vulnerability with wildcard IP addressesPeter Hartmann2010-08-101-0/+5
| | * | | | | | doc: Changed some titles so lists of contents sort better.Martin Smith2010-08-105-11/+11
| | |/ / / / /
| | * | | | | Mac: Fix crash when using style to draw on other things than widgetsRichard Moe Gustavsen2010-08-101-0/+3
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-08-1042-65/+66
| | |\ \ \ \ \
| | | * | | | | Fix invalid memory write during recursive timer activationBradley T. Hughes2010-08-092-20/+15
| | | * | | | | Added comment about calendarPopup in setCalendarWidget function documentation.Jerome Pasion2010-08-091-0/+1
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Jerome Pasion2010-08-099-12/+29
| | | |\ \ \ \ \
| | | | * | | | | CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.Carlos Manuel Duclos Vergara2010-08-091-0/+4