summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | |_|_|/ | | |/| | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-252-1/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Revert "qdoc: List new QML elements in \sincelist for What's New page."Andreas Aardal Hanssen2010-02-251-1/+1
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master...Qt Continuous Integration System2010-02-241-0/+1
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | Compile on Linux: close(2) is defined in #include <unistd.h>Thiago Macieira2010-02-241-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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri).Roberto Raggi2010-02-252-10/+3
| * | | | Fix up some rename confusion.Justin McPherson2010-02-251-2/+2
| * | | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now).Warwick Allison2010-02-252-8/+8
| * | | | Change Multimedia declarative module in line with recent commits.Justin McPherson2010-02-251-2/+2
| * | | | Merge branch 'master' of ../../qt/masterJustin McPherson2010-02-2413-53/+51
| |\ \ \ \ | | |/ / /
| * | | | Install the extensions in the given uri.Roberto Raggi2010-02-241-7/+6
| * | | | Install the QML extensions.Roberto Raggi2010-02-242-5/+14
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtWarwick Allison2010-02-2445-1/+11548
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec...Warwick Allison2010-02-2411-42/+42
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-245-10/+6
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtMartin Jones2010-02-245-10/+6
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-232-17/+11
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Get rid of QmlModulePlugin.Roberto Raggi2010-02-231-12/+4
| * | | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.Warwick Allison2010-02-237-0/+755
| |/ / / / /
* | | | | | Merge remote branch 'origin/master'Olivier Goffart2010-02-2414-47/+45
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2414-54/+52
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Add -mediaservice argument to configure.Andrew den Exter2010-02-241-11/+13
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into...Qt Continuous Integration System2010-02-2313-43/+39
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Remove active qDebugs.Justin McPherson2010-02-2312-42/+38
| | | * | | Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.Justin McPherson2010-02-231-1/+1
| | | |/ /
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtRhys Weatherley2010-02-2445-1/+11548
|\ \ \ \ \ | |/ / / /
| * | | | Make this function non-static.Aaron McCarthy2010-02-231-1/+1
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2345-1/+11548
| |\ \ \ \ | | |/ / / | |/| | |