summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix building without the XmlPatterns ModuleAlan Alpert2010-02-241-0/+2
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAlan Alpert2010-02-241-0/+3
|\
| * Build fix when using <QtDeclarative> include.Alexis Menard2010-02-241-0/+3
* | Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlViewAlan Alpert2010-02-244-2/+584
* | Explain the onPropertyChanged pattern in the docs.Alan Alpert2010-02-241-0/+11
|/
* Make QDeclarativeMetaType and QDeclarativeType privateAaron Kennedy2010-02-2416-29/+36
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2436-318/+352
|\
| * Add subdirs .pro for examples/declarative/extendingAaron Kennedy2010-02-242-0/+14
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-241-1/+1
| |\
| | * Fix wrong property name in qdeclarativeitem docsLeonardo Sobral Cunha2010-02-241-1/+1
| * | Fixup tests after QDeclarative class renamesAaron Kennedy2010-02-245-2/+2
| * | Simplify QML element registration headersAaron Kennedy2010-02-2428-315/+335
| |/
* | Don't crash if the currentIndex is set while creating a delegate.Martin Jones2010-02-244-1/+53
|/
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2416-68/+230
|\
| * Add an "asynchonous" property to Image.Martin Jones2010-02-2411-64/+191
| * Removed unnecessary update calls in qmlgraphicsitemLeonardo Sobral Cunha2010-02-241-4/+0
| * Make compile following renaming of class.Bea Lam2010-02-241-1/+1
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlBea Lam2010-02-2462-893/+892
| |\
| * | Automatically connect to a notify signal if the requested signal isBea Lam2010-02-244-0/+39
* | | Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779Warwick Allison2010-02-242-2/+2
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2462-893/+892
|\ \ \ | | |/ | |/|
| * | Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX t...Leonardo Sobral Cunha2010-02-2460-891/+891
| * | Fix declarative failing auto-test, missing rename of the test fileLeonardo Sobral Cunha2010-02-242-1/+1
| * | Compile warning-- for qmlviewerLeonardo Sobral Cunha2010-02-241-1/+0
| |/
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtWarwick Allison2010-02-24129-115/+23092
|\ \ | |/ |/|
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-24131-117/+23094
| |\
| | * Make this function non-static.Aaron McCarthy2010-02-231-1/+1
| | * Merge remote branch 'staging/master' into bearermanagement/stagingAaron McCarthy2010-02-23127-2086/+2417
| | |\
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-23131-117/+23094
| | | |\
| | * | \ Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-232-1/+15
| | |\ \ \
| | * \ \ \ Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-23277-2687/+2419
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Make compile on Maemo6.Aaron McCarthy2010-02-233-9/+16
| | * | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2315-28/+158
| | |\ \ \ \
| | | * \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-22131-117/+23077
| | | |\ \ \ \
| | * | | | | | Fix build on Symbian.Aaron McCarthy2010-02-233-2/+12
| | | |/ / / / | | |/| | | |
| | * | | | | Change initialization order.Aaron McCarthy2010-02-221-1/+1
| | * | | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221-0/+1
| | |\ \ \ \ \
| | | * | | | | Fixed qnetworksession test on Mac.Rohan McGovern2010-02-211-0/+1
| | | * | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-21129-115/+22880
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-21129-115/+22880
| | | | |\ \ \ \ \
| | | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | | |\ \ \ \ \
| | | | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | | | |\ \ \ \ \
| | | | | | | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into mast...Qt Continuous Integration System2010-02-20129-115/+22880
| | | | | | | |\ \ \ \ \
| | | | | | | | * \ \ \ \ Merge remote branch 'origin/master' into mobility-masterRohan McGovern2010-02-191227-17914/+115112
| | | | | | | | |\ \ \ \ \
| | * | | | | | | | | | | | Increase try verify timeout.Aaron McCarthy2010-02-222-2/+2
| | * | | | | | | | | | | | Add locking to bearer code.Aaron McCarthy2010-02-2214-103/+297
| | * | | | | | | | | | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221980-72198/+158783
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | / / / / / / | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Create unit-test in parent directory.Aaron McCarthy2010-02-193-1/+12
| | * | | | | | | | | | | Allow QNAM to be created as a global variable.Aaron McCarthy2010-02-182-3/+9
| | * | | | | | | | | | | Don't load NetworkManager plugin in NetworkManager is not available.Aaron McCarthy2010-02-184-6/+20