summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix folderlistmodel with qt namespaceMartin Jones2010-05-192-0/+14
* Renaming "Qml Launcher" back to "QML Viewer"Kai Koehne2010-05-1810-34/+34
* Rename some examples: proxyviewer -> networkaccessmanagerfactory,Bea Lam2010-05-1835-35/+37
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1879-281/+1883
|\
| * Regression fix for Loader anchors not workingJoona Petrell2010-05-183-0/+37
| * Make Qt.include() work for js files that have '.pragma library'Bea Lam2010-05-185-0/+36
| * doc fixBea Lam2010-05-181-2/+2
| * Improve docs for Qt.quit()Bea Lam2010-05-181-2/+3
| * Prevent assignment of values (string, number, bool) to signal handlers.Michael Brasser2010-05-187-8/+10
| * Make sure strings are escaped when returned via asScript.Michael Brasser2010-05-186-30/+75
| * DocumentationYann Bodson2010-05-185-8/+68
| * git ignore stuffWarwick Allison2010-05-182-0/+2
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1828-42/+49
| |\
| | * Sometimes you own QNetworkReply, sometimes you don't.Aaron Kennedy2010-05-181-1/+1
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1825-37/+45
| | |\
| | | * Rename files; fix test.Michael Brasser2010-05-184-3/+4
| | | * Add parent parameter to QDeclarativeExpression constructor.Michael Brasser2010-05-1821-34/+41
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-1815-108/+179
| | |\ \ | | | |/
| | * | Round correctly in binding optimizerAaron Kennedy2010-05-182-4/+3
| * | | Test Qt.labs.folderlistmodel pluginWarwick Allison2010-05-184-0/+136
| * | | Fix naming.Warwick Allison2010-05-187-21/+6
| | |/ | |/|
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-183-33/+17
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-1817-114/+1322
| | |\ \
| | | * | Photoviewer example fixes.Yann Bodson2010-05-182-28/+16
| | | |/
| | * | Don't disable SmoothPixmapTransform in qDrawBorderPixmap()Martin Jones2010-05-181-5/+1
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1815-86/+1306
| |\ \ \ | | | |/ | | |/|
| | * | Use QDeclarativeScriptString for ParentChange.Michael Brasser2010-05-1814-85/+1301
| | * | Set raster + gl viewport as the default for OS X.Michael Brasser2010-05-181-1/+5
| | |/
| * | Port from QListModelInterface to QAbstractListModel.Warwick Allison2010-05-182-51/+44
| * | Move stuff from QML viewer to plugins.Warwick Allison2010-05-179-22/+95
| * | docWarwick Allison2010-05-172-4/+24
| * | Fix to work with file: URLs (eg. from qml -qmlbrowser)Warwick Allison2010-05-171-0/+1
| |/
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-179-10/+32
|\ \
| * | Fix a small typo in assistant manual: hompage -> homepageLaszlo Papp2010-05-171-1/+1
| * | Print icon in doc pages has no effect.kh12010-05-173-0/+3
| * | Assistant has unnecessary repaints when expand/collapse selected node.kh12010-05-171-7/+11
| * | Compile fixes.ck2010-05-173-0/+5
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integ...Qt Continuous Integration System2010-05-171-2/+12
| |\ \ |/ / /
| * | Changelog: Added Designer/uic3 changes for 4.7.0.Friedemann Kleint2010-05-171-2/+12
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-17429-673/+1254
|\ \ \ | | |/ | |/|
| * | Move xmldata example into rssnews demo.Yann Bodson2010-05-1711-146/+218
| * | Move Q_ENUMS to start of class declarationAaron Kennedy2010-05-172-3/+3
| * | Restructure QDeclarativeAbstractBinding destructorAaron Kennedy2010-05-171-2/+4
| * | Don't call pure virtual method in ~QDeclarativeAbstractBinding()Aaron Kennedy2010-05-171-1/+1
| * | Fix examples autotest when compiled without webkit or xmlpatternsBea Lam2010-05-171-2/+2
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Aaron Kennedy2010-05-17100-958/+2482
| |\ \
| | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-17416-535/+980
| | |\ \ | |/ / / |/| | |
| | * | Focus should be applied to focus scopes all the way up the chain, notBea Lam2010-05-172-6/+2
| | * | Add focus docs snippetsBea Lam2010-05-172-22/+28
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Warwick Allison2010-05-1714-88/+432
| | |\ \