summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Jan-Arve Sæther2010-04-1246-407/+537
|\
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1060-955/+1338
| |\
| | * Fix the doc for QFrame::frameStyleThierry Bastian2010-04-091-1/+1
| | * Don't use texture-from-pixmap if the target isn't GL_TEXTURE_2DTom Cooksey2010-04-091-1/+2
| | * Add runtime check for GLX >= 1.3 before using glXCreatePixmapTom Cooksey2010-04-091-0/+8
| | * QDrawHelper: Reduce code duplicationsOlivier Goffart2010-04-091-215/+61
| | * Improve matching X11 VisualIDs to EGL configsTom Cooksey2010-04-091-24/+53
| * | Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration in...Qt Continuous Integration System2010-04-1041-166/+412
| |\ \
| | * \ Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-096-6/+159
| | |\ \
| | | * \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-0911-20/+174
| | | |\ \
| | | | * | Regressions in Global Object prototype accessKent Hansen2010-04-093-4/+144
| | | | * | Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ...Simon Hausmann2010-04-093-2/+15
| | * | | | Merge branch '4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-095-14/+15
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Autotest: fix paths on the test server after update.Thiago Macieira2010-04-094-13/+14
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integ...Qt Continuous Integration System2010-04-091-1/+1
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Fix typo in docs.Jason McDonald2010-04-091-1/+1
| | * | | | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-04-0932-147/+239
| | |\ \ \ \ | |/ / / / / | | | _ / / | | | / /
| | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-095-24/+76
| | |\ \ \
| | | * | | 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-0711-89/+71
| | | |\ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-073-52/+25
| | |\ \ \ \
| | | * | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-073-52/+25
| | * | | | | 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
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | 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
| | * | | | | | | 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
| | | |\ \ \ \ \
| | | * | | | | | Remove qWait functions as it is used in QTRY_* macros.Toby Tomkins2010-04-061-23/+13
| | | | | | | * | Mismatch between reported and actual supported sample rates inKurt Korbatits2010-04-071-11/+63
| | | | | |_|/ / | | | | |/| | |
| | | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6Kurt Korbatits2010-04-061-1/+1
| | | | |\ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | * | | | | Did not include updated repaint number for parent item in revert.Toby Tomkins2010-04-061-1/+1
| | | | * | | | 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-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
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
generated by cgit v0.12 at 2025-02-03 10:32:33 (GMT)