summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-16219-719/+843
|\
| * Add EXPORT defines for QtMediaServices library.Andrew den Exter2010-04-1627-41/+49
| * Fixed configure check for gstreamer.Dmytro Poplavskiy2010-04-161-1/+1
| * WebKit; build with change to mediaservices.Justin McPherson2010-04-161-3/+3
| * QtMediaservices -> QtMediaServices.Justin McPherson2010-04-16121-565/+565
| * configure; Fixes for changes to use mediaservices.Justin McPherson2010-04-161-2/+2
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-165-4/+4
| |\
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7Kurt Korbatits2010-04-161-0/+0
| | |\
| | | * Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2dAndrew den Exter2010-04-161-0/+0
| | * | 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-1647-191/+644
| |\ \ | | |/ | |/|
| * | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging int...Justin McPherson2010-04-15325-2722/+4871
| |\ \
| | * \ 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-15214-650/+714
| | |/ / | |/| |
| * | | 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-qml into 4.7-integrationQt Continuous Integration System2010-04-16144-2312/+1740
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Correctly support translation in QDeclarativePixmapCacheWarwick Allison2010-04-162-5/+7
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-04-16102-722/+1366
| |\ \ \ \
| | * | | | Correctly support translation in QDeclarativeCompilerAaron Kennedy2010-04-152-8/+2
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-15144-2302/+1724
| | |\ \ \ \ | |/ / / / / |/| | | | |
| | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-04-15144-2302/+1724
| | |\ \ \ \
| | | * | | | Small calculator fix.Yann Bodson2010-04-152-10/+10
| | | * | | | Improve declarative calculator example.Yann Bodson2010-04-1513-227/+238
| | | * | | | Update examples autotest to use the runtime directlyAaron Kennedy2010-04-154-96/+42
| | | * | | | Support valuetypes as method return valuesAaron Kennedy2010-04-159-41/+133
| | | * | | | Compile without Qt3 support.Yann Bodson2010-04-151-1/+1
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-151-0/+20
| | | |\ \ \ \
| | | | * | | | DocAaron Kennedy2010-04-151-0/+20
| | | * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1518-104/+178
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-04-1556-1467/+327
| | | | |\ \ \ \
| | | | * | | | | Add Component.onDestruction attached propertyAaron Kennedy2010-04-1517-99/+171
| | | | * | | | | CommentsAaron Kennedy2010-04-151-1/+3
| | | | * | | | | Remove unused parameterAaron Kennedy2010-04-153-4/+4
| | | * | | | | | Simplify dynamic resource loading to avoid cluttering Text API.Warwick Allison2010-04-153-13/+10
| | | * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-04-1524-1436/+130
| | | |\ \ \ \ \ \ | | | | | |/ / / / | | | | |/| | | |
| | | * | | | | | Use qmlInfo for image loading errors, not qWarning().Warwick Allison2010-04-1511-44/+101
* | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1524-124/+296
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | QListView: Re-fix scrollbar rangesGabriel de Dietrich2010-04-152-4/+40
| * | | | | | | | Fix compile error with QT_NO_GRAPHICSVIEW in QtMultimediaTasuku Suzuki2010-04-153-1/+23
| * | | | | | | | Fix compile error with QT_NO_IMAGEFORMAT_XPM in QtGuiTasuku Suzuki2010-04-152-0/+4
| * | | | | | | | Wrap EGL image function pointers and move into QEgl namespaceTom Cooksey2010-04-154-32/+49
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integ...Qt Continuous Integration System2010-04-1515-87/+180
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix compilation of ShivaVG, which does not have EGL.Rhys Weatherley2010-04-151-0/+2
| | * | | | | | | | Move nativePaintingActive flag to GL2 engine's privateTom Cooksey2010-04-142-9/+10
| | * | | | | | | | More adjustments to QTBUG-6800Carolina Gomes2010-04-143-13/+11
| | * | | | | | | | Adjustments to QTBUG-6800 patch.Carolina Gomes2010-04-141-8/+6
generated by cgit v0.12 at 2025-01-04 02:41:59 (GMT)