summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Remove obsolete function set_winapp_name()miniak2010-04-092-44/+14
| * Speedup fetchTransformedBilinear in the fast_matrix caseOlivier Goffart2010-04-091-7/+9
| * Allow y-interted pixmaps for brushes in GL2 paint engineTom Cooksey2010-04-091-1/+3
| * Build fix for mingwThierry Bastian2010-04-092-9/+7
| * Fix build with mingw (64 bit)Thierry Bastian2010-04-081-0/+3
| * Make configure.exe compatible with mingw 64Thierry Bastian2010-04-081-1/+1
| * Adjust indentationBernhard Rosenkraenzer2010-04-081-10/+10
| * e-Ink support cleanupBernhard Rosenkraenzer2010-04-082-7/+27
| * Tweak the display update IOCTL callsBernhard Rosenkraenzer2010-04-081-2/+5
| * Support 8-Track e-Ink devicesBernhard Rosenkraenzer2010-04-082-6/+47
| * Get stride from LinuxFB instead of calculating it ourselves.Paul Olav Tvete2010-04-081-1/+1
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7aavit2010-04-0853-658/+1145
| |\
| | * Fixed bug in QPainterPath::intersected().Samuel Rødal2010-04-082-4/+32
| | * Fix compile error with QT_NO_ANIMATIONTasuku Suzuki2010-04-081-3/+2
| | * O(n^2) to O(n) optimization in QTreeWidget::selectedItems()Gabriel de Dietrich2010-04-071-1/+5
| | * Fix EGLImage & re-enable its use in QtOpenGLTom Cooksey2010-04-072-27/+30
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-301499-11625/+22092
| | |\
| | | * Fixed the action geometry of menu bar in RTLThierry Bastian2010-04-071-6/+5
| | | * Disable EGLImage usageTom Cooksey2010-04-071-24/+24
| | | * Revert "Remove references to evr based renderer from .pro."Thierry Bastian2010-04-071-4/+9
| | | * Revert "Update Phonon ds9 backend to 4.4.0."Thierry Bastian2010-04-0734-620/+1001
| | | * QTreeView: fix PageUp/PageDown with disabled items.Olivier Goffart2010-04-072-0/+36
| | * | Fix use of bitmap fonts on some Linux systemsEskil Abrahamsen Blomfeldt2010-03-301-2/+7
| * | | Use DIR_SEPARATOR when setting up variables for RCC and UIC in features.Dominik Riebeling2010-04-082-4/+4
* | | | 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
| |\ \ \ \ \ \ \