summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Remove stray qDebugTom Cooksey2010-04-261-1/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-265-26/+48
|\
| * Don't leak objects if QX11GLSharedContexts is instanciated twiceTom Cooksey2010-04-261-3/+6
| * Enable QX11GLWindowSurface using "-graphicssystem x11gl" optionTom Cooksey2010-04-265-23/+37
| * Force full-screen updates for QGLWindowSurfaceTom Cooksey2010-04-261-1/+6
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-24197-2022/+2140
|\ \
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-24197-2022/+2140
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-23197-2022/+2140
| | |\ \
| | | * | Remove trace code from directshowaudioendpointcontrol.h.Andrew den Exter2010-04-231-5/+0
| | | * | Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-2275-537/+898
| | | |\ \
| | | * | | Multimedia causes build failure when Qt is configured with -embeddedKurt Korbatits2010-04-211-1/+19
| | | * | | Gstreamer media backend: preserve playback rate after seeks and mediaDmytro Poplavskiy2010-04-211-4/+15
| | | * | | QT7 mediaservice; fix leaking strings.Justin McPherson2010-04-201-8/+7
| | | * | | Fixed Qt build with mediaservices disabled.Dmytro Poplavskiy2010-04-201-1/+1
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-19196-2003/+2098
| | | |\ \ \
| | | | * | | Disabled QMediaPlayer states debug output.Dmytro Poplavskiy2010-04-191-1/+1
| | | | * | | Fixed typo in QMediaPlayer::play() error reportingDmytro Poplavskiy2010-04-191-3/+3
| | | | * | | Fix warning about illegal empty declaration.Andrew den Exter2010-04-191-1/+1
| | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-18196-2000/+2095
| | | | |\ \ \
| | | | | * \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-18196-2000/+2095
| | | | | |\ \ \
| | | | | | * | | Three fixes from Shane after QtMultimedia was split into two dlls.Espen Riskedal2010-04-167-1360/+1370
| | | | | | * | | Fix compile errors in Direct Show media service.Andrew den Exter2010-04-162-2/+2
| | | | | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-16192-643/+728
| | | | | | |\ \ \
| | | | | | | * | | Add EXPORT defines for QtMediaServices library.Andrew den Exter2010-04-1627-41/+49
| | | | | | | * | | WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| | | | | | | * | | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-16114-548/+548
| | | | | | | * | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-164-4/+4
| | | | | | | |\ \ \
| | | | | | | | * | | Fixed compile errors in pulseaudio backend for soundeffectKurt Korbatits2010-04-161-1/+1
| | | | | | | | * | | Fixed compile errors with gstreamer pluginKurt Korbatits2010-04-153-3/+3
| | | | | | | * | | | Merge branch '4.7' of ../../qt/4.7 into 4.7Justin McPherson2010-04-1630-132/+380
| | | | | | | |\ \ \ \ | | | | | | | | |/ / / | | | | | | | |/| | |
| | | | | | | * | | | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-1553-235/+845
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-152-24/+76
| | | | | | | | |\ \ \ \
| | | | | | | * | | | | | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-15188-575/+600
| | | | | | | | |/ / / / | | | | | | | |/| | | |
| | | | | | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4....Qt Continuous Integration System2010-04-142-24/+76
| | | | | | | |\ \ \ \ \
| | | | | | | | * | | | | Gstreamer media backend: seek to media start on end of stream.Dmytro Poplavskiy2010-04-142-24/+76
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integr...Qt Continuous Integration System2010-04-247-121/+588
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix for EGL for symbian on 3.1/3.2/5.0, define QT_NO_EGL.Liang Qi2010-04-231-0/+1
| * | | | | | | | | | | | Stub implementations for EGL for symbianShane Kearns2010-04-237-121/+587
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-04-231-25/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7Janne Koskinen2010-04-23221-3247/+3962
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | DEF file fixJanne Koskinen2010-04-231-25/+24
* | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-234-82/+292
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'origin/4.7' into 4.7aavit2010-04-233-79/+282
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Avoided O(n^2) behavior in painter path clipper.Samuel Rødal2010-04-231-68/+276
| | * | | | | | | | | | | | | QTabBar: Widgets inside the tab bar where not properly laid out after moveTab()Gabriel de Dietrich2010-04-232-11/+6
| * | | | | | | | | | | | | | Optimization: Avoid data copy when reading jpegs from memoryaavit2010-04-231-3/+10
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-04-232-3/+12
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Diacritic input broken, duplicate the base glypha (on Mac OS X carbon)Prasanth Ullattil2010-04-231-2/+11
| * | | | | | | | | | | | | Cocoa: quiting the app from the menubar may cause a crashRichard Moe Gustavsen2010-04-231-1/+1
| * | | | | | | | | | | | | Revert "Add new QDataStream version for Qt 4.8."Jason McDonald2010-04-221-4/+3