summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-087-58/+50
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-087-58/+50
| |\
| | * Fix crash when using Q_GLOBAL_STATIC(QWidget...)Jason Barron2010-10-071-1/+2
| | * Removed the need for S60main.rsc resource file in Symbian.Janne Anttila2010-10-077-57/+48
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-081-0/+1
|\ \ \ | |/ /
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-10-081-0/+1
| |\ \
| | * \ Merge branch 4.6 into qt-4.7-from-4.6Qt Continuous Integration System2010-10-071-0/+1
| | |\ \
| | | * | Fix build with cups 1.5 snapshotsBernhard Rosenkraenzer2010-10-071-0/+1
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-089-19/+362
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-0710-20/+363
| |\ \ \ \
| | * | | | Live texture updates to meegographicssystem plugin.Michael Dominic K2010-10-077-0/+303
| | * | | | Fix text rendering in GL when using the broken-fbo-fallbackEskil Abrahamsen Blomfeldt2010-10-071-1/+1
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-10-072-19/+59
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Doc: fix description of the expected behavior for QGraphicsItem::cursorPierre Rossi2010-10-061-1/+1
| | | * | | QGraphicsItem device coordinate cache unefficient in portrait modeBjørn Erik Nilsen2010-10-061-18/+58
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-071-0/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-071-0/+5
| |\ \ \ \ \
| | * | | | | Ensure that actions are still fired even if there is no visible windowAndy Shaw2010-10-071-0/+5
| | |/ / / /
* | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-0722-53/+191
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-0722-53/+191
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Connect property alias change signals on useAaron Kennedy2010-10-0713-42/+147
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-079-11/+44
| | |\ \ \ \
| | | * | | | Doc fix.Michael Brasser2010-10-071-3/+3
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-10-073-4/+9
| | | |\ \ \ \
| | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-068-8/+39
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | | * | | Fixes assert in QDeclarativeWebViewThomas Hartmann2010-10-061-1/+5
| | | * | | | | Fix setting PathView offset when all visible items are removed.Martin Jones2010-10-071-0/+2
| | | | |/ / / | | | |/| | |
| | | * | | | Allow default QApplication::startDragDistance() to be defined in platformdefs.hMartin Jones2010-10-061-2/+5
| | | * | | | Ensure the TextInput cursor blinks immediately when enabled.Michael Brasser2010-10-061-1/+5
| | | * | | | Update QtGui def filesJoona Petrell2010-10-062-1/+5
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-10-063-3/+19
| | | |\ \ \ \
| | | | * | | | Ensure PathView updates positions when path changes.Michael Brasser2010-10-062-2/+16
| | | | * | | | Create Loader components in correct contextAaron Kennedy2010-10-061-1/+3
* | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-072-25/+43
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-10-072-25/+43
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | Minor OpenVG optimization when setting the EGL surface attribute.Jason Barron2010-10-071-3/+2
| | * | | | | | Make sure the QS60PaintEngine can draw other classes of pixmap dataJason Barron2010-10-071-22/+41
| | |/ / / / /
* | | | | | | Merge faba550d704312a29d9485bcaaa506331f102301 from 4.7 to master.Olivier Goffart2010-10-071-1/+1
* | | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-0745-404/+1174
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0720-75/+160
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix crash when constructing QThreadStorage after global destructors have runBradley T. Hughes2010-10-061-2/+19
| | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0619-73/+141
| | |\ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | | * | | | Fixed a buffer overrun when pasting large data from non-Qt appsDenis Dzyubenko2010-10-064-16/+12
| | | * | | | Fix copying large data to non-Qt applicationsDenis Dzyubenko2010-10-061-1/+1
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-0515-56/+128
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Revert "QWorkspace: fix hardcoded min size overwriting the real min size"Marius Storm-Olsen2010-10-051-9/+6
| | | | * | | QtScript/JavaScriptCore: Backport random number generator seeding fixKent Hansen2010-10-057-6/+41
| | | | * | | Fix performance regression in QUuid::createUuid()Bradley T. Hughes2010-10-051-25/+42
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-10-048-31/+54
| | | | |\ \ \
| | | | | * | | Ensure that the underline is only drawn when expected for an accelAndy Shaw2010-10-041-4/+6