summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ | | |/ / | |/| |
| | * | Make compile on Maemo6.Aaron McCarthy2010-02-233-9/+16
| | * | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-233-8/+4
| | |\ \
| | | * \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-2245-1/+11531
| | | |\ \ | | | | |/ | | | |/|
| | * | | Fix build on Symbian.Aaron McCarthy2010-02-233-2/+12
| | | |/ | | |/|
| | * | Add locking to bearer code.Aaron McCarthy2010-02-228-1/+161
| | * | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-22124-18/+21390
| | |\ \
| | * | | Don't load NetworkManager plugin in NetworkManager is not available.Aaron McCarthy2010-02-184-6/+20
| | * | | Disable NLA plugin, build generic on win32 and mac.Aaron McCarthy2010-02-171-1/+3
| | * | | Remove debug output.Aaron McCarthy2010-02-161-4/+4
| | * | | Always build generic plugin when building NetworkManager plugin.Aaron McCarthy2010-02-161-1/+3
| | * | | Fix build on Windows, typo.Aaron McCarthy2010-02-121-1/+1
| | * | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-115-513/+79
| | |\ \ \
| | * | | | Use provided typedef for QNetworkConfigurationPrivatePointer.Aaron McCarthy2010-02-111-3/+2
| | * | | | Merge remote branch 'origin/4.6' into bearermanagement/integrationAaron McCarthy2010-02-117-16/+337
| | |\ \ \ \
| | * | | | | Fix public includes.Aaron McCarthy2010-02-117-7/+7
| | * | | | | Remove debug.Aaron McCarthy2010-02-116-17/+3