summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Rename some examples: proxyviewer -> networkaccessmanagerfactory,Bea Lam2010-05-1835-35/+37
| | | | proxywidgets -> qwidgets, dynamic -> dynamicscene, velocity -> corkboards
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2010-05-1879-281/+1883
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (22 commits) Regression fix for Loader anchors not working Make Qt.include() work for js files that have '.pragma library' doc fix Improve docs for Qt.quit() Prevent assignment of values (string, number, bool) to signal handlers. Make sure strings are escaped when returned via asScript. Documentation git ignore stuff Test Qt.labs.folderlistmodel plugin Fix naming. Sometimes you own QNetworkReply, sometimes you don't. Rename files; fix test. Add parent parameter to QDeclarativeExpression constructor. Round correctly in binding optimizer Don't disable SmoothPixmapTransform in qDrawBorderPixmap() Photoviewer example fixes. Port from QListModelInterface to QAbstractListModel. Use QDeclarativeScriptString for ParentChange. Set raster + gl viewport as the default for OS X. Move stuff from QML viewer to plugins. ...
| * Regression fix for Loader anchors not workingJoona Petrell2010-05-183-0/+37
| | | | | | | | | | Task-number: QTBUG-10766 Reviewed-by: Yann Bodson
| * 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
| | | | | | | | | | Task-number: QTBUG-10764 Reviewed-by: Aaron Kennedy
| * Make sure strings are escaped when returned via asScript.Michael Brasser2010-05-186-30/+75
| | | | | | | | Makes 273024e58d90bb9b3a5da0161f884f1af22d75df more correct.
| * 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
| | | | | | | | | | | | God bless QNetworkAccessManager
| | * 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
| | | | | | | | | | | | | | | | Also rearrange the parameter order to be more clear.
| | * | 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
| | | | | | | | | | | | | | | | QTBUG-9538
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts part of ba8ff70b5ac7b68be57a4b63e439fd5a37c4aafa Drawing is far too ugly without SmoothPixmapTransform. Some glitches remain after this change, but they are due to a bug: QTBUG-10524 Task-number: QTBUG-5687 Reviewed-by: Aaron Kennedy
| * | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | So that scope resolution is correct, e.g. "width: parent.width-10;" in a ParentChange works correctly. Task-number: QTBUG-10675
| | * | Set raster + gl viewport as the default for OS X.Michael Brasser2010-05-181-1/+5
| | |/ | | | | | | | | | | | | | | | This setup seems to work around most rendering bugs and timing issues. Task-number: QTBUG-10544
| * | 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
| | | | | | | | | | | | models from plugins
| * | 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 ↵Qt Continuous Integration System2010-05-179-10/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix a small typo in assistant manual: hompage -> homepage Print icon in doc pages has no effect. Assistant has unnecessary repaints when expand/collapse selected node. Compile fixes. Changelog: Added Designer/uic3 changes for 4.7.0.
| * | 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
| | | | | | | | | | | | | | | Task-number: QTBUG-10579 Reviewed-by: ck
| * | Assistant has unnecessary repaints when expand/collapse selected node.kh12010-05-171-7/+11
| | | | | | | | | | | | | | | Task-number: QTBUG-10575 Reviewed-by: ck
| * | Compile fixes.ck2010-05-173-0/+5
| | |
| * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-05-171-2/+12
| |\ \ |/ / / | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Changelog: Added Designer/uic3 changes for 4.7.0.
| * | 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
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Move xmldata example into rssnews demo. Move Q_ENUMS to start of class declaration Restructure QDeclarativeAbstractBinding destructor Don't call pure virtual method in ~QDeclarativeAbstractBinding() Fix examples autotest when compiled without webkit or xmlpatterns Check for acquireReg() failure Focus should be applied to focus scopes all the way up the chain, not Add focus docs snippets Fix doc for status, add Image::onLoaded. Don't crash due to recursive positioning. ListModel::get() shouldn't print warnings for invalid indices since it Add \brief to TextInput Add missing .pro Restructure the examples. They are now organized into various graphicsWidgets doc example was previously removed Doc fix Add a "priority" property to Keys and KeyNavigation
| * | 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
| | |\ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Focus should be applied to focus scopes all the way up the chain, not Add focus docs snippets Fix doc for status, add Image::onLoaded. Don't crash due to recursive positioning. ListModel::get() shouldn't print warnings for invalid indices since it Add \brief to TextInput Add missing .pro Restructure the examples. They are now organized into various graphicsWidgets doc example was previously removed Doc fix Add a "priority" property to Keys and KeyNavigation
| | * | Focus should be applied to focus scopes all the way up the chain, notBea Lam2010-05-172-6/+2
| | | | | | | | | | | | | | | | just to the closest focus scope parent.
| | * | 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
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7Martin Jones2010-05-17401-429/+495
| | | |\ \
| | | * | | Don't crash due to recursive positioning.Martin Jones2010-05-173-27/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also extend positioner anchor check to include fill and centerIn. Task-number: QTBUG-10731