Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'qt/master' into qml-master | Qt Continuous Integration System | 2010-02-26 | 3 | -8/+6 |
|\ | |||||
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-26 | 2 | -7/+5 |
| |\ | |||||
| | * | Merge commit 'f17ba38d5380e458b50ae543b34c52b2a2df8e7e' into bearermanagement... | Aaron McCarthy | 2010-02-26 | 1 | -7/+4 |
| | |\ | |||||
| | | * | Fix file descriptor leak with generic engine on Linux. | Aaron McCarthy | 2010-02-25 | 1 | -7/+4 |
| | * | | Fix Symbian build when building for WINSCW with abld. | Aaron McCarthy | 2010-02-26 | 1 | -0/+1 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-25 | 2 | -1/+2 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Revert "qdoc: List new QML elements in \sincelist for What's New page." | Andreas Aardal Hanssen | 2010-02-25 | 1 | -1/+1 |
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master... | Qt Continuous Integration System | 2010-02-24 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | Compile on Linux: close(2) is defined in #include <unistd.h> | Thiago Macieira | 2010-02-24 | 1 | -0/+1 |
| | | |/ | |||||
* | | | | Compile on Linux: close(2) is defined in #include <unistd.h> | Thiago Macieira | 2010-02-25 | 1 | -0/+1 |
* | | | | Merge branch 'master' of git:qt/qt-qml | Thiago Macieira | 2010-02-25 | 11 | -26/+776 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Introduced QDeclarativeExtensionPlugin::registerTypes(uri). | Roberto Raggi | 2010-02-25 | 2 | -10/+3 |
| * | | | Fix up some rename confusion. | Justin McPherson | 2010-02-25 | 1 | -2/+2 |
| * | | | Make QML_REGISTER...TYPE functions unnecessary (still exist for now). | Warwick Allison | 2010-02-25 | 2 | -8/+8 |
| * | | | Change Multimedia declarative module in line with recent commits. | Justin McPherson | 2010-02-25 | 1 | -2/+2 |
| * | | | Merge branch 'master' of ../../qt/master | Justin McPherson | 2010-02-24 | 13 | -53/+51 |
| |\ \ \ | | |/ / | |||||
| * | | | Install the extensions in the given uri. | Roberto Raggi | 2010-02-24 | 1 | -7/+6 |
| * | | | Install the QML extensions. | Roberto Raggi | 2010-02-24 | 2 | -5/+14 |
| * | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt | Warwick Allison | 2010-02-24 | 45 | -1/+11548 |
| |\ \ \ | | | |/ | | |/| | |||||
| * | | | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to QDec... | Warwick Allison | 2010-02-24 | 11 | -42/+42 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-24 | 5 | -10/+6 |
| |\ \ \ | |||||
| | * \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Martin Jones | 2010-02-24 | 5 | -10/+6 |
| | |\ \ \ | |||||
| * | \ \ \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml | Warwick Allison | 2010-02-23 | 2 | -17/+11 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Get rid of QmlModulePlugin. | Roberto Raggi | 2010-02-23 | 1 | -12/+4 |
| * | | | | | Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls. | Warwick Allison | 2010-02-23 | 7 | -0/+755 |
| |/ / / / | |||||
* | | | | | Merge remote branch 'origin/master' | Olivier Goffart | 2010-02-24 | 14 | -47/+45 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-24 | 14 | -54/+52 |
| |\ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | Add -mediaservice argument to configure. | Andrew den Exter | 2010-02-24 | 1 | -11/+13 |
| | * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into... | Qt Continuous Integration System | 2010-02-23 | 13 | -43/+39 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Remove active qDebugs. | Justin McPherson | 2010-02-23 | 12 | -42/+38 |
| | | * | | Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. | Justin McPherson | 2010-02-23 | 1 | -1/+1 |
| | | |/ | |||||
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt | Rhys Weatherley | 2010-02-24 | 45 | -1/+11548 |
|\ \ \ \ | |/ / / | |||||
| * | | | Make this function non-static. | Aaron McCarthy | 2010-02-23 | 1 | -1/+1 |
| * | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-23 | 45 | -1/+11548 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Make compile on Maemo6. | Aaron McCarthy | 2010-02-23 | 3 | -9/+16 |
| | * | | Merge remote branch 'staging/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-23 | 3 | -8/+4 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast... | Qt Continuous Integration System | 2010-02-22 | 45 | -1/+11531 |
| | | |\ \ | | | | |/ | | | |/| | |||||
| | * | | | Fix build on Symbian. | Aaron McCarthy | 2010-02-23 | 3 | -2/+12 |
| | | |/ | | |/| | |||||
| | * | | Add locking to bearer code. | Aaron McCarthy | 2010-02-22 | 8 | -1/+161 |
| | * | | Merge remote branch 'origin/master' into bearermanagement/unit-tests | Aaron McCarthy | 2010-02-22 | 124 | -18/+21390 |
| | |\ \ | |||||
| | * | | | Don't load NetworkManager plugin in NetworkManager is not available. | Aaron McCarthy | 2010-02-18 | 4 | -6/+20 |
| | * | | | Disable NLA plugin, build generic on win32 and mac. | Aaron McCarthy | 2010-02-17 | 1 | -1/+3 |
| | * | | | Remove debug output. | Aaron McCarthy | 2010-02-16 | 1 | -4/+4 |
| | * | | | Always build generic plugin when building NetworkManager plugin. | Aaron McCarthy | 2010-02-16 | 1 | -1/+3 |
| | * | | | Fix build on Windows, typo. | Aaron McCarthy | 2010-02-12 | 1 | -1/+1 |
| | * | | | Merge remote branch 'origin/master' into bearermanagement/integration | Aaron McCarthy | 2010-02-11 | 5 | -513/+79 |
| | |\ \ \ | |||||
| | * | | | | Use provided typedef for QNetworkConfigurationPrivatePointer. | Aaron McCarthy | 2010-02-11 | 1 | -3/+2 |
| | * | | | | Merge remote branch 'origin/4.6' into bearermanagement/integration | Aaron McCarthy | 2010-02-11 | 7 | -16/+337 |
| | |\ \ \ \ | |||||
| | * | | | | | Fix public includes. | Aaron McCarthy | 2010-02-11 | 7 | -7/+7 |
| | * | | | | | Remove debug. | Aaron McCarthy | 2010-02-11 | 6 | -17/+3 |