summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* Moved qdeclarativemodules to importsmae2010-03-0215-2698/+0
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-03-026-0/+1861
|\
| * Merge branch 'master' into 4.7Warwick Allison2010-03-026-0/+1861
| |\
| | * Move WebView to an extension plugin.Warwick Allison2010-03-026-0/+1861
* | | Merge remote branch 'staging/4.7' into HEADAaron McCarthy2010-03-0261-279/+1310
|\ \ \ | |/ /
| * | typo for windows ce exclusion ruleMaurice Kalinowski2010-03-011-1/+1
| * | compile fix for WinCEMaurice Kalinowski2010-03-011-1/+2
| |/
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2738-168/+437
| |\
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2738-168/+437
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2738-168/+437
| | | |\
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2638-168/+437
| | | | |\
| | | | | * Merge branch 'master' of git:qt/qt-multimedia-staging into qmlThiago Macieira2010-02-2638-168/+437
| | | | | |\
| | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2638-168/+437
| | | | | | |\
| | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2538-168/+437
| | | | | | | |\
| | | | | | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingAndrew den Exter2010-02-2523-71/+202
| | | | | | | | |\
| | | | | | | | | * QT7; Fix warnings.Justin McPherson2010-02-251-31/+43
| | | | | | | | | * Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-stagingJustin McPherson2010-02-255-34/+76
| | | | | | | | | |\
| | | | | | | | | | * Fixed QTMoview object leak.Dmytro Poplavskiy2010-02-252-2/+4
| | | | | | | | | | * Use the monitor color space for video output.Dmytro Poplavskiy2010-02-252-4/+34
| | | | | | | | | | * Try to start media playback on all load state changes.Dmytro Poplavskiy2010-02-252-30/+40
| | | | | | | | | * | Qt namespace fixes.Justin McPherson2010-02-2517-6/+83
| | | | | | | | | |/
| | | | | | | | * | Make the Direct Show media service compile with a Qt namespace.Andrew den Exter2010-02-251-2/+2
| | | | | | | | * | Make the Direct Show media service compile with mingw.Andrew den Exter2010-02-2510-45/+152
| | | | | | | | * | Test for the existance of the Windows Media SDK in configure.Andrew den Exter2010-02-251-1/+1
| | | | | | | | * | Remove all uses of __uuidof from the Direct Show media service.Andrew den Exter2010-02-2510-51/+59
| | | | | | | | |/
| | | | | | | | * QT7; Add support for setting cookies when loading a movie.Justin McPherson2010-02-251-4/+27
| * | | | | | | | Merge remote branch 'origin/master' into 4.7Thiago Macieira2010-02-2719-83/+861
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-271-2/+3
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master...Qt Continuous Integration System2010-02-271-2/+3
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Compile on WinCEaavit2010-02-251-2/+3
| | | | | |_|/ / | | | | |/| | |
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-262-3/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Merge remote branch 'origin/master' into berlin-masterJoerg Bornemann2010-02-2616-55/+787
| | | |\ \ \ \ \ | | | | | |/ / / | | | | |/| | |
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into mast...Qt Continuous Integration System2010-02-242-3/+4
| | | |\ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | | * | | | Fix compilation with namespace.ck2010-02-241-0/+1
| | | | * | | | Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-241-3/+3
| | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-...Qt Continuous Integration System2010-02-264-45/+73
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | |
| | | * | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-264-45/+73
| | | |\ \ \ \ \
| | | | * | | | | Initialize mem to 0Anders Bakken2010-02-241-1/+1
| | | | * | | | | Force DSFLIP_BLIT unless it's a full flip in DFBAnders Bakken2010-02-241-1/+12
| | | | * | | | | Support for disabling partial flips in dfbAnders Bakken2010-02-242-2/+5
| | | | * | | | | Allow forcing premultiplied format in DFBAnders Bakken2010-02-241-1/+5
| | | | * | | | | Better support tlw transparency in DirectFBAnders Bakken2010-02-242-40/+50
| | | | * | | | | Fix an isOpaque bug in QDirectFBWindowSurfaceAnders Bakken2010-02-241-2/+2
| | * | | | | | | Merge remote branch 'qt/master' into qml-masterQt Continuous Integration System2010-02-263-8/+6
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-262-7/+5
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | |/| | | | |
| | | | * | | | | Merge commit 'f17ba38d5380e458b50ae543b34c52b2a2df8e7e' into bearermanagement...Aaron McCarthy2010-02-261-7/+4
| | | | |\ \ \ \ \
| | | | | * | | | | Fix file descriptor leak with generic engine on Linux.Aaron McCarthy2010-02-251-7/+4
| | | | | | |_|/ / | | | | | |/| | |
| | | | * | | | | Fix Symbian build when building for WINSCW with abld.Aaron McCarthy2010-02-261-0/+1
| | | | | |_|_|/ | | | | |/| | |
| | * | | | | | Compile on Linux: close(2) is defined in #include <unistd.h>Thiago Macieira2010-02-251-0/+1
| | * | | | | | Merge branch 'master' of git:qt/qt-qmlThiago Macieira2010-02-2511-26/+776
| | |\ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | |